Add patch to avoid silly sed on generated file (bug #226431)

Package-Manager: portage-2.1.4.4

4 files changed, 32 insertions, 22 deletions

diff --git a/dev-games/ode/ChangeLog b/dev-games/ode/ChangeLog
index 55d6a1f22af5..cbf1f68bbe08 100644
--- a/dev-games/ode/ChangeLog
+++ b/dev-games/ode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/ode
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.46 2008/02/24 09:45:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.47 2008/06/20 01:42:01 mr_bones_ Exp $
+
+  20 Jun 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/ode-0.9-destdir.patch, ode-0.9.ebuild:
+  Add patch to avoid silly sed on generated file (bug #226431)
 
   24 Feb 2008; Mike Frysinger <vapier@gentoo.org>
   +files/ode-0.9-x-flags.patch, ode-0.9.ebuild:
diff --git a/dev-games/ode/Manifest b/dev-games/ode/Manifest
index fe945a268c7c..7034290ebce8 100644
--- a/dev-games/ode/Manifest
+++ b/dev-games/ode/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ode-0.6-flags.patch 734 RMD160 c673c5ff42e2872536e5d6a34c9276440b57a65a SHA1 e438b6b8ce3dfef534a93f18ceb82f94e048651d SHA256 09c2d22c12f606485cd89a0ecfdefed78714a4b5a94e720ecad505ec457c19d6
 AUX ode-0.8-flags.patch 983 RMD160 66caffe33e3a365ea7428b6971c0326f90ccb247 SHA1 55967c2228f63cb1dab42f9d4374cb0581fb0e32 SHA256 0d97aa182e9b62bccc30b56481aab5fa58db52f363031f8e1921b370f78c3d3a
+AUX ode-0.9-destdir.patch 592 RMD160 986a24d8709c5087cb401381af99d3fce371f2bf SHA1 d1057505e26344f0a9c77d8d2b3a7d881f2dd916 SHA256 402f013a18f3b7544b3229504465c4b5753a4ef3035cd9beed379369d77ff6f5
 AUX ode-0.9-flags.patch 1223 RMD160 d0a552b32b84f5a8efcc182adb5fa20f1eee9c81 SHA1 aaefc81039eb9849d5479352db0c3cb90306e3cf SHA256 947a196431b5fe958c59f85022e40dac44baeff25ba03982cbab01d4b962432d
 AUX ode-0.9-x-flags.patch 562 RMD160 47447b2f4bfcb2a3b179cba55c8b470f1d55fc0f SHA1 01270307da19f5087b7beba038fd53aa74d93c3b SHA256 ff81e01492d696ea0eb88cf05860f98a27fcc277e07554b50fbe2959611c82ae
 DIST ode-src-0.8.zip 2005445 RMD160 43a299a61a5ce6ed757eefc2855cd05fe6ae2024 SHA1 8e8a956ecebfc9e1f5f76b4e0083147581d85abe SHA256 07d751fc92ca4c739d4e76e2fc01cda19374d126bd65a789529dd727d1ec3edb
 DIST ode-src-0.9.zip 2052825 RMD160 e999fef770d664a57ffb2f71bf5351fbd84d5b17 SHA1 3b39ce085c2dc77c3fad7abaa382ffc20d3780e5 SHA256 460d0851b743b1f144ef2a8259004d6774504c95d08e9357a96a296111496feb
 EBUILD ode-0.8.ebuild 2136 RMD160 5ec433c758fd98327165891f63e4ebac3f10cb58 SHA1 b066c64d20cd16306441878a3a701464d1ced7c3 SHA256 617fe30d3f713ef072ac96cefaeb0ba5a312f70a883c5efbc6cb492e0572d24b
-EBUILD ode-0.9.ebuild 2499 RMD160 0f7701580d1d52c7af73915fb908b63cd2f62b41 SHA1 25c866a00dc07727b3ed10ee925da01fc9f0b034 SHA256 bd8ad095472c74f7bf049deb7da8f878cc5bfe5d0329a54a86d00546471542d0
-MISC ChangeLog 6405 RMD160 6bba70beb396d052eed4ecb23b371066421f330d SHA1 6f4186486b794dbb210b4b8d158a0de6a2e115d1 SHA256 c788c88db0beda810c7ba760c7a40a8a97a7c6bcbcfa76c31cb850b7a83c0707
+EBUILD ode-0.9.ebuild 2348 RMD160 c7d1cc5d7779a3fbc5c5b9e04c4bf84e5839ae5c SHA1 330c5d05ced78477ba2aacf7adec01003fe006f1 SHA256 21310371b672d7e943c048adcfcdd1fc1d04819c74713e726f97674e54b6e81f
+MISC ChangeLog 6575 RMD160 16ada1f42d881c3b2d7a4260f5a10d773e500fe6 SHA1 bb13ac845a2c8f947de93999485df927f076b7d5 SHA256 25d082a812378545ed201d7605fe579379ab8015f64b0b508420a846cfbd5244
 MISC metadata.xml 507 RMD160 fc35b374510850c6916d280578c4b9fad69d2f6a SHA1 2844b71e1f83503d096e912d5d61d6b69b296a99 SHA256 b8638b82f39c6329cfeeab46ec0a1cf325a28f880ce4b87e19b0586d41bd58de
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHwTy9j9hvisErhMIRAqrSAJ0SJmaYj7o+xz2vObeUc76X134iagCgzsmk
-Zz54n6lWQ2vCfWOsggGw6/w=
-=hUhx
------END PGP SIGNATURE-----
diff --git a/dev-games/ode/files/ode-0.9-destdir.patch b/dev-games/ode/files/ode-0.9-destdir.patch
new file mode 100644
index 000000000000..594d5c7ff925
--- /dev/null
+++ b/dev-games/ode/files/ode-0.9-destdir.patch
@@ -0,0 +1,18 @@
+--- Makefile.am.orig	2008-06-19 20:26:58.000000000 -0400
++++ Makefile.am	2008-06-19 20:28:10.000000000 -0400
+@@ -26,12 +26,11 @@
+ if USE_SONAME
+ install-exec-hook:
+ 	ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+-	$(libdir)/libode.so
++	$(DESTDIR)$(libdir)/libode.so
+ 	ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+-	$(libdir)/@ODE_SONAME@
++	$(DESTDIR)$(libdir)/@ODE_SONAME@
+ 	ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+-	$(libdir)/@ODE_SONAME@.@ODE_REVISION@
+-	/sbin/ldconfig
++	$(DESTDIR)$(libdir)/@ODE_SONAME@.@ODE_REVISION@
+ else
+ install-exec-hook:
+ endif
diff --git a/dev-games/ode/ode-0.9.ebuild b/dev-games/ode/ode-0.9.ebuild
index 3ab1a9830006..2c53c542766b 100644
--- a/dev-games/ode/ode-0.9.ebuild
+++ b/dev-games/ode/ode-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.9.ebuild,v 1.2 2008/02/24 09:45:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.9.ebuild,v 1.3 2008/06/20 01:42:01 mr_bones_ Exp $
 
 inherit eutils autotools
 
@@ -29,8 +29,11 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-flags.patch
-	epatch "${FILESDIR}"/${P}-x-flags.patch
+	epatch \
+		"${FILESDIR}"/${P}-flags.patch \
+		"${FILESDIR}"/${P}-x-flags.patch \
+		"${FILESDIR}"/${P}-destdir.patch
+
 	eautoreconf
 
 	sed -i \
@@ -45,12 +48,6 @@ src_unpack() {
 		-e "s/inline_[\t]*void[\t*]ResetCountDown/void ResetCountDown/" \
 		OPCODE/OPC_TreeCollider.h \
 		|| die "sed failed"
-	sed -i \
-		-e '/USE_SONAME_TRUE/s:\(\$(libdir)\):$(DESTDIR)\1:' \
-		-e '/USE_SONAME_TRUE.*ldconfig/d' \
-		-e '/USE_SONAME_TRUE.*ln -s/s:\$(DESTDIR)::' \
-		Makefile.in \
-		|| die "sed failed"
 }
 
 src_compile() {