Fix locale install directory, bug #159645

Package-Manager: portage-2.1.2_rc4-r8

4 files changed, 59 insertions, 40 deletions

diff --git a/games-sports/bygfoot/ChangeLog b/games-sports/bygfoot/ChangeLog
index 9e92a8026478..c784773fb553 100644
--- a/games-sports/bygfoot/ChangeLog
+++ b/games-sports/bygfoot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-sports/bygfoot
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/bygfoot/ChangeLog,v 1.14 2006/10/12 20:32:51 mr_bones_ Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/bygfoot/ChangeLog,v 1.15 2007/01/12 01:19:43 nyhm Exp $
+
+  12 Jan 2007; Tristan Heaven <nyhm@gentoo.org> bygfoot-2.0.1.ebuild:
+  Fix locale install directory, bug #159645
 
 *bygfoot-2.0.1 (12 Oct 2006)
 
diff --git a/games-sports/bygfoot/Manifest b/games-sports/bygfoot/Manifest
index 24bc74dd1233..f2105954c8d9 100644
--- a/games-sports/bygfoot/Manifest
+++ b/games-sports/bygfoot/Manifest
@@ -1,7 +1,10 @@
-DIST bygfoot-1.8.2.tar.bz2 428845 RMD160 a6435246d612a86c497f536b94aedd8df7608ace SHA256 32fdefacbf9c4d0a158907538315f8311560f043b21cb8731ad9f96337eb6f43
-DIST bygfoot-1.9.3.tar.bz2 1343489 RMD160 64f5913bc74155ad467b9db4aec6a135964e1d8e SHA256 04c961cab5a7d65fcbe61dc8eacf2d800cdcf19c91c665ddc1c88735d2b3f985
-DIST bygfoot-1.9.4.tar.bz2 1343060 RMD160 e82e1e2ad29b2380c1c545ca225012ebfb6050c5 SHA256 935eba146245e8a764f59619b1947fbdd35cc1919a0f6944fa54485bb5e2af8c
-DIST bygfoot-1.9.5.tar.bz2 1401499 RMD160 cd213d06f21522b6d3b04aaacaadffd4041c1561 SHA256 606826802fb28afafc19fbfe9b661f9dddbdc8d03cf6119942b9155197bc3d53
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST bygfoot-1.8.2.tar.bz2 428845 RMD160 a6435246d612a86c497f536b94aedd8df7608ace SHA1 8d0e4e9f16b9fdc04041070a66bed0bd2448cc58 SHA256 32fdefacbf9c4d0a158907538315f8311560f043b21cb8731ad9f96337eb6f43
+DIST bygfoot-1.9.3.tar.bz2 894884 RMD160 616dbd3fab3765a7fb638059cc5f3a7d43e6f196 SHA1 6f75080944af3915b97c2f22d3373901af3979a7 SHA256 1497166e70ecae365c22174bb95d2c89cec96cf8f0f4ef5eea9c8c65c74bd49f
+DIST bygfoot-1.9.4.tar.bz2 1343060 RMD160 e82e1e2ad29b2380c1c545ca225012ebfb6050c5 SHA1 b44542c8df33871acb969d09ca3ecf826c9649af SHA256 935eba146245e8a764f59619b1947fbdd35cc1919a0f6944fa54485bb5e2af8c
+DIST bygfoot-1.9.5.tar.bz2 1401499 RMD160 cd213d06f21522b6d3b04aaacaadffd4041c1561 SHA1 fa1b14ccaff14bd8043dcc77fa9343d5905d85ba SHA256 606826802fb28afafc19fbfe9b661f9dddbdc8d03cf6119942b9155197bc3d53
 DIST bygfoot-1.9.6.tar.bz2 1399802 RMD160 3a52693a03b7af9e4338a2de556410f66b84f33d SHA1 a07229f1d82ca9740e646c18c730d9635948b7c7 SHA256 a97b67aed20627131093c207c89d4f70980a9882124759f3074e11b98517f863
 DIST bygfoot-2.0.0.tar.bz2 1384899 RMD160 099e88c020643bca37fde650a16961e349260d92 SHA1 e573617edbd38082ece3b1b9b46f3e262aa29da1 SHA256 5e00093951a6463bb26260147dad17a6c8b37a4b3f179edf47e4befc5ca8ff82
 DIST bygfoot-2.0.1.tar.bz2 1408439 RMD160 488bf1f838199e80db1320b3d5be864363d32b50 SHA1 c0a3f1a123a813d880d594d1a3ebdae4923272a7 SHA256 eaac4641fb72a4206d5ef69df33ccde13ae31a01b3a2ed8f57f5acbe2d8c12fb
