various fixes, thanks to Daniel Scharrer

(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

3 files changed, 44 insertions, 8 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/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>