add patch from Michael Edenfield to apply the DESTDIR string correctly (bug #237607)

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28.1 i686

4 files changed, 48 insertions, 6 deletions

diff --git a/dev-games/ggz-client-libs/ChangeLog b/dev-games/ggz-client-libs/ChangeLog
index 44491ca77b34..d5460aedaa05 100644
--- a/dev-games/ggz-client-libs/ChangeLog
+++ b/dev-games/ggz-client-libs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/ggz-client-libs
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ggz-client-libs/ChangeLog,v 1.28 2008/11/13 19:46:25 ranger Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ggz-client-libs/ChangeLog,v 1.29 2009/02/01 06:23:08 mr_bones_ Exp $
+
+  01 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/ggz-client-libs-0.0.14.1-destdir.patch,
+  ggz-client-libs-0.0.14.1.ebuild:
+  add patch from Michael Edenfield to apply the DESTDIR string correctly (bug
+  #237607)
 
   13 Nov 2008; Brent Baude <ranger@gentoo.org>
   ggz-client-libs-0.0.14.1.ebuild:
diff --git a/dev-games/ggz-client-libs/Manifest b/dev-games/ggz-client-libs/Manifest
index 66c9d67b144d..da6efba1b01a 100644
--- a/dev-games/ggz-client-libs/Manifest
+++ b/dev-games/ggz-client-libs/Manifest
@@ -1,6 +1,7 @@
+AUX ggz-client-libs-0.0.14.1-destdir.patch 1136 RMD160 b0fd34d9113ea17d6e7d4e57b7d42e75b1fcf65a SHA1 bcc7bfe3c8fc873646d83c05108f673dc5073389 SHA256 609cc014c6964034e0cdf1d4245ae6383e4aae0d41273a266ef6570d2badfc27
 DIST ggz-client-libs-0.0.14.1.tar.gz 614117 RMD160 b7a0e3b63261b3f8ff725eae212ecf0001c46fa8 SHA1 1328095d0f7e3415e1748208438127f0ee67a573 SHA256 0a7bec1a381a450f650890b36253893df0001873ba1f414573a4247298107680
 DIST ggz-client-libs-0.0.14.tar.gz 578903 RMD160 d563be1f0c1a83d8c6c358c5cdd8f7ba6d07ea2d SHA1 d36740e939828a1253788efe998a4109a49bed10 SHA256 a2ad93d5158bbe687275cc3ded1379bd2ae6f0463e4fe785cda0fdcf01af8a04
-EBUILD ggz-client-libs-0.0.14.1.ebuild 516 RMD160 d5d5ac51dd143ab6d6c0568416f727d6fe107838 SHA1 f243f6acdb712c30f56353db3c8c3d41a0db8360 SHA256 a07bedd8cb3a98fdea07a4aeca273022b8a4fb2df89d7895ce91a68a3d8b910b
+EBUILD ggz-client-libs-0.0.14.1.ebuild 565 RMD160 f3a8e8814f1e59785c9c9d5c9fe1ddfdef9207c2 SHA1 7c2f61346b6fc93a765ffbd206dad0f10fe9d7b3 SHA256 40954d2078b2f9ccca266f600da38bdfa3e446a9cacc5d484480888c34cf1adb
 EBUILD ggz-client-libs-0.0.14.ebuild 491 RMD160 72ca1dd77860d3c2ea52ae2afca987e0a749d13b SHA1 89262af306de3c5902eadc6e7d0db08067531815 SHA256 98ae1ded914b9c92e4af9578e5c7146947ea611830ec4a1bd083e73abca426cc
-MISC ChangeLog 3879 RMD160 5e017263cc60dbeb20fac3c1cac6f7ea43d10319 SHA1 ea58f01c843cb6df034ea64c40e2512c9488fe00 SHA256 982f604a977c550ba8faece2f0d4649ceb27e92cb8eaf8d6827d4324e210b1df
+MISC ChangeLog 4111 RMD160 6ccfcb63ca49d49cf3a33b317783a5a2631180fc SHA1 bff2fe25fded82ca7b28431c477a0821b66d7887 SHA256 f12e88593be884096a72403b14e1e98ee33d62fd9bb09c140826b675ec9ba40d
 MISC metadata.xml 428 RMD160 742fed788e2947ca9ba85b5d9c234778fda310fc SHA1 c003bb872b0ba384f9e45d56431f149dd94c649b SHA256 ca242ceeaf7a146b8ce0ad3ce0a7f1761edaf7324b735a2e910619ad9c6d29af
diff --git a/dev-games/ggz-client-libs/files/ggz-client-libs-0.0.14.1-destdir.patch b/dev-games/ggz-client-libs/files/ggz-client-libs-0.0.14.1-destdir.patch
new file mode 100644
index 000000000000..1592e19b0927
--- /dev/null
+++ b/dev-games/ggz-client-libs/files/ggz-client-libs-0.0.14.1-destdir.patch
@@ -0,0 +1,34 @@
+--- ggz-client-libs-0.0.14.1/ggz-config/ggz-config.c.orig	2008-01-05 14:02:46.000000000 -0500
++++ ggz-client-libs-0.0.14.1/ggz-config/ggz-config.c	2008-11-11 15:48:51.000000000 -0500
+@@ -452,12 +452,14 @@
+ {
+ 	char *suffix = ".module.dsc";
+ 	char global_pathname[(moddest ? strlen(destdir) : 0)
+-			     + strlen(copydir)
++		+ strlen(copydir) + 2];
++	char full_pathname[strlen(global_pathname)
+ 			     + strlen(modname)
+-			     + strlen(suffix) + 3];
++			     + strlen(suffix) + 2];
+ 	char fixedmodname[strlen(modname) + 1];
+ 	unsigned int i;
+ 
++
+ 	if(moddest)
+ 		sprintf(global_pathname, "%s/%s", destdir, copydir);
+ 	else
+@@ -473,10 +475,11 @@
+ 	for(i = 0; i < strlen(fixedmodname); i++) {
+ 		if(fixedmodname[i] == '/') fixedmodname[i] = '_';
+ 	}
+-	sprintf(global_pathname, "%s/%s%s", global_pathname, fixedmodname, suffix);
+ 
+-	printf(_("Preserving %s as %s...\n"), modfile, global_pathname);
+-	return filecopy(modfile, global_pathname);
++	sprintf(full_pathname, "%s/%s%s", global_pathname, fixedmodname, suffix);
++
++	printf(_("Preserving %s as %s...\n"), modfile, full_pathname);
++	return filecopy(modfile, full_pathname);
+ }
+ 
+ 
diff --git a/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild b/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild
index ef24ae7f1e7e..669eb7b46587 100644
--- a/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild
+++ b/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild,v 1.9 2008/11/13 19:46:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild,v 1.10 2009/02/01 06:23:08 mr_bones_ Exp $
 
 inherit games-ggz
 
@@ -16,3 +16,4 @@ RDEPEND="~dev-games/libggz-${PV}
 	virtual/libintl"
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
+PATCHES=( "${FILESDIR}"/${P}-destdir.patch )