Fix double install of data files, bug #161362

Package-Manager: portage-2.1.2.7

4 files changed, 46 insertions, 15 deletions

diff --git a/games-board/qgo/ChangeLog b/games-board/qgo/ChangeLog
index 1f579da4e93e..7f0dcf403d78 100644
--- a/games-board/qgo/ChangeLog
+++ b/games-board/qgo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/qgo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/ChangeLog,v 1.25 2007/01/12 09:52:33 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/ChangeLog,v 1.26 2007/06/02 10:00:02 tupone Exp $
+
+  02 Jun 2007; Tupone Alfredo <tupone@gentoo.org>
+  +files/qgo-1.5.3-parallel.patch, qgo-1.5.3.ebuild:
+  Fix double install of data files, bug #161362 by Martin von Gagern
 
 *qgo-1.5.3 (12 Jan 2007)
 
diff --git a/games-board/qgo/Manifest b/games-board/qgo/Manifest
index ad7eb47fe6ab..35a35ffaf102 100644
--- a/games-board/qgo/Manifest
+++ b/games-board/qgo/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX qgo-1.5.3-parallel.patch 582 RMD160 d6023ada465fd5a71ee8c144ae27cc140df65f40 SHA1 6df894c771ddb148a1b1d9b1d00e3ec5d729138c SHA256 139c815fcad30ef5186be84ae38a00f48e4dd5aacdbadce2e9e1d86a8a097839
+MD5 9cd715c28ea219a6510595ede304f245 files/qgo-1.5.3-parallel.patch 582
+RMD160 d6023ada465fd5a71ee8c144ae27cc140df65f40 files/qgo-1.5.3-parallel.patch 582
+SHA256 139c815fcad30ef5186be84ae38a00f48e4dd5aacdbadce2e9e1d86a8a097839 files/qgo-1.5.3-parallel.patch 582
 DIST qgo-1.5.1-r1.tar.gz 2335443 RMD160 e92f12d180bd9aba029670b522b4ae4929f275f6 SHA1 2b0987abc01ac254fc75957bcd5159937df15e3e SHA256 5fad22968e8b4274f0d317fc421b524ecdd21f1e9b14e2bfe407b54e8417b09c
 DIST qgo-1.5.3.tar.gz 2303630 RMD160 cce3dad470f69c75b53d148145ea0014abd7930a SHA1 0b24ca6bc03155b3157e326ec454ae401d75d040 SHA256 333141db45b83869d89e24bf7c336331304961c8f92ed7a1d4af89473faa465f
 EBUILD qgo-1.5.1.ebuild 574 RMD160 5226d018e6560f487f5e3124c49982e06e999367 SHA1 82a5b1489ceb5f089c268d42c3399aec38ed7f36 SHA256 2b87c55a1660c692e7ab02346765b94524b95371863b2dc2c34e092add804096
 MD5 0333ae52550cd54311e93d0909f25e76 qgo-1.5.1.ebuild 574
 RMD160 5226d018e6560f487f5e3124c49982e06e999367 qgo-1.5.1.ebuild 574
 SHA256 2b87c55a1660c692e7ab02346765b94524b95371863b2dc2c34e092add804096 qgo-1.5.1.ebuild 574
