Unify static lib dependencies and update to EAPI=4.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

3 files changed, 37 insertions, 32 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index dbb115400a30..84e1540984d3 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.129 2012/04/01 18:45:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.130 2012/05/11 08:06:55 vapier Exp $
+
+  11 May 2012; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.4.1-r1.ebuild:
+  Unify static lib dependencies and update to EAPI=4.
 
   01 Apr 2012; Raúl Porcel <armin76@gentoo.org> cryptsetup-1.4.1.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #401217
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 4e9ab5dfaf25..a54165ce887c 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -20,14 +20,24 @@ EBUILD cryptsetup-1.0.6-r2.ebuild 3150 RMD160 997496f32ffb972a4d21efb80cb0ccedf2
 EBUILD cryptsetup-1.1.2.ebuild 3382 RMD160 c737fb8fb63a11c15c1af86db25fafc8a32e152a SHA1 4cc2311e92c429d519d99c126434b4e2ca6375cf SHA256 6445f68c8a2f1497a771cc07466f0ee6a0b23cdeb257c7db2899a1f7b247d452
 EBUILD cryptsetup-1.1.3-r3.ebuild 3467 RMD160 5a95d64bff7d3dafe21ea0176456abea73319b51 SHA1 e60b7e828697ff8ec380f9b84e716e166a553ba5 SHA256 f8785d631199f73b31abeebc9a5dd335a07c124f1688557953b89be462d7b48e
 EBUILD cryptsetup-1.2.0-r1.ebuild 3693 RMD160 c03f9fad5e18fb9ae52dadba7427ba8e1eb08ac4 SHA1 684ae967abbf890fc1c61c44f7ae7b4e37955b5e SHA256 a579ec17a8d09d5ed5a3d1d79b8cedf499783fcbfcb0d1cb179c1e991eb12360
-EBUILD cryptsetup-1.4.1-r1.ebuild 3404 RMD160 d40211beb544035b827fda25e80f3872e28b3c04 SHA1 df6f13138a679c47c3639aeec5c3214bb4637a9c SHA256 5624c7437c41beabde22cb0554a5c7afde22ef7506c017804e30d1ffd8f66108
+EBUILD cryptsetup-1.4.1-r1.ebuild 3226 RMD160 6a20fa21092f3e732b0e35b3656906f81ac405cf SHA1 9200b34b122c7858ee6cda8dc198459bcfb79fd0 SHA256 e403241762f408a3521abd250df873ac15cced5475d515c5dbb2efe1e5051021
 EBUILD cryptsetup-1.4.1.ebuild 3389 RMD160 e503d6ce6a64cb51725bbfec9ee32c225cb699ad SHA1 8e6f588da37c44b613612c815f230e5e8158e480 SHA256 04da047c80e7292f4e451aa8dc30bf9ec0122a76238960a1f3cfdfbae9f50f83
