Remove old ebuilds and bump to version 30, thanks to alonbl for the ebuild (bug 198608).

Package-Manager: portage-2.1.3.16

8 files changed, 78 insertions, 65 deletions

diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index d344fca98d90..8b3f999ec6b5 100644
--- a/sys-fs/ecryptfs-utils/ChangeLog
+++ b/sys-fs/ecryptfs-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/ecryptfs-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.8 2007/10/25 16:17:22 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.9 2007/11/10 15:31:27 masterdriverz Exp $
+
+*ecryptfs-utils-30 (10 Nov 2007)
+
+  10 Nov 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  -ecryptfs-utils-7.ebuild, -ecryptfs-utils-18.ebuild,
+  +ecryptfs-utils-30.ebuild:
+  Remove old ebuilds and bump to version 30, thanks to alonbl for the ebuild
+  (bug 198608).
 
 *ecryptfs-utils-18 (25 Oct 2007)
 
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index 137b3785b210..00610847ba70 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,24 +1,16 @@
-DIST ecryptfs-utils-18.tar.bz2 1165593 RMD160 03a703b089501fd0734d8bbc73d32816fd3821f2 SHA1 e22a2178aff0094f3eccd2f8cffa7183c161a6c4 SHA256 10bab93a7fbc9f9bc5561ae512ad0ffbd7f70dc45c3b0d39438310d4fbba64d8
-DIST ecryptfs-utils-7.tar.bz2 1070738 RMD160 93ebbc2a095d7c9cb607fcfb5156392502655685 SHA1 ecdec9d4bf4d273fcd3e1c01cea19a37d119c160 SHA256 1f070c327eacb6ea483ee712bcaf5b817125be835f1a903a80dd2b6132fa48b3
-EBUILD ecryptfs-utils-18.ebuild 524 RMD160 36170d363c4d5d9b869631fe3773cf7f0b32c549 SHA1 cfb4c43548bfd05f42604106597c6a349caea1fe SHA256 42f09b9682b5d52e9f5585243d5e306f1061d3826a70473aa325eaaf571051b9
-MD5 0910e7f8d095c58a7cd67644dae92232 ecryptfs-utils-18.ebuild 524
-RMD160 36170d363c4d5d9b869631fe3773cf7f0b32c549 ecryptfs-utils-18.ebuild 524
-SHA256 42f09b9682b5d52e9f5585243d5e306f1061d3826a70473aa325eaaf571051b9 ecryptfs-utils-18.ebuild 524
-EBUILD ecryptfs-utils-7.ebuild 517 RMD160 75ff7910ee4954c6d71de4f1e6707ec75100ad81 SHA1 08448979da33f7882581b85fdc607875e3b522e0 SHA256 db407f2ec7fcc94bd7117811cc1a948c4ccf5220b0d3160610a7bf7f087eebe1
-MD5 07a9104c2f0c4759dabd5e22aaa1a9b1 ecryptfs-utils-7.ebuild 517
-RMD160 75ff7910ee4954c6d71de4f1e6707ec75100ad81 ecryptfs-utils-7.ebuild 517
-SHA256 db407f2ec7fcc94bd7117811cc1a948c4ccf5220b0d3160610a7bf7f087eebe1 ecryptfs-utils-7.ebuild 517
-MISC ChangeLog 1499 RMD160 68bf409e9cc533c829b248904f039ba10988f002 SHA1 cc7eccf517319d460736259d4d0376f7cb49b9bb SHA256 967205696f51937820c5e93a230bcdd081295a634d643ab2e19405f73e7e3719
-MD5 6c8f70faed61b373b7abdac3def925fe ChangeLog 1499
-RMD160 68bf409e9cc533c829b248904f039ba10988f002 ChangeLog 1499
-SHA256 967205696f51937820c5e93a230bcdd081295a634d643ab2e19405f73e7e3719 ChangeLog 1499
+DIST ecryptfs-utils-30.tar.bz2 956890 RMD160 7d25d59692f883eb6e2bd730c901423370117a38 SHA1 685c7ab17fddbd1a4d96317fe91ea0f6d6483014 SHA256 a2bd95ae5b3887ef6114e51f2d073d47335194fd3afee0da5c33b57473073314
+EBUILD ecryptfs-utils-30.ebuild 1207 RMD160 36ec07d8c458c8aca303c5a77c22b5a66c67ac42 SHA1 2f52ed48291d0906336a0402fafd92e3a79c58c1 SHA256 2868873c96060767fa6e9fe3b2b89c56267f1dec6e34b4c4b1d578e06130c68a
+MD5 38f1df8abf5a293a3730c3608a3a4d69 ecryptfs-utils-30.ebuild 1207
+RMD160 36ec07d8c458c8aca303c5a77c22b5a66c67ac42 ecryptfs-utils-30.ebuild 1207
+SHA256 2868873c96060767fa6e9fe3b2b89c56267f1dec6e34b4c4b1d578e06130c68a ecryptfs-utils-30.ebuild 1207
+MISC ChangeLog 1770 RMD160 4515f302a6c995e326ea68e55192633c20f133d9 SHA1 935f71fb459afc7777135023d9083fb2cd38867e SHA256 4001cfd77d72bbcd45750a86a58e1359ee89be52bb75431ea0b4a922a5b84571
+MD5 d88d4f172b778d6871fd982a2a139539 ChangeLog 1770
+RMD160 4515f302a6c995e326ea68e55192633c20f133d9 ChangeLog 1770
+SHA256 4001cfd77d72bbcd45750a86a58e1359ee89be52bb75431ea0b4a922a5b84571 ChangeLog 1770
 MISC metadata.xml 266 RMD160 a5b08cef9a75160e9792df4fd471f58e22e90418 SHA1 051cbcebdaf63e5275c7289dbf091469d301c491 SHA256 aa269574db3d7a80a5af78ffe0f518a487f9be799950a3173346cf8554eae3f4
 MD5 54989d332a23bdd922cfaf731959a8a4 metadata.xml 266
 RMD160 a5b08cef9a75160e9792df4fd471f58e22e90418 metadata.xml 266
 SHA256 aa269574db3d7a80a5af78ffe0f518a487f9be799950a3173346cf8554eae3f4 metadata.xml 266
