Bump to EAPI4, respect LDFLAGS, CXX, cleanup

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

4 files changed, 50 insertions, 17 deletions

diff --git a/app-admin/chroot_safe/ChangeLog b/app-admin/chroot_safe/ChangeLog
index 7949a10091d7..11f532e09508 100644
--- a/app-admin/chroot_safe/ChangeLog
+++ b/app-admin/chroot_safe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/chroot_safe
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chroot_safe/ChangeLog,v 1.10 2007/03/19 02:02:38 kloeri Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chroot_safe/ChangeLog,v 1.11 2011/04/10 15:00:31 angelos Exp $
+
+  10 Apr 2011; Christoph Mende <angelos@gentoo.org> chroot_safe-1.4.ebuild,
+  +files/chroot_safe-1.4-ldflags.patch:
+  Bump to EAPI4, respect LDFLAGS, CXX, cleanup
 
   19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove ka0ttic from metadata.xml due to retirement.
diff --git a/app-admin/chroot_safe/Manifest b/app-admin/chroot_safe/Manifest
index 73dedab9f488..08005f93bfca 100644
--- a/app-admin/chroot_safe/Manifest
+++ b/app-admin/chroot_safe/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX chroot_safe-1.4-ldflags.patch 399 RMD160 de29b89e7a13109326b7388abe9b90084f34cf42 SHA1 b293ce5ac45d3154904a7d09e34535c5ba7a3d8b SHA256 eb0f6af6b3565104c2fae3ec7138ff6587104af3a112b358398277f9ab2d28d4
 DIST chroot_safe-1.3.tgz 25042 RMD160 467440969fcada8289bfed26f26349a41613843f SHA1 676e6daabf6a6348f3a08801b0704a13665c9643 SHA256 c53f92f617f66ed2b466de30ac8d49a3e9c8ef632d835cbe705583a78ec59e75
 DIST chroot_safe-1.4.tgz 25886 RMD160 c2db72d9e2366c9eb00b0eee5c1eabbdf1a0fd2c SHA1 23130f1e06c37dba2babf820d63ce9269f27128f SHA256 dcdd299e0275838531bbc53de3bb5ecd70f99d0af5fa328e8de761b4de4623bf
 EBUILD chroot_safe-1.3.ebuild 923 RMD160 81a846550f517ce0468976464f7ccbf8a06db3f2 SHA1 2d8b5edef9efd00bccae134187ab853e1cffdc43 SHA256 b0a368e70d9ea25f9d2361d3c7d5634c84713c7508a3277410d620fbc10b8058
-EBUILD chroot_safe-1.4.ebuild 935 RMD160 8512bc678330c0989dfd72981313059ee5fd69c8 SHA1 c7001ef63a377bfa158ad34b4942f1520bbd0103 SHA256 9b8e9578ae2fe61f726a9318a98c7a0c78d4e28dad82034aede857756ee6e842
-MISC ChangeLog 1249 RMD160 9ca1aed4b4185226316e3f8dd4ce537e313cc32c SHA1 e1df4d20196e0b163b5cc5a0e331745256b80e9c SHA256 b8b4a131e547daa054796e097ccaa8cb38e73e2a1be8389b3836f079317dc366
+EBUILD chroot_safe-1.4.ebuild 897 RMD160 d2dbb6a6774693b7ddd81ede6cf6709f5caaf953 SHA1 5402ff57408e2bc4415ef861940420e26581be90 SHA256 dde66a28835ae051df2fcbcec841df4179e860a5dc73b8f83012ae3adacb6360
+MISC ChangeLog 1414 RMD160 1b592e80cab7d2cd68bc1edd7494ff9d3a96e566 SHA1 3ac7d94c827acaef3e63a33a933b2da7585e42ba SHA256 4fc183e6507b5f58af2b6c6756977e983dd7d173b01af7bfb8b3ce0b6452a1a3
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk2hxgQACgkQmWq1bYTyC0MOcwD/bpNHrQqHiUIQCqkBpXQLZoSI
+qGAaX0HqgBbUYO91EvoBALEb467Tm5MFs5JB4HwaYKJvmMhvcs0ZoiBA80JsLZis
+=KTEm
+-----END PGP SIGNATURE-----
diff --git a/app-admin/chroot_safe/chroot_safe-1.4.ebuild b/app-admin/chroot_safe/chroot_safe-1.4.ebuild
index c44c6d40b9b5..bc9f0bd3be6d 100644
--- a/app-admin/chroot_safe/chroot_safe-1.4.ebuild
+++ b/app-admin/chroot_safe/chroot_safe-1.4.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chroot_safe/chroot_safe-1.4.ebuild,v 1.3 2007/01/04 22:46:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chroot_safe/chroot_safe-1.4.ebuild,v 1.4 2011/04/10 15:00:31 angelos Exp $
 
+EAPI=4
 inherit eutils
 
-DESCRIPTION="chroot_safe is a tool to chroot any dynamically linked application in a safe and sane manner."
+DESCRIPTION="a tool to chroot any dynamically linked application in a safe and sane manner"
 HOMEPAGE="http://chrootsafe.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN//_}/${P}.tgz"
 
@@ -13,19 +14,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_configure() {
+	econf --libexecdir="${EPREFIX}/usr/$(get_libdir)"
+}
+
 src_compile() {
-	econf \
-		--libexecdir="/usr/$(get_libdir)" \
-		--sbindir="/usr/sbin" \
-		|| die "econf failed"
-	emake CPPFLAGS="${CXXFLAGS}" || die "emake failed"
+	emake CPPFLAGS="${CXXFLAGS}" CXX="$(tc-getCXX)"
 }
 
 src_install() {
-	dolib.so chroot_safe.so || die "dolib.so failed"
-	dosbin chroot_safe || die "dosbin failed"
-	dosed "s:/chroot_safe::" /usr/sbin/chroot_safe \
-		|| die "dosed chroot_safe failed"
-	doman chroot_safe.1 || die "doman failed"
+	dolib.so chroot_safe.so
+	dosbin chroot_safe
+	sed -i -e "s:/chroot_safe::" "${ED}"/usr/sbin/chroot_safe \
+		|| die "sed chroot_safe failed"
+	doman chroot_safe.1
 	dodoc CHANGES.txt
 }
diff --git a/app-admin/chroot_safe/files/chroot_safe-1.4-ldflags.patch b/app-admin/chroot_safe/files/chroot_safe-1.4-ldflags.patch
new file mode 100644
index 000000000000..e9e94580ac42
--- /dev/null
+++ b/app-admin/chroot_safe/files/chroot_safe-1.4-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index ce69ab7..e8542b5 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -12,7 +12,7 @@ install=@INSTALL@
+ all: chroot_safe.so
+ 
+ chroot_safe.so: chroot_safe.cpp Makefile
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) $(SOFLAGS) -o chroot_safe.so $<
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(DEFINES) $(SOFLAGS) -o chroot_safe.so $<
+ 
+ clean:
+ 	rm -f *.o *.so *~