-MISC ChangeLog 19216 RMD160 658368f2b92a27e9fb4848045d759589c42b9eb8 SHA1 9620c576f012f3321495de187a70f4ca202741d7 SHA256 8eb4bc993acda9cb50563ba9738d22677861806da3dc61f4f8313d8c1db961c8
+MISC ChangeLog 19348 RMD160 e9a79fee47cfdf489e884b8537cae03732e2030a SHA1 dddf9c06224d392dab4b48df7fc57c100abc5c5e SHA256 40b33f7feede66b731e7ac00ceedeabf6bb812eeb3db0dbe865036242cb140d0
 MISC metadata.xml 319 RMD160 12a57320613564de0b0f076f47915481b15b4e1a SHA1 e0a65649b5aabd5079bf6b67058c5afef11a556b SHA256 9f83a3638c5c1aaac590711dd3ac6b1a7fbea92b3f32be918cc6207689772705
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk94olsACgkQuQc30/atMkCiVwCfYuqp4hYdjPq3pWr0IT9Qe6Ls
-F5gAnA1EyaxL2wrXo/CUpv2PDOGHlvmf
-=8F+l
+iQIcBAEBAgAGBQJPrMiuAAoJELEHsLL7fEFWKT8QAMBnH6B2xF6Wn+ZTsRXCP8aT
+47JgmCoJqiyNlZHHEtBCCAgS8tPtvzdotKtw++DK0SnPLEvURPfPm2H1Yqn/1Kqv
+3dk7cBHwo0EW4dOiy0y1bH/0D3MjfeCYSA9CiP8JGEIapfLndvMLoAHWmoQvjkR6
+eAolFn6ujY19cCnremDybPNVxTH1Sa7bRpXCex8QVbUxmr22Wy4XolPYX2fx6uLG
+9bGaxp6Rr4xs3VmlwtVmCsxwE9vtDcyfwpcEzwUJ6qUw/YwX/sFTsHIxyGjzn8yg
+wiRNACDmPFO2aI8RMz67gDRT+bQtbwwQlLcNlot6h7unN9n7rBfPq3x2KmGQHPw1
+3CAm7NCxatkN4ErRFHSOLJJB5b33HDi3AqVgnu0l79PZVIlIJMjID2Q+3HRMR64M
++c4GWRM3tHmEv2xh5b+IuthaR82Wr9Le4qT6g1UEoUxRakpxgb+HhedMUVPfRUJs
+PeE3FNesFVXIeHVV44v96IMy58kvRDasyoIkMKeTEEjo/8TWBTmzoCSuaLa1/ptD
+TZv59y+XoYb/lF8MTeduDZQEdNi9sRIrPf3qlOFwyUpH/AjJrLSh61oK3BPCTS2C
+KGBWIgSRzkdDLUbvvgRrxWbSUjReh6nGfL4IWbCK0DnUhgreOtlJx8N6UBCuEpJv
+ETAbG3mcFu2dia9wTPRk
+=5kLD
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild
index 875ebe96fac3..3725611a05cf 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild,v 1.2 2012/03/20 19:04:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild,v 1.3 2012/05/11 08:06:55 vapier Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit linux-info libtool
 
@@ -18,27 +18,19 @@ IUSE="nls selinux static"
 
 S=${WORKDIR}/${MY_P}
 
-RDEPEND="!<sys-apps/baselayout-2
-	!static? (
-		>=dev-libs/libgcrypt-1.1.42
-		dev-libs/libgpg-error
-		>=dev-libs/popt-1.7
-		>=sys-apps/util-linux-2.17.2
-		>=sys-fs/lvm2-2.02.64
-	)
-	>=sys-fs/udev-124
-	>=sys-libs/e2fsprogs-libs-1.41
-	selinux? ( sys-libs/libselinux )
-	!sys-fs/cryptsetup-luks"
+LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
+	>=dev-libs/popt-1.7[static-libs(+)]
+	>=sys-apps/util-linux-2.17.2[static-libs(+)]
+	>=dev-libs/libgcrypt-1.1.42[static-libs(+)]
+	>=sys-fs/lvm2-2.02.64[static-libs(+)]
+	>=sys-fs/udev-124[static-libs(+)]
+	>=sys-libs/e2fsprogs-libs-1.41[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	!<sys-apps/baselayout-2
+	!sys-fs/cryptsetup-luks
+	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
-	static? (
-		>=dev-libs/libgpg-error-1.10[static-libs]
-		>=dev-libs/popt-1.16-r1[static-libs]
-		|| ( >=sys-apps/util-linux-2.20[static-libs] <sys-apps/util-linux-2.20 )
-		dev-libs/libgcrypt[static-libs]
-		|| ( >=sys-fs/lvm2-2.02.88[static-libs] <sys-fs/lvm2-2.02.88 )
-		|| ( >=sys-fs/udev-182[static-libs] <=sys-fs/udev-171-r5 )
-	)"
+	static? ( ${LIB_DEPEND} )"
 
 pkg_setup() {
 	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
@@ -71,12 +63,12 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	use static && { mv "${D}"/sbin/cryptsetup{.static,} || die ; }
 	dodoc TODO ChangeLog README NEWS
 
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt || die
-	newinitd "${FILESDIR}"/dmcrypt.rc dmcrypt || die
+	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt
+	newinitd "${FILESDIR}"/dmcrypt.rc dmcrypt
 }
 
 pkg_postinst() {