-EBUILD qgo-1.5.3.ebuild 836 RMD160 52dee8f5a7179dc3af12a04d4ea3b60210357173 SHA1 a173d60797abf129658f074a4fb1903dce35aebd SHA256 3321d6ae8a56ee6fd9cedb2b6617b2438208392a294261363c929a79b5cc3df9
-MD5 7a6da48809e24086aa1438190c57603c qgo-1.5.3.ebuild 836
-RMD160 52dee8f5a7179dc3af12a04d4ea3b60210357173 qgo-1.5.3.ebuild 836
-SHA256 3321d6ae8a56ee6fd9cedb2b6617b2438208392a294261363c929a79b5cc3df9 qgo-1.5.3.ebuild 836
-MISC ChangeLog 3109 RMD160 1b9e8eebdd49df932790b8710c9b993925225984 SHA1 42f5aed2348ca2ce2456d4626d20daae744060a9 SHA256 9a3f2991e16cb5f966fec45b6ec0e40c639fa9d6cecf967ee1009832bbf0ef55
-MD5 a68d7a6378c49df6921ab273aacbee32 ChangeLog 3109
-RMD160 1b9e8eebdd49df932790b8710c9b993925225984 ChangeLog 3109
-SHA256 9a3f2991e16cb5f966fec45b6ec0e40c639fa9d6cecf967ee1009832bbf0ef55 ChangeLog 3109
+EBUILD qgo-1.5.3.ebuild 890 RMD160 9eae5f4761781f1e5ffc0b67d0f56a53eb9bc836 SHA1 9079580fe92dd192e73e04015c34991eec2c165c SHA256 ff87de33ebd4139138b9769fc2b1bdc1b60338579a58d3c993f1d05aa7883d14
+MD5 fbbe210c6e22680f7fd0984c69335ce1 qgo-1.5.3.ebuild 890
+RMD160 9eae5f4761781f1e5ffc0b67d0f56a53eb9bc836 qgo-1.5.3.ebuild 890
+SHA256 ff87de33ebd4139138b9769fc2b1bdc1b60338579a58d3c993f1d05aa7883d14 qgo-1.5.3.ebuild 890
+MISC ChangeLog 3284 RMD160 901a7783f1b3cf272f108d42e1cf5c3aeaa2bddb SHA1 76720020668d3c0e4d3e8c71e1895dbd59b759f8 SHA256 0145b0eac858f64825fe0055e9735ed04efdf4e97afcc43b3191af5be829c379
+MD5 895df3987fba0a380727d74ac9f6fcaf ChangeLog 3284
+RMD160 901a7783f1b3cf272f108d42e1cf5c3aeaa2bddb ChangeLog 3284
+SHA256 0145b0eac858f64825fe0055e9735ed04efdf4e97afcc43b3191af5be829c379 ChangeLog 3284
 MISC metadata.xml 388 RMD160 cd5534eeca1a07a692717586962a4a26545796dd SHA1 8d74cbab2c30bea8f61092c6cfad96f5501d5e09 SHA256 286a1e0a2fc34628235ea89461009dcf86c04ba05c0fcd35aed6fc433af7d1b8
 MD5 7be057a9771e6eb03103063d47a366b8 metadata.xml 388
 RMD160 cd5534eeca1a07a692717586962a4a26545796dd metadata.xml 388
@@ -26,9 +30,9 @@ MD5 167a7d626e63893d81b73adba9e1262d files/digest-qgo-1.5.3 232
 RMD160 6b3c2465d7806382a0cca53ccd2fb8e3b8270801 files/digest-qgo-1.5.3 232
 SHA256 03d94095567019e939e58d409a9a0de902796c7872046bbf3df368170f6aca37 files/digest-qgo-1.5.3 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFFp1pndz7hIScOURERAjFPAKDSm/eNxQTDaNhFgepY9dYUYn4KpwCgxRKr
-SvZJi008gxIlDed7t7zRNok=
-=lmMS
+iD8DBQFGYT+pRmMZkarFlIwRAuWQAKC7kVIThLhhlIHRq5bGsPm99UIMXACg5IEi
+Gf7cxTbDTiBx7M3GNsqyjgw=
+=v4UC
 -----END PGP SIGNATURE-----
diff --git a/games-board/qgo/files/qgo-1.5.3-parallel.patch b/games-board/qgo/files/qgo-1.5.3-parallel.patch
new file mode 100644
index 000000000000..ed94161ea01a
--- /dev/null
+++ b/games-board/qgo/files/qgo-1.5.3-parallel.patch
@@ -0,0 +1,22 @@
+--- src/sounds/Makefile.in.bad	2007-06-02 11:24:44.000000000 +0200
++++ src/sounds/Makefile.in	2007-06-02 11:25:08.000000000 +0200
+@@ -373,7 +353,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-SoundsDATA install-data-local
++install-data-am: install-SoundsDATA
+ 
+ install-exec-am:
+ 
+--- src/translations/Makefile.in.bad	2007-06-02 11:24:48.000000000 +0200
++++ src/translations/Makefile.in	2007-06-02 11:25:08.000000000 +0200
+@@ -374,7 +353,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-TranslationsDATA install-data-local
++install-data-am: install-TranslationsDATA
+ 
+ install-exec-am:
+ 
diff --git a/games-board/qgo/qgo-1.5.3.ebuild b/games-board/qgo/qgo-1.5.3.ebuild
index 59cec4620e76..63d8c1a9f09e 100644
--- a/games-board/qgo/qgo-1.5.3.ebuild
+++ b/games-board/qgo/qgo-1.5.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/qgo-1.5.3.ebuild,v 1.1 2007/01/12 09:52:33 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/qgo-1.5.3.ebuild,v 1.2 2007/06/02 10:00:02 tupone Exp $
 
-inherit eutils qt3 games
+inherit eutils autotools qt3 games
 
 DESCRIPTION="A Qt Go client and SGF editor"
 HOMEPAGE="http://qgo.sourceforge.net/"
@@ -18,6 +18,7 @@ DEPEND="$(qt_min_version 3.3)"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-parallel.patch
 	sed -i 's:$(datadir):/usr/share:' \
 		templates/Makefile.in \
 		|| die "sed Makefile.in failed"