Version bump (bug #292594). Fix permissions (bug #294716). Set SUPPORT_PYTHON_ABIS.

Package-Manager: portage-14899-svn/cvs/Linux x86_64

4 files changed, 125 insertions, 74 deletions

diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index 67343057dcdc..05b9f2f5b9a6 100644
--- a/sys-fs/ecryptfs-utils/ChangeLog
+++ b/sys-fs/ecryptfs-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/ecryptfs-utils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.27 2009/09/17 13:58:51 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.28 2009/11/27 19:44:24 arfrever Exp $
+
+*ecryptfs-utils-82 (27 Nov 2009)
+
+  27 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -ecryptfs-utils-76.ebuild, +ecryptfs-utils-82.ebuild:
+  Version bump (bug #292594). Fix permissions (bug #294716). Set
+  SUPPORT_PYTHON_ABIS.
 
   17 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   ecryptfs-utils-79.ebuild:
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index 76e7602f4b32..fa788f213aa0 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,6 +1,6 @@
-DIST ecryptfs-utils_76.orig.tar.gz 1432594 RMD160 cc5af2460b0fb6bc94a2ef2464c34e8a0380e13b SHA1 a263e720f687d3045f9ebb96ba3dbe161384b01b SHA256 1d862d4baf3509425f9d72cb4dffd8829aecde5ad78b7bb49c200900204174fe
 DIST ecryptfs-utils_79.orig.tar.gz 519934 RMD160 4f61b0fc4febaa1d00fcc7dcf3b608a583207664 SHA1 e76756f29784637813c2f468d64501a1306dc968 SHA256 adf4f2fb128fe4e1b2fd7707dcbec08d7852d29be749fe3d96f8065e7f555e53
-EBUILD ecryptfs-utils-76.ebuild 1774 RMD160 e91d1592e4ed66a9490f9f2b864ff041f85621ce SHA1 c963d2be3ea8f0951e361017844a4ee697a2dd8e SHA256 e565001a6318533f113dc69df9e5835e7dfee41f2c7f32b1c6430dba70e6116c
+DIST ecryptfs-utils_82.orig.tar.gz 513756 RMD160 7368f6ca51c1bc351156522d5d908d246a2ecbea SHA1 ad22e25eeddbedcad27191efd893a150037224fc SHA256 4625130b308e219b93611b53ba4b55db722efcc2d014887ebee1dc7775e47af0
 EBUILD ecryptfs-utils-79.ebuild 1748 RMD160 49bb8e1bb55a8f2a5d793749de1daccbb6ade027 SHA1 f62add8af053131646f6f0abb5b14add99e16e96 SHA256 4a9e6bf119f71e1903627d37c0fb2470d64a3be919bdc5f41308539db1a5246d
-MISC ChangeLog 4972 RMD160 16993877c05bcee3caa3311fac96b5d3d7086f4a SHA1 aecbfc10561f5096859d59d12fbb117d40a212aa SHA256 6ec9383126686a90640bedc35b8fbf3f8dd7e90bb916373912c5fdf597503e12
-MISC metadata.xml 599 RMD160 d22b9f6ed4b1e207de5b3b032e1f30bc3a1f3aab SHA1 cd6d44b79acd6749c5ad7d220f0ff1657d44b59f SHA256 fcf1fab48a362024a1bce7fc47b5c364758fad7faadcda58cb54133b102b0edd
+EBUILD ecryptfs-utils-82.ebuild 3152 RMD160 ac23805414b62ac9ce819a0cde1406c104011b0e SHA1 e8421bf36b0485bb43a06e141c432148a3df1f6b SHA256 f14047682f41d795af5dde92470b2930f9b1ba9b5f0df55c419bc17602501e2e
+MISC ChangeLog 5224 RMD160 f3f5850d401ac75c701eb212bc5cfa6c4f9e1ff6 SHA1 77901e4b4dc20ee5713da8a3b3bdf20525b51bc8 SHA256 32d07c68963a2f3cb2af3c42ee3b50d81bfc8f857932d9690a14d237bba943ab
+MISC metadata.xml 530 RMD160 7bf4c9af3f59f4c07682bafde0592daa9504f85b SHA1 9b2b50d4a0b4b792f320e48f27577072f55904ed SHA256 26f3ef615c7e9d6f9300864ecccb8990fc9e80728292903d5e89f66b0c66f70e
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-76.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-76.ebuild
deleted file mode 100644
index 0e460479f168..000000000000
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-76.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-76.ebuild,v 1.1 2009/07/18 00:27:21 arfrever Exp $
-
-EAPI="2"
-
-inherit autotools pam
-
-DESCRIPTION="eCryptfs userspace utilities"
-HOMEPAGE="http://launchpad.net/ecryptfs"
-SRC_URI="http://launchpad.net/ecryptfs/trunk/${PV}/+download/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gpg gtk nss openssl pam pkcs11 python suid tpm"
-
-RDEPEND=">=sys-apps/keyutils-1.0
-	>=dev-libs/libgcrypt-1.2.0
-	gpg? ( app-crypt/gpgme )
-	gtk? ( x11-libs/gtk+ )
-	nss? ( dev-libs/nss )
-	openssl? ( >=dev-libs/openssl-0.9.7 )
-	pam? ( sys-libs/pam )
-	pkcs11? (
-		>=dev-libs/openssl-0.9.7
-		>=dev-libs/pkcs11-helper-1.04
-	)
-	python? ( >=dev-lang/python-2.5 )
-	tpm? ( app-crypt/trousers )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	python? ( dev-lang/swig )"
-
-S="${WORKDIR}/${PN}_${PV}.orig"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--with-pamdir=$(getpam_mod_dir) \
-		$(use_enable doc docs) \
-		$(use_enable gpg) \
-		$(use_enable gtk gui) \
-		$(use_enable nss) \
-		$(use_enable openssl) \
-		$(use_enable pam) \
-		$(use_enable pkcs11 pkcs11-helper) \
-		$(use_enable python pywrap) \
-		$(use_enable tpm tspi)
-}
-
-src_install(){
-	emake DESTDIR="${D}" install || die "emake install failed"
-	use suid && fperms u+s /sbin/mount.ecryptfs
-}
-
-pkg_postinst() {
-	if use suid; then
-		ewarn
-		ewarn "You have chosen to install ${PN} with the binary setuid root. This"
-		ewarn "means that if there are any undetected vulnerabilities in the binary,"
-		ewarn "then local users may be able to gain root access on your machine."
-		ewarn
-	fi
-}
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-82.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-82.ebuild
new file mode 100644
index 000000000000..a6be32121fb1
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-82.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-82.ebuild,v 1.1 2009/11/27 19:44:24 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit flag-o-matic pam python
+
+DESCRIPTION="eCryptfs userspace utilities"
+HOMEPAGE="http://launchpad.net/ecryptfs"
+SRC_URI="http://launchpad.net/ecryptfs/trunk/${PV}/+download/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gpg gtk openssl pam pkcs11 python suid tpm"
+
+RDEPEND=">=sys-apps/keyutils-1.0
+	>=dev-libs/libgcrypt-1.2.0
+	dev-libs/nss
+	gpg? ( app-crypt/gpgme )
+	gtk? ( x11-libs/gtk+ )
+	openssl? ( >=dev-libs/openssl-0.9.7 )
+	pam? ( sys-libs/pam )
+	pkcs11? (
+		>=dev-libs/openssl-0.9.7
+		>=dev-libs/pkcs11-helper-1.04
+	)
+	python? ( >=dev-lang/python-2.5 )
+	tpm? ( app-crypt/trousers )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0
+	python? ( dev-lang/swig )"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+
+pkg_setup() {
+	append-flags -D_FILE_OFFSET_BITS=64
+}
+
+src_prepare() {
+	# Python bindings are built/installed manually.
+	sed -e "/SUBDIRS =/s/ libecryptfs-swig//" -i src/Makefile.{am,in} || die "sed failed"
+}
+
+src_configure() {
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		--enable-nss \
+		--with-pamdir=$(getpam_mod_dir) \
+		$(use_enable doc docs) \
+		$(use_enable gpg) \
+		$(use_enable gtk gui) \
+		$(use_enable openssl) \
+		$(use_enable pam) \
+		$(use_enable pkcs11 pkcs11-helper) \
+		$(use_enable python pywrap) \
+		$(use_enable tpm tspi)
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		python_copy_sources src/libecryptfs-swig
+		building() {
+			emake \
+				PYTHON="$(PYTHON)" \
+				PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
+				PYTHON_LDFLAGS="-L$(python_get_libdir) -lpython${PYTHON_ABI}" \
+				PYTHON_SITE_PKG="$(python_get_sitedir)" \
+				PYTHON_VERSION="${PYTHON_ABI}" \
+				SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)"
+		}
+		python_execute_function -s --source-dir src/libecryptfs-swig building
+	fi
+}
+
+src_install(){
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use python; then
+		installation() {
+			emake \
+				DESTDIR="${D}" \
+				PYTHON="$(PYTHON)" \
+				PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
+				PYTHON_LDFLAGS="-L$(python_get_libdir) -lpython${PYTHON_ABI}" \
+				PYTHON_SITE_PKG="$(python_get_sitedir)" \
+				PYTHON_VERSION="${PYTHON_ABI}" \
+				SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)" \
+				install || return 1
+			echo "ecryptfs-utils" > "${D}$(python_get_sitedir)/ecryptfs-utils.pth"
+		}
+		python_execute_function -s --source-dir src/libecryptfs-swig installation
+	fi
+
+	use suid && fperms u+s /sbin/mount.ecryptfs_private
+}
+
+pkg_postinst() {
+	if use suid; then
+		ewarn
+		ewarn "You have chosen to install ${PN} with the binary setuid root. This"
+		ewarn "means that if there are any undetected vulnerabilities in the binary,"
+		ewarn "then local users may be able to gain root access on your machine."
+		ewarn
+	fi
+}