various fixes, thanks to Daniel Scharrer

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

4 files changed, 54 insertions, 18 deletions

diff --git a/games-rpg/arx-fatalis-data/ChangeLog b/games-rpg/arx-fatalis-data/ChangeLog
index ccd868c4b860..02625da80bf0 100644
--- a/games-rpg/arx-fatalis-data/ChangeLog
+++ b/games-rpg/arx-fatalis-data/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-rpg/arx-fatalis-data
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-fatalis-data/ChangeLog,v 1.1 2012/06/29 21:48:09 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-fatalis-data/ChangeLog,v 1.2 2012/06/30 15:17:15 hasufell Exp $
+
+*arx-fatalis-data-1.21-r1 (30 Jun 2012)
+
+  30 Jun 2012; Julian Ospald <hasufell@gentoo.org>
+  -arx-fatalis-data-1.21.ebuild, +arx-fatalis-data-1.21-r1.ebuild,
+  metadata.xml:
+  add proxy-maintainer, fix installation for custom PORTAGE_TMPDIR, don't
+  assume any case for .pak files, support languages for the patch so we get
+  updated loc.pak
 
 *arx-fatalis-data-1.21 (29 Jun 2012)
 
diff --git a/games-rpg/arx-fatalis-data/Manifest b/games-rpg/arx-fatalis-data/Manifest
index 42daa019bf46..43d89ccfebe1 100644
--- a/games-rpg/arx-fatalis-data/Manifest
+++ b/games-rpg/arx-fatalis-data/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA1
 
 DIST ArxFatalis_1.21_MULTILANG.exe 9064611 RMD160 597869829a341bd489b3af1efd4f0ddae2ab8350 SHA1 4e3bc57f57068668259c1a23877e0dab608d4fa7 SHA256 97c3483a5db7ca99f5ae8001c148517eda3be4cb96d41cc4c1e42f5741456cf3
-EBUILD arx-fatalis-data-1.21.ebuild 1296 RMD160 14194d4e527a0ad803806a33764c6dcd5dd4a922 SHA1 6d5d64333037e2cd824460629473d65fea4111d7 SHA256 0940c59451a0026e3751de207fba5f5d01aaded010ac4edeb5041b3559a63f5c
-MISC ChangeLog 382 RMD160 6b1a710018074154b275e3e929aba0ebd4b9785b SHA1 1ef7fe074be1cbedcad5892281096b21cf481e18 SHA256 84d3a39c0fa8070e0510be11ef5ae802668a1d6185d8f5eb59761e346ba409df
-MISC metadata.xml 255 RMD160 cc3f4166829c2668729ae9297e2f612390f51041 SHA1 e6e8defa0e59d10623400331ea0819a8822d0656 SHA256 8ce125b1cb2a8da5fe808223ae6ed60fe03598c692e5020f0a8aaee09b5d6ca3
+EBUILD arx-fatalis-data-1.21-r1.ebuild 1770 RMD160 45c7c7528cdda812a99dd00f8fd6886c37a9ca10 SHA1 670f899819fc3ddfed460e82fff66e4c2aff78dd SHA256 4e9a09d17d4237aa24631edfd38fb8fdd77345d1be4819cb2ad6f12c97e3316a
+MISC ChangeLog 726 RMD160 7632495824b8a4a30151fc06e97a2ce70597ef42 SHA1 ab9a6fdc97f7e9ea3930cc042db97b45a23ae3b9 SHA256 e8922dc25c7c00ad6cc7a429f6e97c025d02dc0d1e204c822acf29203063dac0
+MISC metadata.xml 475 RMD160 752d58b9f929058a727b4ad12a686bd0a2ffa5e2 SHA1 fcb605dd412b3ffae14b8290225110c056ee2300 SHA256 9da40a23f7c741c44a864977494f20a53c8fbfb0a3d388f79658c585280a57fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP7iHKAAoJEFpvPKfnPDWzU+cIAKCaJX1N+WBuMpZYRLm5d7GW
-Bp326iqMhrQz6xCFaKOmVzVlLxOscyfzisFo9KxUFOQGZqUdNx4g4jwmBkoGxjbX
-m/hSBTfBP0Qv2SX6AuyZGOMEYS5uQDaMg0CJifPM7Jp5X5f+KQRE0Rm11HaQCRWY
-B4FxRgVJJU0ypfExq5bWnn7RNqzQMTvpznf4tkb52AzI1EbEXxMt3MkbmdXMf2as
-Co/jC7sfo+efgUEfC1QbaU3H3lQJUPuIH1xgNAZASSri4+aR3YF6xpjTORQgllfq
-MffCYlvUa005mi/J8p56BLyhjUJYWw8RGq3HE7qTR9px8FjsuF+UTf8qM+hXiPM=
-=GthD
+iQEcBAEBAgAGBQJP7xesAAoJEFpvPKfnPDWzkI8IAJUsMy9dndxqovBy4DOzwVjP
+CAG0XxVgYNg+89Obb2Xi1ObDL8OQFOwju0xx0QFG7B5N+BNxU36H1hKeQQ5XnXYh
+TO5UqQtVNr/tP8iwF9I8J7ckYxk2K2Wg92DHHaQzMoUhA8gdyWoMgZMUo1dlOm6G
+f9LhZOT+ty21+HyciN2tYB751CJ8MM0dDrIlDSKmJ0Rk15rhExt4uvK/4b3vZUut
+osCBe/Ml+3dZXI4wdgIxQJ+MjNdBpACGcKlbawD3F64X/r6+H9E+pViaJF0FNfpk
+oruKfX7fZXESc0RLvdz0vaAMaroiCENLCO/OcfNZn6lN4yXtnTVO09P19c+8l9k=
+=BqEx
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21.ebuild b/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r1.ebuild
index 9f2845e15316..da3bcdc7e99b 100644
--- a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21.ebuild
+++ b/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21.ebuild,v 1.1 2012/06/29 21:48:09 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r1.ebuild,v 1.1 2012/06/30 15:17:15 hasufell Exp $
 
 EAPI=4
 
