Cleanup src_compile(), punt invalid USE=pic, and make sure that just running autoconf works.

Package-Manager: portage-2.1.1_pre4

3 files changed, 30 insertions, 33 deletions

diff --git a/sys-fs/cryptsetup-luks/ChangeLog b/sys-fs/cryptsetup-luks/ChangeLog
index 2c53a75b3861..03d80aa6b11e 100644
--- a/sys-fs/cryptsetup-luks/ChangeLog
+++ b/sys-fs/cryptsetup-luks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/cryptsetup-luks
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/ChangeLog,v 1.36 2006/08/05 21:27:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/ChangeLog,v 1.37 2006/08/08 02:38:39 vapier Exp $
+
+  08 Aug 2006; Mike Frysinger <vapier@gentoo.org>
+  cryptsetup-luks-1.0.3-r2.ebuild:
+  Cleanup src_compile(), punt invalid USE=pic, and make sure that just running
+  autoconf works.
 
   05 Aug 2006; Mike Frysinger <vapier@gentoo.org>
   cryptsetup-luks-1.0.3-r2.ebuild:
diff --git a/sys-fs/cryptsetup-luks/Manifest b/sys-fs/cryptsetup-luks/Manifest
index ac314d6237a9..a76f0ae3238c 100644
--- a/sys-fs/cryptsetup-luks/Manifest
+++ b/sys-fs/cryptsetup-luks/Manifest
@@ -35,14 +35,14 @@ EBUILD cryptsetup-luks-1.0.1-r2.ebuild 2113 RMD160 9e2a4262487ac28c5187608d7f556
 MD5 06345bb64c18f0ab5857556a8bd52de0 cryptsetup-luks-1.0.1-r2.ebuild 2113
 RMD160 9e2a4262487ac28c5187608d7f55611a3427b438 cryptsetup-luks-1.0.1-r2.ebuild 2113
 SHA256 b694e6dd1aee7872022e048ab9db572fdaf2ffeda36603dc2dbd268cb639f495 cryptsetup-luks-1.0.1-r2.ebuild 2113
-EBUILD cryptsetup-luks-1.0.3-r2.ebuild 2418 RMD160 dd340fad3aa2d97669020003d361cf4f89c1afcd SHA1 c756e476b0a21ab9b333d088d5ee361bd3c4ddc8 SHA256 661643cf0df6ec2f6987bd2c1d54bcfdc60c300bc50842af26d1d3438ca4b75a
-MD5 d7f6733a4dd0d3d0bf7ff71c1793510a cryptsetup-luks-1.0.3-r2.ebuild 2418
-RMD160 dd340fad3aa2d97669020003d361cf4f89c1afcd cryptsetup-luks-1.0.3-r2.ebuild 2418
-SHA256 661643cf0df6ec2f6987bd2c1d54bcfdc60c300bc50842af26d1d3438ca4b75a cryptsetup-luks-1.0.3-r2.ebuild 2418
-MISC ChangeLog 4943 RMD160 a247bb9d576678c828b01f909f4e10c7ff43d80b SHA1 eac17bd81772ecfba26fe8c1f489cf38e7ba8e8b SHA256 0c0ccab5f48eb448f5a69dbe3e7447273023e08be184b6566fba706f09f3ace8
-MD5 cdeb04e02812087529574cb9655fe35e ChangeLog 4943
-RMD160 a247bb9d576678c828b01f909f4e10c7ff43d80b ChangeLog 4943
-SHA256 0c0ccab5f48eb448f5a69dbe3e7447273023e08be184b6566fba706f09f3ace8 ChangeLog 4943
+EBUILD cryptsetup-luks-1.0.3-r2.ebuild 2185 RMD160 a05a6474dcb11b2f2602200ee8dda215ba6032b5 SHA1 dbfcc30e8ff17510bef8997527523ee172a56ed8 SHA256 e178e76f1a9e5932f3bc7f857bb3497a90ff66c8135b479992fee4b00716e63f
+MD5 7eab609478f7f6bab52d9a2be47ccbeb cryptsetup-luks-1.0.3-r2.ebuild 2185
+RMD160 a05a6474dcb11b2f2602200ee8dda215ba6032b5 cryptsetup-luks-1.0.3-r2.ebuild 2185
+SHA256 e178e76f1a9e5932f3bc7f857bb3497a90ff66c8135b479992fee4b00716e63f cryptsetup-luks-1.0.3-r2.ebuild 2185
+MISC ChangeLog 5126 RMD160 c0099f3715eb8c63abddc223ed6e1ba7d7b4992b SHA1 4a0f4513f6f97fd4b0242d494e6ef98ad26495fe SHA256 fcc833204d8d54c36197ceda2e7e3834471b9d229fc63c97c1cde24fa18dcead
+MD5 554ca67bf7efcab0df00be8fdd4a22fa ChangeLog 5126
+RMD160 c0099f3715eb8c63abddc223ed6e1ba7d7b4992b ChangeLog 5126
+SHA256 fcc833204d8d54c36197ceda2e7e3834471b9d229fc63c97c1cde24fa18dcead ChangeLog 5126
 MISC metadata.xml 228 RMD160 4ecb17bc29c5805c7d009098d379f85807f0ff9a SHA1 0f7be0d47f13ff42c97b3787385fe6e1cd9cbfc0 SHA256 157fd3642e30749762584d579cbeb8095379a572897d3f60dc30414cfd0f5c34
 MD5 6c788beeca78bd11e5cd6e759e52fadc metadata.xml 228
 RMD160 4ecb17bc29c5805c7d009098d379f85807f0ff9a metadata.xml 228
