fixed compilation error when USE='openssl static', bug 472692; dropped IUSE=selinux as there is no direct dep, selinux support comes from libdevmapper via sys-fs/lvm2[selinux]

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

3 files changed, 25 insertions, 7 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 909ff78f77aa..16b325d89aa1 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.152 2013/06/04 22:14:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.153 2013/08/06 20:14:54 axs Exp $
+
+  06 Aug 2013; Ian Stakenvicius <axs@gentoo.org>
+  +files/cryptsetup-1.6.1-openssl-static.patch, cryptsetup-1.6.1.ebuild:
+  fixed compilation error when USE='openssl static', bug 472692; dropped
+  IUSE=selinux as there is no direct dep, selinux support comes from
+  libdevmapper via sys-fs/lvm2[selinux]
 
   04 Jun 2013; Diego E. Pettenò <flameeyes@gentoo.org> cryptsetup-1.6.1.ebuild:
   Fix broken dependencies.
diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild
index 4b95e85840c9..a504a0640e3c 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild,v 1.3 2013/06/04 22:14:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild,v 1.4 2013/08/06 20:14:54 axs Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
-inherit python-single-r1 linux-info libtool eutils
+inherit autotools python-single-r1 linux-info libtool eutils
 
 DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
 HOMEPAGE="http://code.google.com/p/cryptsetup/"
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} nls python reencrypt selinux static static-libs udev urandom"
+IUSE="${CRYPTO_BACKENDS} nls python reencrypt static static-libs udev urandom"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -35,7 +35,6 @@ LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
 # these other packages. #414665
 RDEPEND="static-libs? ( ${LIB_DEPEND} )
 	${LIB_DEPEND//\[static-libs\(+\)\]}
-	selinux? ( sys-libs/libselinux )
 	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -53,7 +52,8 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	elibtoolize
+	epatch "${FILESDIR}"/${P}-openssl-static.patch
+	eautoreconf
 }
 
 src_configure() {
@@ -71,7 +71,6 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable python) \
 		$(use_enable reencrypt cryptsetup-reencrypt) \
-		$(use_enable selinux) \
 		$(use_enable udev) \
 		$(use_enable !urandom dev-random) \
 		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/}; do use ${x} && echo ${x} ; done)
diff --git a/sys-fs/cryptsetup/files/cryptsetup-1.6.1-openssl-static.patch b/sys-fs/cryptsetup/files/cryptsetup-1.6.1-openssl-static.patch
new file mode 100644
index 000000000000..e479a305c310
--- /dev/null
+++ b/sys-fs/cryptsetup/files/cryptsetup-1.6.1-openssl-static.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac	2013-03-24 05:02:02.000000000 -0400
++++ b/configure.ac	2013-08-06 15:57:57.844461481 -0400
+@@ -149,8 +149,8 @@
+ 	if test x$enable_static_cryptsetup = xyes; then
+ 		saved_PKG_CONFIG=$PKG_CONFIG
+ 		PKG_CONFIG="$PKG_CONFIG --static"
+-		PKG_CHECK_MODULES([OPENSSL], [openssl])
+-		CRYPTO_STATIC_LIBS=$OPENSSL_LIBS
++		PKG_CHECK_MODULES([OPENSSL_STATIC], [openssl])
++		CRYPTO_STATIC_LIBS=$OPENSSL_STATIC_LIBS
+ 		PKG_CONFIG=$saved_PKG_CONFIG
+ 	fi
+ 	NO_FIPS([])