-CDROM_OPTIONAL="yes"
-
 inherit eutils cdrom check-reqs games
 
 DESCRIPTION="Arx Fatalis data files"
@@ -22,28 +20,51 @@ RDEPEND="games-rpg/arx-libertatis"
 DEPEND="app-arch/cabextract
 	app-arch/innoextract"
 
+LANGS="linguas_de +linguas_en linguas_es linguas_fr linguas_it linguas_ru"
+IUSE="$IUSE $LANGS"
+REQUIRED_USE="^^ ( ${LANGS//+/} )"
+
 CHECKREQS_DISK_BUILD="621M"
 CHECKREQS_DISK_USR="617M"
 
 S=${WORKDIR}
 
 src_unpack() {
-	cdrom_get_cds bin/data2.pak
+	cdrom_get_cds bin/Arx.ttf
+
+	local mylang
+	case ${LINGUAS} in
+		de) mylang="german" ;;
+		en) mylang="english" ;;
+		es) mylang="spanish" ;;
+		fr) mylang="french" ;;
+		it) mylang="italian" ;;
+		ru) mylang="russian" ;;
+	esac
+	elog "Chosen language is ${mylang}"
 
 	find "${CDROM_ROOT}" -iname "setup*.cab" -exec cabextract '{}' \;
-	innoextract --lowercase --language=multilang \
+	innoextract --lowercase --language=${mylang} \
 		"${DISTDIR}"/ArxFatalis_1.21_MULTILANG.exe || die
 }
 
 src_install() {
 	insinto "${GAMES_DATADIR}"/arx
-	doins -r app/{graph,misc,data2.pak} *.pak "${CDROM_ROOT}"/bin/LOC.pak
+	doins -r app/{graph,misc}
+	find . -iname "*.pak" -exec doins '{}' \;
+
 	dodoc app/{manual,map}.pdf
 
 	# convert to lowercase
-	find "${D}" -type f -exec sh -c 'echo "${1}"
+	cd "${D}"
+	find . -type f -exec sh -c 'echo "${1}"
 	lower="`echo "${1}" | tr [:upper:] [:lower:]`"
 	[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
 
 	prepgamesdirs
 }
+
+pkg_postinst() {
+	elog "You need Arx Fatalis in the chosen language, otherwise set it in package.use!"
+	games_pkg_postinst
+}
diff --git a/games-rpg/arx-fatalis-data/metadata.xml b/games-rpg/arx-fatalis-data/metadata.xml
index e52db06ebd8c..8a647a27a253 100644
--- a/games-rpg/arx-fatalis-data/metadata.xml
+++ b/games-rpg/arx-fatalis-data/metadata.xml
@@ -5,6 +5,12 @@
 	<maintainer>
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer>
+		<email>daniel@constexpr.org</email>
+		<name>Daniel Scharrer</name>
+		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
 </pkgmetadata>