@@ -59,7 +59,7 @@ SHA256 b3e05fc5b08998b29b5c80fdab6eb5f3b9c7558ddd447c785cb4baf998bde190 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFE1Q1tamhnQswr0vIRAmaoAKCEVIyxXX6qsX/6SQfHCF7W8h7RMQCfX1b0
-WDY6lZsv16hD1uC4dv/YuCE=
-=FhMJ
+iD8DBQFE1/k/amhnQswr0vIRAnP8AKCfIKyTStQy5+O/fjI1rK21UanqPQCaAsVf
+7Nt/ExGSpCt9nSxTrxAwgCg=
+=jTAC
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild
index 6f3392b77882..4cfd08e52579 100644
--- a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild
+++ b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild,v 1.9 2006/08/05 21:27:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r2.ebuild,v 1.10 2006/08/08 02:38:39 vapier Exp $
 
 inherit autotools linux-info eutils flag-o-matic multilib
 
@@ -11,7 +11,8 @@ SRC_URI="http://luks.endorphin.org/source/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 arm ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="dynamic nls pic selinux"
+IUSE="dynamic nls selinux"
+RESTRICT="confcache"
 
 DEPEND=">=sys-fs/device-mapper-1.00.07-r1
 	>=dev-libs/libgcrypt-1.1.42
@@ -19,8 +20,6 @@ DEPEND=">=sys-fs/device-mapper-1.00.07-r1
 	selinux? ( sys-libs/libselinux )
 	!sys-fs/cryptsetup"
 
-RESTRICT="confcache"
-
 dm-crypt_check() {
 	ebegin "Checking for dm-crypt support"
 	linux_chkconfig_present DM_CRYPT
@@ -43,38 +42,31 @@ dm-crypt_check() {
 
 pkg_setup() {
 	linux-info_pkg_setup
-	dm-crypt_check;
+	dm-crypt_check
 }
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-selinux.patch
-	rm -f po/Makefile.in.in #142362
-	autopoint -f || die
-	AT_M4DIR="${S}/m4" eautoreconf
+	eautoconf || die
+	touch aclocal.m4 Makefile.in configure
 }
 
 src_compile() {
-	local PIC_FLAG=""
-	if use pic ; then
-		PIC_FLAG="--with-pic"
-	fi
-
 	if use dynamic ; then
 		ewarn "If you need cryptsetup for an initrd or initramfs then you"
 		ewarn "should NOT use the dynamic USE flag"
 		epause 5
-		econf --sbindir=/bin --disable-static --libdir=/usr/$(get_libdir) "${PIC_FLAG}" \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		|| die
-	else
-		econf --sbindir=/bin --enable-static --libdir=/usr/$(get_libdir) "${PIC_FLAG}" \
+	fi
+
+	econf \
+		--sbindir=/bin \
+		$(use_enable !dynamic static) \
+		--libdir=/usr/$(get_libdir) \
 		$(use_enable nls) \
 		$(use_enable selinux) \
 		|| die
-	fi
 
 	emake || die
 }
@@ -83,7 +75,7 @@ src_install() {
 	make DESTDIR="${D}" install || die "install failed"
 	rmdir "${D}/usr/$(get_libdir)/cryptsetup"
 	insinto /lib/rcscripts/addons
-	newconfd ${FILESDIR}/cryptfs.confd cryptfs
+	newconfd "${FILESDIR}"/cryptfs.confd cryptfs
 	doins "${FILESDIR}"/dm-crypt-{start,stop}.sh
 }