Add a pkg_setup that calls both games_pkg_setup and java-pkg-2_pkg_setup for bug #179788.

Package-Manager: portage-2.1.2.7

3 files changed, 22 insertions, 13 deletions

diff --git a/games-strategy/freecol/ChangeLog b/games-strategy/freecol/ChangeLog
index 27d652c05cba..f7493649416b 100644
--- a/games-strategy/freecol/ChangeLog
+++ b/games-strategy/freecol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/freecol
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.18 2007/05/25 21:05:12 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.19 2007/05/25 21:08:28 betelgeuse Exp $
+
+  25 May 2007; Petteri Räty <betelgeuse@gentoo.org> freecol-0.5.3.ebuild:
+  Add a pkg_setup that calls both games_pkg_setup and java-pkg-2_pkg_setup for
+  bug #179788.
 
   25 May 2007; Petteri Räty <betelgeuse@gentoo.org>
   +files/freecol-0.6.1-installer-taskdefs.patch, freecol-0.6.1.ebuild:
diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
index b8844fd3f3e8..215eae2a9a53 100644
--- a/games-strategy/freecol/Manifest
+++ b/games-strategy/freecol/Manifest
@@ -20,10 +20,10 @@ SHA256 c2018492eae071ecd833ff2fe8d74741e89794922bc675425e82c8bd8243685e files/fr
 DIST freecol-0.5.3-src.tar.gz 8239659 RMD160 ea9e48e7f3300359a4c235c99fb0a5235730943f SHA1 6af26395726c3a1f4d3c7675cbeb47427566ac22 SHA256 8532173044ec371bfc88376cbab2b9d5c638a216a065bb0f6351ee5b539ac0ac
 DIST freecol-0.6.0-src.tar.gz 21073021 RMD160 cd9553d56bff1568a61107df0510cf5afb63ab83 SHA1 937737366b10dabd9e0273f20fbc8aba81e1c8b6 SHA256 b4797b4accb82e289bc542669a77a8b33360e6eb8c6f390b756f572fc5d286b0
 DIST freecol-0.6.1-src.tar.gz 18696686 RMD160 270b763c290d2915f25da6182fa73655dcff7757 SHA1 1de7575e8e73b179f75e6cb06582ef3012b72785 SHA256 7b4c1162316f5824ab0d599f404e09ef4b7cdee5df4b0ef4b91fcee919bcf41b
-EBUILD freecol-0.5.3.ebuild 1107 RMD160 d192356de92a56e3e809db039cc25ef851899360 SHA1 e279842ef85c30a8e5048a01b67b9b4d526e1b87 SHA256 6721d61651609ca87d018c6b98f6e2eba0e4656ba47810184d1db1588b4df73a
-MD5 f706adcf9957d5682dbfd2c690e11a84 freecol-0.5.3.ebuild 1107
-RMD160 d192356de92a56e3e809db039cc25ef851899360 freecol-0.5.3.ebuild 1107
-SHA256 6721d61651609ca87d018c6b98f6e2eba0e4656ba47810184d1db1588b4df73a freecol-0.5.3.ebuild 1107
+EBUILD freecol-0.5.3.ebuild 1166 RMD160 86da345371642f52bd402125ccb9ca4a7d83dbb4 SHA1 7a7789217fcdaf3a295a4a88bb3a82e7e856f88e SHA256 5c013221a6d4fef1c509e7f852e9f8e3f27e5abd211856dfc315da5c472932d8
+MD5 28b35c5dc0c4c1a29d43719c4a86e748 freecol-0.5.3.ebuild 1166
+RMD160 86da345371642f52bd402125ccb9ca4a7d83dbb4 freecol-0.5.3.ebuild 1166
+SHA256 5c013221a6d4fef1c509e7f852e9f8e3f27e5abd211856dfc315da5c472932d8 freecol-0.5.3.ebuild 1166
 EBUILD freecol-0.6.0.ebuild 1280 RMD160 bb22e79c54bd778d4843d26bac84b09142232078 SHA1 6589a7e819e7a4b19ec797c130fcff3d81bbb8d6 SHA256 157613d04f9c4428b07ebc4ef7345310251b12b5f594de94eea303cce4ef06d9
 MD5 59d272c8a4f77db46a365a9a1a045775 freecol-0.6.0.ebuild 1280
 RMD160 bb22e79c54bd778d4843d26bac84b09142232078 freecol-0.6.0.ebuild 1280
@@ -32,10 +32,10 @@ EBUILD freecol-0.6.1.ebuild 1736 RMD160 72be76f64bf138b88697a7b07f67317429978761
 MD5 d929e9b0b08c501d321d724158412adc freecol-0.6.1.ebuild 1736
 RMD160 72be76f64bf138b88697a7b07f67317429978761 freecol-0.6.1.ebuild 1736
 SHA256 e0276b4c99f4229fb7d8691698cdc741233b8b731328d15461299962fd18b9f2 freecol-0.6.1.ebuild 1736
-MISC ChangeLog 2909 RMD160 3fe5861ddbc8061409bf42e4424ec75b00244c49 SHA1 046c39d96070a64cbf189b4759af88e2e02b841a SHA256 de14aa89cc0f3d39225c56626d637d3e3148f7b829a7851744291836709658ae
-MD5 df194d508aedafcc2534539404d28e00 ChangeLog 2909
-RMD160 3fe5861ddbc8061409bf42e4424ec75b00244c49 ChangeLog 2909
-SHA256 de14aa89cc0f3d39225c56626d637d3e3148f7b829a7851744291836709658ae ChangeLog 2909
+MISC ChangeLog 3079 RMD160 1d7b81f7a4d3036a5b972c356286d1e0305b8e49 SHA1 a57f8b046b4240c7f41e9252875c66cb59c96d56 SHA256 657e29ca2ce6bfb8be6ae8d70c881f894b0da636830a3d59df910b8eed15164e
+MD5 40aacfd952d62d3b41ba752c38d9017a ChangeLog 3079
+RMD160 1d7b81f7a4d3036a5b972c356286d1e0305b8e49 ChangeLog 3079
+SHA256 657e29ca2ce6bfb8be6ae8d70c881f894b0da636830a3d59df910b8eed15164e ChangeLog 3079
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -52,7 +52,7 @@ SHA256 689517d330b522fb53e5b49013c3f74c96aa59154e1349ee47bd800181c60b4e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGV0+OcxLzpIGCsLQRAo7iAJ9VZ/F+0xzK/YeUaIYbDCZDDyQjbACgnYAq
-QE2UgWncfP2Rwx2DCfxuclQ=
-=PEde
+iD8DBQFGV1BPcxLzpIGCsLQRAnXBAJ4jLI11LwsvXQ0bJ7n8DrMo9ob+tgCfQOGi
+iRWY9UA9oR52c9kKabpVq4Y=
+=0tmv
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/freecol/freecol-0.5.3.ebuild b/games-strategy/freecol/freecol-0.5.3.ebuild
index 5c1084f53b06..6b598ab025ec 100644
--- a/games-strategy/freecol/freecol-0.5.3.ebuild
+++ b/games-strategy/freecol/freecol-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.5.3.ebuild,v 1.3 2007/05/04 13:46:35 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.5.3.ebuild,v 1.4 2007/05/25 21:08:28 betelgeuse Exp $
 
 inherit eutils java-pkg-2 java-ant-2 games
 
@@ -19,6 +19,11 @@ DEPEND=">=virtual/jdk-1.5
 
 S=${WORKDIR}/${PN}
 
+pkg_setup() {
+	games_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"