Version bump.

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

6 files changed, 22 insertions, 175 deletions

diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index fd82b06e1220..86f69c7b0c75 100644
--- a/sys-fs/ecryptfs-utils/ChangeLog
+++ b/sys-fs/ecryptfs-utils/ChangeLog
@@ -1,6 +1,15 @@
 # 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.24 2009/05/02 18:30:04 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.25 2009/07/18 00:27:21 arfrever Exp $
+
+*ecryptfs-utils-76 (18 Jul 2009)
+
+  18 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -ecryptfs-utils-40.ebuild, -ecryptfs-utils-42.ebuild,
+  -ecryptfs-utils-73.ebuild,
+  -files/ecryptfs-utils-73-fix_implicit_declarations.patch,
+  +ecryptfs-utils-76.ebuild:
+  Version bump.
 
 *ecryptfs-utils-75 (02 May 2009)
 
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index 51253c60fe33..870a6171e90a 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,12 +1,7 @@
-AUX ecryptfs-utils-73-fix_implicit_declarations.patch 965 RMD160 630c1a837f02928feb2c76d223b77eb63b8bbea6 SHA1 c0f3c98b8a93d771f8ec4e6a233e0e249c779367 SHA256 f59f35bea41d2b6573eaa82bd5cad9c9febb49b21da1d80e77b98ccf037250f6
 AUX ecryptfs-utils-75-fix_warnings.patch 2514 RMD160 b17faba44c01afdfd66ef26cf567b41d902dd274 SHA1 80e936e26c6d63807c704c43f03b65379a55e2ec SHA256 c1e2f0dec38165111670f0cada53a8e2371cd7f48f3b36403e3a1f21b668a4a2
-DIST ecryptfs-utils-40.tar.bz2 550380 RMD160 1e3f72e660af5b7f3ac7747270e113f808d549a4 SHA1 4ae039471105c34d9021a51dc29b90dddf00c09f SHA256 976d0c543b37eb93b096558b803e38e983aedd89aea8b696bb209eef3b18f29c
-DIST ecryptfs-utils-42.tar.bz2 552939 RMD160 ce0338637c2048423cf56105cc99134de9be0c37 SHA1 607fc91fc91cdb92e19bdd96daf117826f6abcdd SHA256 05fe1a8362c95b7b9f1c872907b37423929d84560514a1331a5b8d49b44a0769
-DIST ecryptfs-utils_73.orig.tar.gz 504042 RMD160 339f506b9ada01818d64c3f54b102c4783fef8dd SHA1 d4f0576bbe3c0201bccb06d3b1319f905ee47e01 SHA256 548db19e9c579bc09d4a300d176023656cab72da7f945e1e3f1d827d0aa9ea92
 DIST ecryptfs-utils_75.orig.tar.gz 510771 RMD160 ea6ad95d141a1f544bdb5e02d9847dfcee1b56b7 SHA1 c2d6baa36cb26bc3d96790331ddf75385ece06a0 SHA256 2e6806048eaae91bb8abd412445431f6cf24903b974599de8c879c4b92bb7d7e
-EBUILD ecryptfs-utils-40.ebuild 1485 RMD160 42c86f4da626905e5b7d11b2c08ccd98c8aa68b9 SHA1 51e81fe0feeaba8270282b398df0735016b2ebf1 SHA256 9ed6cf2f645181b101711f42c8138c15ebabc9b62ecd865365d26351f9adf128
-EBUILD ecryptfs-utils-42.ebuild 1485 RMD160 0928c310bb3d8102eb174a233cf2f12cec4dadeb SHA1 07020bfe4eaeedfc5fff6dce657a4377d9f38dc5 SHA256 d047e15f378b912a158c3dc5f73aed8aa74021dd1e771c7a1407ece664542238
-EBUILD ecryptfs-utils-73.ebuild 1824 RMD160 87b0d4adde256fea6cfa707f5857ecf752b854e9 SHA1 59a7782f2edf28c4f007fdcb21d1662804f264cd SHA256 84796850202313cf2400c17770d3cb0af350ad85abc93aea769aed14e8334cd4
+DIST ecryptfs-utils_76.orig.tar.gz 1432594 RMD160 cc5af2460b0fb6bc94a2ef2464c34e8a0380e13b SHA1 a263e720f687d3045f9ebb96ba3dbe161384b01b SHA256 1d862d4baf3509425f9d72cb4dffd8829aecde5ad78b7bb49c200900204174fe
 EBUILD ecryptfs-utils-75.ebuild 1771 RMD160 f5a7985e062941b170592feddee107ef67506da8 SHA1 8dde375a44640d0cc4d6b9dbd98f2e2fbdae30a7 SHA256 11f1c53f83616d20384259d2187a82a09d302659f2b6c6e0c1b060e57958edc1
