xonotic-data: use cached-converter.sh, do not run 7za as root

(Portage version: 2.1.9.42/git/Linux x86_64, unsigned Manifest commit)

4 files changed, 62 insertions, 11 deletions

diff --git a/games-fps/xonotic-data/ChangeLog b/games-fps/xonotic-data/ChangeLog
index 3702ccb..8dd9774 100644
--- a/games-fps/xonotic-data/ChangeLog
+++ b/games-fps/xonotic-data/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Mar 2011; Nikoli <nikoli@lavabit.com> xonotic-data-9999.ebuild,
+  metadata.xml:
+  use cached-converter.sh, do not run 7za as root
+
   02 Feb 2011; Nikoli <nikoli@lavabit.com> xonotic-data-9999.ebuild:
   move maps to xonotic-maps package
 
diff --git a/games-fps/xonotic-data/Manifest b/games-fps/xonotic-data/Manifest
index 5991bb4..40882c8 100644
--- a/games-fps/xonotic-data/Manifest
+++ b/games-fps/xonotic-data/Manifest
@@ -1,3 +1,3 @@
-EBUILD xonotic-data-9999.ebuild 3157 RMD160 fa2f059f87af2b82e0d80c457172bc5395862711 SHA1 2efbc89cac57135a3857ccc663f86f9a2a41e89f SHA256 f70034d1544462507cd9bdf8a9539f59e2591752cb47ded58e4c63175ddefdae
-MISC ChangeLog 368 RMD160 cb2bc0c07404351cd0a5ba7192c6980beed9ac4c SHA1 6dc140a035ee08b6616a3bd6312fd4e8791f5967 SHA256 982f274a7a8cb7bc852716d65622ed2c792f51dada8e42b97a392a0d64cf033a
-MISC metadata.xml 464 RMD160 86d7fbea6edcba6452d3581044ca1a1a77239da5 SHA1 4615957949527226200e033661405ed8459f498d SHA256 d9a07557c99e4b12bafbb7f547ee63cf6d9931e4a8a47e2a5a5bbefc89097af2
+EBUILD xonotic-data-9999.ebuild 4514 RMD160 1d4d04f2b0f4aa5fc1d2c08d41d62e15326de4d2 SHA1 1b8445709337af4d2b56d6d5fa051251b801bc4a SHA256 8a581278c74f10884d2076af6aabb432b719b49ec22bf60a51175297b067ffe5
+MISC ChangeLog 504 RMD160 0550b68417d0970bf54a8a4163db0c1d6335641d SHA1 ce5bacfd05d0660fa776c7825326133916c26782 SHA256 90a6a19f7fa1b8edd28deaacf84b34f2cbfdde620f9c2d6a21ead9b44e8ada72
+MISC metadata.xml 651 RMD160 d29eea499f1bd06a0bcb187378ed3a23dc8c1161 SHA1 a22f44f04271037d67a409fcdbc37693b38e3f0f SHA256 1019c1624b191a5ab1c1c39182837d0c86bea09635496137a10a9e800c39f277
diff --git a/games-fps/xonotic-data/metadata.xml b/games-fps/xonotic-data/metadata.xml
index 9533e9d..1663973 100644
--- a/games-fps/xonotic-data/metadata.xml
+++ b/games-fps/xonotic-data/metadata.xml
@@ -8,6 +8,8 @@
 	</maintainer>
 	<use>
 		<flag name="client">Install files for client. Disabling is experimental.</flag>
+		<flag name="convert">Use cached-converter.sh for converting tga to jpeg</flag>
+		<flag name="low">Use low preset of cached-converter.sh: compress wav to ogg, lower jpeg quality.</flag>
 		<flag name="maps">Download and install maps.</flag>
 		<flag name="zip">Compress resources dirs in zip archives.</flag>
 	</use>