@@ -29,14 +32,14 @@ EBUILD bygfoot-2.0.0.ebuild 1571 RMD160 097c0ebd40a2e7ec9afa876676112119cb6a8105
 MD5 e837105521fdcfbf3d4537ec5e6d560b bygfoot-2.0.0.ebuild 1571
 RMD160 097c0ebd40a2e7ec9afa876676112119cb6a8105 bygfoot-2.0.0.ebuild 1571
 SHA256 8ea4e99653325a58e5bd2323118781fd17eeb1918c954c606516dc3231e904fc bygfoot-2.0.0.ebuild 1571
-EBUILD bygfoot-2.0.1.ebuild 1571 RMD160 05a7fb842ad73f16dc9812c9df04a8d7719d965c SHA1 1334119a54218e84ffc330d78a7dcf5ad6b0f527 SHA256 b1780bb83605058f6bd7484d2ee71f1d94506cc5f24cea933696351a04505bee
-MD5 16feb0560ca1490de99110ebb2947270 bygfoot-2.0.1.ebuild 1571
-RMD160 05a7fb842ad73f16dc9812c9df04a8d7719d965c bygfoot-2.0.1.ebuild 1571
-SHA256 b1780bb83605058f6bd7484d2ee71f1d94506cc5f24cea933696351a04505bee bygfoot-2.0.1.ebuild 1571
-MISC ChangeLog 2147 RMD160 da78ff4392d9da180a762c262247bb67c197be19 SHA1 345a57fe40c9ad4d011fa08ec2af568a6d933818 SHA256 83fab067f06deaa2dcc3903bab71974279f567284938b381e5cbfe95559d7935
-MD5 999f02e008f2382ffc6f833710df117f ChangeLog 2147
-RMD160 da78ff4392d9da180a762c262247bb67c197be19 ChangeLog 2147
-SHA256 83fab067f06deaa2dcc3903bab71974279f567284938b381e5cbfe95559d7935 ChangeLog 2147
+EBUILD bygfoot-2.0.1.ebuild 1585 RMD160 1cdb54718cb3e71913b363dc7317b91a5d364e7e SHA1 70630d05cc6822640f8c80dbb8516c39a3caa84e SHA256 6a8f55d2ebaf5e7e03f5424a20bd4df4c878f404a065552183c009f1a391fb43
+MD5 9ac3ce49eb58ea3b8b958dd92e16862a bygfoot-2.0.1.ebuild 1585
+RMD160 1cdb54718cb3e71913b363dc7317b91a5d364e7e bygfoot-2.0.1.ebuild 1585
+SHA256 6a8f55d2ebaf5e7e03f5424a20bd4df4c878f404a065552183c009f1a391fb43 bygfoot-2.0.1.ebuild 1585
+MISC ChangeLog 2257 RMD160 3a4a198bf82e6760b9357ea455a7e9f0f368d282 SHA1 f5905ffda1dfc90095852c8fb5e3f34f64b4f0b3 SHA256 3e4c43aa916cc74e764550ff5875fdc4222504b987fce20fe018a2dc04500bf8
+MD5 5b33b427bb1c47b73b0468c58fb1ca4c ChangeLog 2257
+RMD160 3a4a198bf82e6760b9357ea455a7e9f0f368d282 ChangeLog 2257
+SHA256 3e4c43aa916cc74e764550ff5875fdc4222504b987fce20fe018a2dc04500bf8 ChangeLog 2257
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -44,9 +47,9 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 10ac51f7d2242f0adbd74cc7a291c687 files/digest-bygfoot-1.8.2 244
 RMD160 938a0849d089b7a659ccbe347132d54bcfa2acc8 files/digest-bygfoot-1.8.2 244
 SHA256 2ca46126f590ecb6976e7f77cb1515786bdf86b6a1ec4e541699c2fbbce702fd files/digest-bygfoot-1.8.2 244
-MD5 6aa829a75ec7afb05811281053180399 files/digest-bygfoot-1.9.3 247
-RMD160 cb1fe5aee90535035baa5699f9917d532e6ac6ce files/digest-bygfoot-1.9.3 247
-SHA256 8eee1795ff235f6a3e78b23875e11fa9118b40c4932984bbc52014bc5b35899b files/digest-bygfoot-1.9.3 247
+MD5 5abeb5b7579867fa5fe4715ba0f3268b files/digest-bygfoot-1.9.3 244
+RMD160 405fcd0856e3b255bd097866343576342bb16856 files/digest-bygfoot-1.9.3 244
+SHA256 be8ed6f88fe19a0554b5b0ef933193c5969ec0935330c0e7a7823080497e4722 files/digest-bygfoot-1.9.3 244
 MD5 c29531a5735d5d53fde89c4bccb9209f files/digest-bygfoot-1.9.4 247
 RMD160 80f44d4780491d809d76f65599eda7cb7a89ff71 files/digest-bygfoot-1.9.4 247
 SHA256 d8169dd8a251f12015a1df911ac0c04d7f1e032a43daa26317b1e80ec8946c0b files/digest-bygfoot-1.9.4 247