-MD5 7fad91d16174e0147f2e2fbb9e27a5ed files/digest-ecryptfs-utils-18 259
-RMD160 66d09d900e0622e1c1fa371a90f3669c0ece6530 files/digest-ecryptfs-utils-18 259
-SHA256 0245e1d970051f9cb06347eec43f720462e5c1262e3b8d3805394e99bb3eb375 files/digest-ecryptfs-utils-18 259
-MD5 dccd04783eab7138d3da0e2add23182c files/digest-ecryptfs-utils-7 256
-RMD160 d827bb87d9c6f913293c7076caee3b55a8cd3158 files/digest-ecryptfs-utils-7 256
-SHA256 38357fd16f12a456ffd2130d58a0ed67bed9b24f30a1db9b28d8f676866c7ee0 files/digest-ecryptfs-utils-7 256
+MD5 44e171c505e9754862264ccba7c3260c files/digest-ecryptfs-utils-30 256
+RMD160 bb11ffc375732dc7394a9c9603d075036e8697d0 files/digest-ecryptfs-utils-30 256
+SHA256 31d0630c35b9b0aed2a28c9ab0aa2ffcbf52585dd2e5a4cd1b864d273dc5579c files/digest-ecryptfs-utils-30 256
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-18.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-18.ebuild
deleted file mode 100644
index 7723f783ee7d..000000000000
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-18.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-18.ebuild,v 1.1 2007/10/25 16:17:22 masterdriverz Exp $
-
-DESCRIPTION="eCryptfs userspace utilities"
-HOMEPAGE="http://www.ecryptfs.org"
-SRC_URI="mirror://sourceforge/ecryptfs/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="sys-apps/keyutils
-	dev-libs/libgcrypt"
-
-src_install(){
-	emake -j1 DESTDIR="${D}" install || die
-}
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild
new file mode 100644
index 000000000000..fe40bc4e518d
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild,v 1.1 2007/11/10 15:31:27 masterdriverz Exp $
+
+inherit autotools
+
+DESCRIPTION="eCryptfs userspace utilities"
+HOMEPAGE="http://www.ecryptfs.org"
+SRC_URI="mirror://sourceforge/ecryptfs/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="pam gtk openssl pkcs11 gpg doc"
+
+RDEPEND="sys-apps/keyutils
+	dev-libs/libgcrypt
+	pam? ( sys-libs/pam )
+	openssl? ( dev-libs/openssl )
+	pkcs11? (
+		dev-libs/openssl
+		>=dev-libs/pkcs11-helper-1.04
+	)
+	gpg? ( app-crypt/gpgme )
+	gtk? ( x11-libs/gtk+ )"
+# perl required for man generation
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Until upstream move to autoconf-2.60
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(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
+	fperms u+s /sbin/mount.ecryptfs 
+}
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-7.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-7.ebuild
deleted file mode 100644
index cd150bb01ea0..000000000000
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-7.ebuild,v 1.3 2007/07/13 05:15:33 mr_bones_ Exp $
-
-DESCRIPTION="eCryptfs userspace utilities"
-HOMEPAGE="http://www.ecryptfs.org"
-SRC_URI="mirror://sourceforge/ecryptfs/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="sys-apps/keyutils
-	dev-libs/libgcrypt"
-
-src_install(){
-	emake -j1 DESTDIR=${D} install || die
-}
diff --git a/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-18 b/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-18
deleted file mode 100644
index bb80e5aa4283..000000000000
--- a/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-18
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6350360bcc33e77034a46cb155b4602f ecryptfs-utils-18.tar.bz2 1165593
-RMD160 03a703b089501fd0734d8bbc73d32816fd3821f2 ecryptfs-utils-18.tar.bz2 1165593
-SHA256 10bab93a7fbc9f9bc5561ae512ad0ffbd7f70dc45c3b0d39438310d4fbba64d8 ecryptfs-utils-18.tar.bz2 1165593
diff --git a/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-30 b/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-30
new file mode 100644
index 000000000000..3d0fe921e295
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-30
@@ -0,0 +1,3 @@
+MD5 7b4c343e17652f84c6615c6db6b286d9 ecryptfs-utils-30.tar.bz2 956890
+RMD160 7d25d59692f883eb6e2bd730c901423370117a38 ecryptfs-utils-30.tar.bz2 956890
+SHA256 a2bd95ae5b3887ef6114e51f2d073d47335194fd3afee0da5c33b57473073314 ecryptfs-utils-30.tar.bz2 956890
diff --git a/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-7 b/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-7
deleted file mode 100644
index 3be9b61bd0f8..000000000000
--- a/sys-fs/ecryptfs-utils/files/digest-ecryptfs-utils-7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7d382d6f8b465c13015dd8408578de3 ecryptfs-utils-7.tar.bz2 1070738
-RMD160 93ebbc2a095d7c9cb607fcfb5156392502655685 ecryptfs-utils-7.tar.bz2 1070738
-SHA256 1f070c327eacb6ea483ee712bcaf5b817125be835f1a903a80dd2b6132fa48b3 ecryptfs-utils-7.tar.bz2 1070738