diff --git a/games-fps/xonotic-data/xonotic-data-9999.ebuild b/games-fps/xonotic-data/xonotic-data-9999.ebuild
index 3120f81..d79b77d 100644
--- a/games-fps/xonotic-data/xonotic-data-9999.ebuild
+++ b/games-fps/xonotic-data/xonotic-data-9999.ebuild
@@ -16,11 +16,15 @@ EGIT_PROJECT="${MY_PN}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+client +maps +zip"
+IUSE="+client +convert low +maps +zip"
 
 RDEPEND=""
 DEPEND="
 	~games-util/fteqcc-xonotic-9999
+	convert? (
+		media-gfx/imagemagick[jpeg,png]
+		low? ( media-sound/vorbis-tools )
+	)
 	zip? ( app-arch/p7zip )
 "
 PDEPEND="maps? ( ~games-fps/xonotic-maps-9999 )"
@@ -28,6 +32,11 @@ PDEPEND="maps? ( ~games-fps/xonotic-maps-9999 )"
 pkg_setup() {
 	games_pkg_setup
 
+	if use convert; then
+		ewarn "cached-converter.sh will use \"xonotic-cached-converter\" subdirectory of your DISTDIR"
+		echo
+	fi
+
 	if use !client; then
 		ewarn "You have disabled client USE flag, only files for server will be installed."
 		ewarn "This feature is experimental, if anything goes wrong, contact the maintainer."
@@ -110,17 +119,14 @@ src_prepare() {
 
 src_compile() {
 	# Data
-	pushd data/xonotic-data.pk3dir
+	cd data
+	pushd xonotic-data.pk3dir
 	emake \
 		FTEQCC="/usr/bin/fteqcc-xonotic" \
 		FTEQCCFLAGS_WATERMARK='' \
 		|| die "emake data.pk3 failed"
 	popd
-}
 
-src_install() {
-	# Data
-	cd data
 	rm -rf \
 		$(find -name '.git*') \
 		$(find -type d -name '.svn') \
@@ -130,6 +136,42 @@ src_install() {
 		$(find -type f -name 'Makefile') \
 		|| die "rm failed"
 
+	if use convert; then
+		# Used git.eclass,v 1.50 as example
+		: ${CACHE_STORE_DIR:="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/xonotic-cached-converter"}
+		# initial download, we have to create master maps storage directory and play
+		# nicely with sandbox
+		if [[ ! -d ${CACHE_STORE_DIR} ]] ; then
+			addwrite "${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}" # git.eclass was used, DISTDIR sure exists
+			mkdir -p "${CACHE_STORE_DIR}" \
+				|| die "can't mkdir ${CACHE_STORE_DIR}."
+			export SANDBOX_WRITE="${SANDBOX_WRITE%%:/}"
+		fi
+		# allow writing into CACHE_STORE_DIR
+		addwrite "${CACHE_STORE_DIR}"
+
+		if use low; then
+			export jpeg_qual_rgb=80
+			export jpeg_qual_a=97
+			export do_ogg=true
+			export ogg_qual=1
+		else
+			export jpeg_qual_rgb=97
+			export jpeg_qual_a=99
+			export do_ogg=false
+		fi
+
+		for i in data music maps nexcompat; do
+			find xonotic-${i}.pk3dir -type f -print0 |
+				git_src_repo="${S}"/data/xonotic-${i}.pk3dir \
+				CACHEDIR="${CACHE_STORE_DIR}" \
+				do_jpeg=true                 \
+				do_dds=false                 \
+				del_src=true                 \
+				xargs -0 "${S}"/misc/tools/cached-converter.sh
+		done
+	fi
+
 	if use zip; then
 		for d in *.pk3dir; do
 			pushd "${d}"
@@ -138,9 +180,12 @@ src_install() {
 			rm -rf "${d}" || die "rm failed"
 		done
 	fi
+}
 
-	insinto "${GAMES_DATADIR}/${MY_PN}/data"
-	doins -r . || die "doins data failed"
+src_install() {
+	# Data
+	insinto "${GAMES_DATADIR}/${MY_PN}"
+	doins -r data || die "doins data failed"
 
 	prepgamesdirs
 }