@@ -62,3 +65,10 @@ SHA256 45c233e53c9cdd596344417256b9f5d1f161bf81fd24d7e648b20767be51f1b7 files/di
 MD5 d65b7cfbae01c2de902010a92a10c761 files/digest-bygfoot-2.0.1 247
 RMD160 2d9c1336ff8f97bf81f58bfeaf4d33e4b4487700 files/digest-bygfoot-2.0.1 247
 SHA256 d0d653060484fa752cd63008a42ef70da41d92d91839dce50089f38c392970b2 files/digest-bygfoot-2.0.1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFpuI1dz7hIScOURERApj8AKCYcLwLkuY3bM8mf4CLEUO4akiiHACgmzmM
+b3W0OMN2OWAv/QX3OPVlP3s=
+=0gUB
+-----END PGP SIGNATURE-----
diff --git a/games-sports/bygfoot/bygfoot-2.0.1.ebuild b/games-sports/bygfoot/bygfoot-2.0.1.ebuild
index 4ed209de055d..b0b2571209f0 100644
--- a/games-sports/bygfoot/bygfoot-2.0.1.ebuild
+++ b/games-sports/bygfoot/bygfoot-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/bygfoot/bygfoot-2.0.1.ebuild,v 1.1 2006/10/12 20:32:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/bygfoot/bygfoot-2.0.1.ebuild,v 1.2 2007/01/12 01:19:43 nyhm Exp $
 
 inherit eutils games
 
@@ -13,27 +13,32 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.0"
+RDEPEND=">=x11-libs/gtk+-2
+	virtual/libintl"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	sys-devel/gettext"
 
 src_unpack() {
 	unpack ${A}
-
+	cd "${S}"
 	sed -i \
 		-e '/PACKAGE_LOCALE_DIR/s:\$(prefix)/\$(DATADIRNAME):/usr/share:' \
-		"${S}"/src/Makefile.in \
-		|| die "sed failed"
-	sed -i \
-		-e '/localedir/s:\$(libdir):/usr/share:' \
-		-e '/gnulocaledir/s:\$(datadir):/usr/share:' \
-		"${S}"/po/Makefile.in.in \
+		src/Makefile.in \
 		|| die "sed failed"
 }
 
+src_compile() {
+	egamesconf \
+		--disable-dependency-tracking \
+		--disable-gstreamer \
+		--with-localedir=/usr/share/locale \
+		|| die
+	emake || die "emake failed"
+}
+
 src_install() {
-	localedir=/usr/share/locale \
-		make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README TODO UPDATE
 	newicon support_files/pixmaps/bygfoot_icon.png ${PN}.png
 	make_desktop_entry ${PN} "Bygfoot"
@@ -43,12 +48,13 @@ src_install() {
 pkg_postinst() {
 	games_pkg_postinst
 	echo
-	einfo "If you'd like to keep your settings and savegames from previous"
-	einfo "1.9.x versions, you should rename the .bygfoot-1.9 directory"
-	einfo "to .bygfoot in your home directory."
+	elog "If you'd like to keep your settings and savegames from previous"
+	elog "1.9.x versions, you should rename the .bygfoot-1.9 directory"
+	elog "to .bygfoot in your home directory."
+	echo
+	elog "If you upgrade from 1.8.x, you should first delete the .bygfoot"
+	elog "directory in your home dir to keep things clean."
+	elog "Also note that savegames from 1.8.x are not compatible with"
+	elog "current versions of ${PN}"
 	echo
-	einfo "If you upgrade from 1.8.x, you should first delete the .bygfoot"
-	einfo "directory in your home dir to keep things clean."
-	einfo "Also note that savegames from 1.8.x are not compatible with"
-	einfo "current versions of ${PN}"
 }
diff --git a/games-sports/bygfoot/files/digest-bygfoot-1.9.3 b/games-sports/bygfoot/files/digest-bygfoot-1.9.3
index e90c1754917b..c065ed5e1efd 100644
--- a/games-sports/bygfoot/files/digest-bygfoot-1.9.3
+++ b/games-sports/bygfoot/files/digest-bygfoot-1.9.3
@@ -1,3 +1,3 @@
-MD5 9b1d5a4751ffea02dda2f0b6649901f1 bygfoot-1.9.3.tar.bz2 1343489
-RMD160 64f5913bc74155ad467b9db4aec6a135964e1d8e bygfoot-1.9.3.tar.bz2 1343489
-SHA256 04c961cab5a7d65fcbe61dc8eacf2d800cdcf19c91c665ddc1c88735d2b3f985 bygfoot-1.9.3.tar.bz2 1343489
+MD5 426e5ce203c440ec4a69ebc59c7552d2 bygfoot-1.9.3.tar.bz2 894884
+RMD160 616dbd3fab3765a7fb638059cc5f3a7d43e6f196 bygfoot-1.9.3.tar.bz2 894884
+SHA256 1497166e70ecae365c22174bb95d2c89cec96cf8f0f4ef5eea9c8c65c74bd49f bygfoot-1.9.3.tar.bz2 894884