-MISC ChangeLog 4254 RMD160 e45cc76c269aab78773975b9075f1b719b6aece7 SHA1 d02487f5b4dbc927e109d66b575025e929ecba74 SHA256 84890d0e030a37fcb29d081af2990219c625e4a17a5699404e83b8750f13de3f
+EBUILD ecryptfs-utils-76.ebuild 1774 RMD160 e91d1592e4ed66a9490f9f2b864ff041f85621ce SHA1 c963d2be3ea8f0951e361017844a4ee697a2dd8e SHA256 e565001a6318533f113dc69df9e5835e7dfee41f2c7f32b1c6430dba70e6116c
+MISC ChangeLog 4552 RMD160 a08b2d1da50d3afef9d9c573304d34a66bd75d99 SHA1 ed2edce116d75f33f86a4f3f19f9ea4b87bc0983 SHA256 0994a71db1e9de1d4a56895156e91490a2a56cc1a412ff62a0ee44f9d83884c6
 MISC metadata.xml 599 RMD160 d22b9f6ed4b1e207de5b3b032e1f30bc3a1f3aab SHA1 cd6d44b79acd6749c5ad7d220f0ff1657d44b59f SHA256 fcf1fab48a362024a1bce7fc47b5c364758fad7faadcda58cb54133b102b0edd
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-40.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-40.ebuild
deleted file mode 100644
index 1a4f531e3e4a..000000000000
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-40.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-40.ebuild,v 1.1 2008/02/29 20:57:40 alonbl Exp $
-
-inherit pam
-
-DESCRIPTION="eCryptfs userspace utilities"
-HOMEPAGE="http://www.ecryptfs.org/"
-SRC_URI="mirror://sourceforge/ecryptfs/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="suid pam gtk openssl pkcs11 gpg doc"
-
-RDEPEND=">=sys-apps/keyutils-1.0
-	>=dev-libs/libgcrypt-1.2.0
-	pam? ( sys-libs/pam )
-	openssl? ( >=dev-libs/openssl-0.9.7 )
-	pkcs11? (
-		>=dev-libs/openssl-0.9.7
-		>=dev-libs/pkcs11-helper-1.04
-	)
-	gpg? ( app-crypt/gpgme )
-	gtk? ( x11-libs/gtk+ )"
-# perl required for man generation
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	dev-lang/perl"
-
-src_compile() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--with-pamdir=$(getpam_mod_dir) \
-		$(use_enable pam) \
-		$(use_enable openssl) \
-		$(use_enable pkcs11 pkcs11-helper) \
-		$(use_enable gpg) \
-		$(use_enable gtk gui) \
-		$(use_enable doc docs) \
-		|| die
-	emake || die
-}
-
-src_install(){
-	emake DESTDIR="${D}" install || die
-	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 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-42.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-42.ebuild
deleted file mode 100644
index 985e9516fc1e..000000000000
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-42.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-42.ebuild,v 1.1 2008/04/08 17:28:28 alonbl Exp $
-
-inherit pam
-
-DESCRIPTION="eCryptfs userspace utilities"
-HOMEPAGE="http://www.ecryptfs.org/"
-SRC_URI="mirror://sourceforge/ecryptfs/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="suid pam gtk openssl pkcs11 gpg doc"
-
-RDEPEND=">=sys-apps/keyutils-1.0
-	>=dev-libs/libgcrypt-1.2.0
-	pam? ( sys-libs/pam )
-	openssl? ( >=dev-libs/openssl-0.9.7 )
-	pkcs11? (
-		>=dev-libs/openssl-0.9.7
-		>=dev-libs/pkcs11-helper-1.04
-	)
-	gpg? ( app-crypt/gpgme )
-	gtk? ( x11-libs/gtk+ )"
-# perl required for man generation
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	dev-lang/perl"
-
-src_compile() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--with-pamdir=$(getpam_mod_dir) \
-		$(use_enable pam) \
-		$(use_enable openssl) \
-		$(use_enable pkcs11 pkcs11-helper) \
-		$(use_enable gpg) \
-		$(use_enable gtk gui) \
-		$(use_enable doc docs) \
-		|| die
-	emake || die
-}
-
-src_install(){
-	emake DESTDIR="${D}" install || die
-	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 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-73.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-76.ebuild
index a740088baaf9..0e460479f168 100644
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-73.ebuild
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-76.ebuild
@@ -1,8 +1,10 @@
 # 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-73.ebuild,v 1.1 2009/03/29 17:08:28 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-76.ebuild,v 1.1 2009/07/18 00:27:21 arfrever Exp $
 
-inherit eutils pam
+EAPI="2"
+
+inherit autotools pam
 
 DESCRIPTION="eCryptfs userspace utilities"
 HOMEPAGE="http://launchpad.net/ecryptfs"
@@ -30,13 +32,13 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9.0
 	python? ( dev-lang/swig )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-fix_implicit_declarations.patch"
+S="${WORKDIR}/${PN}_${PV}.orig"
+
+src_prepare() {
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--with-pamdir=$(getpam_mod_dir) \
@@ -49,7 +51,6 @@ src_compile() {
 		$(use_enable pkcs11 pkcs11-helper) \
 		$(use_enable python pywrap) \
 		$(use_enable tpm tspi)
-	emake || die "emake failed"
 }
 
 src_install(){
diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-73-fix_implicit_declarations.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-73-fix_implicit_declarations.patch
deleted file mode 100644
index ed8ddbcdfded..000000000000
--- a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-73-fix_implicit_declarations.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/key_mod/ecryptfs_key_mod_gpg.c
-+++ src/key_mod/ecryptfs_key_mod_gpg.c
-@@ -18,6 +18,7 @@
-  * 02111-1307, USA.
-  */
- 
-+#include "config.h"
- #include <fcntl.h>
- #include <pwd.h>
- #include <stdio.h>
-@@ -29,7 +30,6 @@
- #include <gpgme.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include "config.h"
- #include "../include/ecryptfs.h"
- #include "../include/decision_graph.h"
- 
---- src/key_mod/ecryptfs_key_mod_pkcs11_helper.c
-+++ src/key_mod/ecryptfs_key_mod_pkcs11_helper.c
-@@ -20,6 +20,7 @@
-  * 02111-1307, USA.
-  */
- 
-+#include "config.h"
- #include <fcntl.h>
- #include <pwd.h>
- #include <stdio.h>
-@@ -28,11 +29,12 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <openssl/err.h>
-+#include <openssl/pem.h>
- #include <openssl/x509.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <pkcs11-helper-1.0/pkcs11h-certificate.h>
--#include "config.h"
- #include "../include/ecryptfs.h"
- #include "../include/decision_graph.h"
-