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

Package-Manager: portage-2.1.2.7

3 files changed, 31 insertions, 13 deletions

diff --git a/games-board/megamek/ChangeLog b/games-board/megamek/ChangeLog
index df11f162e622..74e159395567 100644
--- a/games-board/megamek/ChangeLog
+++ b/games-board/megamek/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/megamek
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/megamek/ChangeLog,v 1.9 2007/01/30 00:53:55 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/megamek/ChangeLog,v 1.10 2007/05/25 20:22:17 betelgeuse Exp $
+
+  25 May 2007; Petteri Räty <betelgeuse@gentoo.org> megamek-0.32.0.ebuild:
+  Add pkg_setup that calls both linux-info_pkg_setup and java-pkg-2_pkg_setup
+  for bug #179788.
 
   30 Jan 2007; Vlastimil Babka <caster@gentoo.org> megamek-0.32.0.ebuild:
   Put java-ant-2 after java-pkg-2 in inherit.
diff --git a/games-board/megamek/Manifest b/games-board/megamek/Manifest
index 392fcc505fc8..653a300569eb 100644
--- a/games-board/megamek/Manifest
+++ b/games-board/megamek/Manifest
@@ -1,12 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST MegaMek-v0.32.0.zip 11178027 RMD160 26897e74cb66f97bb0cb7322ac5c8dbaaee4559d SHA1 f38c66a5765e3cfce86cd4892bbd4e11ad61d2f1 SHA256 4c05decde784fd63a5d27b50568ad0e17c2d275033fb6938defc1cdfd9b42106
-EBUILD megamek-0.32.0.ebuild 1059 RMD160 27d3fcdcbf7a978af1cd75abb673c354d6cbad2e SHA1 0d2e7e606d41e309c203d02f76c5f253d750eaf1 SHA256 d031972d637f811e90d1374c11179d72026a01a34d6801861a775465f65890cf
-MD5 cc3e41689d6d7318eddfc5c51fb4840c megamek-0.32.0.ebuild 1059
-RMD160 27d3fcdcbf7a978af1cd75abb673c354d6cbad2e megamek-0.32.0.ebuild 1059
-SHA256 d031972d637f811e90d1374c11179d72026a01a34d6801861a775465f65890cf megamek-0.32.0.ebuild 1059
-MISC ChangeLog 1402 RMD160 6d120fe542ca77afbc6ce83f0ab7b6645b537938 SHA1 4edbb45edbb33f08c0990e89d29f056b64080eef SHA256 82dcdb013e7dcb1fcbd92003e018fcf3041ec07d2ad29febf98872429c35f125
-MD5 010bc6e327084f14d2e1d656a8e8ab8a ChangeLog 1402
-RMD160 6d120fe542ca77afbc6ce83f0ab7b6645b537938 ChangeLog 1402
-SHA256 82dcdb013e7dcb1fcbd92003e018fcf3041ec07d2ad29febf98872429c35f125 ChangeLog 1402
+EBUILD megamek-0.32.0.ebuild 1119 RMD160 39f2001ef3e2d1605c3f08e4de733c14e469fd0a SHA1 6dfe7f2c333bdd8a101743f36b4c01b07852293f SHA256 f0e9a1a7b5b8820f25950ab52defd3d72b35506397759768a917f3a13d89f464
+MD5 7344fb37dd311023481654f1b37a2fbb megamek-0.32.0.ebuild 1119
+RMD160 39f2001ef3e2d1605c3f08e4de733c14e469fd0a megamek-0.32.0.ebuild 1119
+SHA256 f0e9a1a7b5b8820f25950ab52defd3d72b35506397759768a917f3a13d89f464 megamek-0.32.0.ebuild 1119
+MISC ChangeLog 1581 RMD160 71dc924a4193e9d1a0b3d1e0abc0090ac9ecea84 SHA1 507438923ccd18fa12d3730600180f6bd057e8ad SHA256 e0a5fd43883de5c46bf221b13b24fba4eabca5ebf09856eefbadea8d2b16a5fa
+MD5 284bbb72a6e8f8e77e4f0b50bc7a56ed ChangeLog 1581
+RMD160 71dc924a4193e9d1a0b3d1e0abc0090ac9ecea84 ChangeLog 1581
+SHA256 e0a5fd43883de5c46bf221b13b24fba4eabca5ebf09856eefbadea8d2b16a5fa ChangeLog 1581
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -14,3 +17,10 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 1ac6c52da0967db329859e67a973b7ad files/digest-megamek-0.32.0 244
 RMD160 73094d4539d666dd7458493eac9a62c2d0ecc0b9 files/digest-megamek-0.32.0 244
 SHA256 f3098fbe1b761fe5dde15b4dea2839687902f6a570d84131e1eb537813bd313f files/digest-megamek-0.32.0 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGV0V+cxLzpIGCsLQRAjpzAJ9LniWNAidmwAyNKhoFSMiUUWLUmQCfenvS
+MBie0ICotlUo5b/sGw9MZXk=
+=nRpt
+-----END PGP SIGNATURE-----
diff --git a/games-board/megamek/megamek-0.32.0.ebuild b/games-board/megamek/megamek-0.32.0.ebuild
index dc9c72222641..d14e5350125a 100644
--- a/games-board/megamek/megamek-0.32.0.ebuild
+++ b/games-board/megamek/megamek-0.32.0.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-board/megamek/megamek-0.32.0.ebuild,v 1.2 2007/01/30 00:53:55 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/megamek/megamek-0.32.0.ebuild,v 1.3 2007/05/25 20:22:17 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2 games
 
@@ -14,16 +14,20 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.5
-	dev-java/ant
 	app-arch/unzip"
 RDEPEND=">=virtual/jre-1.5"
 
 S=${WORKDIR}
 
+pkg_setup() {
+	games_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	rm -f *.jar
+	rm -v *.jar || die
 	sed -i \
 		-e "s:/usr/share/java:${GAMES_DATADIR}/${PN}:" \
 		-e "s:/usr/share/MegaMek:${GAMES_DATADIR}/${PN}:" \
@@ -38,6 +42,6 @@ src_install() {
 	newgamesbin startup.sh ${PN} || die "newgamesbin failed"
 	insinto "${GAMES_DATADIR}/${PN}"
 	doins -r data l10n lib mmconf *.jar || die "doins failed"
-	dodoc HACKING readme.txt docs/*txt
+	dodoc HACKING readme.txt docs/*txt || die
 	prepgamesdirs
 }