[gentoo-commits] dev/ikelos:master commit in: sys-fs/cryptsetup/

[gentoo-commits] dev/ikelos:master commit in: sys-fs/cryptsetup/

[Mike Auty]

commit:     2dbb6b77933884722a5bfd9bafd0d045b3559508
Author:     Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 20:47:59 2011 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 20:47:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=2dbb6b77

Fix up bug 374571, by fixing static dependencies.  Sorry\!

---
 sys-fs/cryptsetup/Manifest                   |    2 +-
 sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild |   25 +++++++++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index e9335c6..3c5b2ac 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -7,6 +7,6 @@ AUX cryptsetup-libmapper.patch 297 RMD160 1f5a19f125147797db69f4fb75d6abe36743d5
 DIST cryptsetup-1.1.3.tar.bz2 499276 RMD160 bf2e724779174a3cd6ce9d592e17c70979f26e85 SHA1 6f8a4c9a80a0d25f8492dfce6db6abed221598f6 SHA256 9c8e68a272f6d9cfb6cd65cc0743f4c44a2096c61f74e0602bf40208b5e69c0a
 DIST cryptsetup-1.2.0.tar.bz2 523859 RMD160 8f1ce6d72a056e9c98996be85041569e96abff24 SHA1 fa9383eda40655311f2dfe751e061b0111c73908 SHA256 411129817ff29e6a957bcbdcd9a2c4c953c1539acd8af912c383262ba901b5ea
 EBUILD cryptsetup-1.1.3-r1.ebuild 3025 RMD160 843b23023dad44abf838104b6c8fe9093c06659a SHA1 9877c7be844c2c2b278b6657c3130ff30934c77e SHA256 85914b25db3c6cee012874d074384e7e88a16762172a6cdae2128827d8ebb5b2
-EBUILD cryptsetup-1.2.0-r1.ebuild 2981 RMD160 d31d2e8c993b2f826ec65d0644a7234f4474405c SHA1 7e9cdd036da8c9d2fc088a19e161b6b8cb5fe3f8 SHA256 6a20f68025b1b357638e71b97d6c1fc44e64e644302fe69afa9979ef153824a5
+EBUILD cryptsetup-1.2.0-r1.ebuild 3425 RMD160 9aeb24cb68e97e6fcd2e49212c570ce0fa55168c SHA1 56b8bf5d211940eb5d6a4f04e581787801118ea9 SHA256 3c934786ebc5f65ca27378423840e8b953ab181e36ff757f194f2a244f598fb4
 MISC ChangeLog 8662 RMD160 adbbc01b60c1037af84df02413ee1afa64f10cf2 SHA1 a84a2a8e28e946d3145e46d75a3c8e3e09e7dc14 SHA256 34076d1a2bfec53052de55c21452f09f189f068e5c467db06f4946d809c835ac
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a

diff --git a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
index 0bf250b..287b9ec 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.2 2011/01/04 20:14:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.7 2011/03/17 16:32:10 ssuominen Exp $
 
 EAPI="2"
 
@@ -18,14 +18,22 @@ IUSE="+static nls selinux"
 
 S=${WORKDIR}/${MY_P}
 
-DEPEND=">=sys-fs/lvm2-2.02.64
+RDEPEND=">=sys-fs/lvm2-2.02.64
 	>=dev-libs/libgcrypt-1.1.42
-	>=dev-libs/libgpg-error-1.0-r1
-	>=dev-libs/popt-1.7
+	!static? (
+		dev-libs/libgpg-error
+		>=dev-libs/popt-1.7
+	)
 	>=sys-fs/udev-124
 	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
 	selinux? ( sys-libs/libselinux )
 	!sys-fs/cryptsetup-luks"
+DEPEND="${RDEPEND}
+	static? (
+		|| ( >=dev-libs/libgpg-error-1.10[static-libs] <dev-libs/libgpg-error-1.10 )
+		|| ( >=dev-libs/popt-1.16-r1[static-libs] <dev-libs/popt-1.16-r1 )
+		dev-libs/libgcrypt[static-libs]
+	)"
 
 pkg_setup() {
 	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
@@ -37,6 +45,7 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i '/enable_static_cryptsetup=yes/d' configure #350463
+	sed -i '/^LOOPDEV=/s:=.*:=`losetup -f` || exit 0:' tests/{compat,mode}-test
 	elibtoolize
 }
 
@@ -50,6 +59,14 @@ src_configure() {
 		$(use_enable selinux)
 }
 
+src_test() {
+	if [[ ! -e /dev/mapper/control ]] ; then
+		ewarn "No /dev/mapper/control found -- skipping tests"
+		return 0
+	fi
+	default
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
 	use static && { mv "${D}"/sbin/cryptsetup{.static,} || die ; }