public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gamerlay:master commit in: games-fps/xonotic-data/
@ 2011-03-27 19:38 Nikoli
  0 siblings, 0 replies; 5+ messages in thread
From: Nikoli @ 2011-03-27 19:38 UTC (permalink / raw
  To: gentoo-commits

commit:     a57cec6cba3099290e178516decc28b6d2f92310
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Sun Mar 27 19:36:21 2011 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Sun Mar 27 19:36:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=a57cec6c

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)

---
 games-fps/xonotic-data/ChangeLog                |    4 ++
 games-fps/xonotic-data/metadata.xml             |    2 +
 games-fps/xonotic-data/xonotic-data-9999.ebuild |   61 ++++++++++++++++++++---
 3 files changed, 59 insertions(+), 8 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/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
 }



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gamerlay:master commit in: games-fps/xonotic-data/
@ 2011-07-05 21:45 Nikoli
  0 siblings, 0 replies; 5+ messages in thread
From: Nikoli @ 2011-07-05 21:45 UTC (permalink / raw
  To: gentoo-commits

commit:     a952e94f18ceff2371673728081a9364e9030ea4
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Tue Jul  5 21:41:16 2011 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Tue Jul  5 21:41:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=a952e94f

xonotic-data: migrate to git-2

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

---
 games-fps/xonotic-data/ChangeLog                |    3 +++
 games-fps/xonotic-data/xonotic-data-9999.ebuild |   17 ++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/games-fps/xonotic-data/ChangeLog b/games-fps/xonotic-data/ChangeLog
index 8dd9774..eeb45fe 100644
--- a/games-fps/xonotic-data/ChangeLog
+++ b/games-fps/xonotic-data/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Jul 2011; Nikoli <nikoli@lavabit.com> xonotic-data-9999.ebuild:
+  migrate to git-2
+
   27 Mar 2011; Nikoli <nikoli@lavabit.com> xonotic-data-9999.ebuild,
   metadata.xml:
   use cached-converter.sh, do not run 7za as root

diff --git a/games-fps/xonotic-data/xonotic-data-9999.ebuild b/games-fps/xonotic-data/xonotic-data-9999.ebuild
index d79b77d..4d5e481 100644
--- a/games-fps/xonotic-data/xonotic-data-9999.ebuild
+++ b/games-fps/xonotic-data/xonotic-data-9999.ebuild
@@ -4,13 +4,13 @@
 
 EAPI=2
 
-inherit games check-reqs git
+inherit games check-reqs git-2
 
 MY_PN="${PN%-data}"
 DESCRIPTION="Xonotic data files"
 HOMEPAGE="http://www.xonotic.org/"
-BASE_URI="git://git.xonotic.org/${MY_PN}/"
-EGIT_REPO_URI="${BASE_URI}${MY_PN}.git"
+BASE_URI="git://git.xonotic.org/${MY_PN}/${MY_PN}"
+EGIT_REPO_URI="${BASE_URI}.git"
 EGIT_PROJECT="${MY_PN}"
 
 LICENSE="GPL-2"
@@ -60,16 +60,15 @@ pkg_setup() {
 }
 
 git_pk3_unpack() {
-	EGIT_REPO_URI="${BASE_URI}xonotic-${1}.pk3dir.git" \
-	EGIT_PROJECT="${MY_PN}-${1}.pk3dir" \
-	S="${S}/data/${MY_PN}-${1}.pk3dir" \
-	EGIT_BRANCH="master" \
-	git_fetch
+	unset EGIT_MASTER EGIT_BRANCH EGIT_COMMIT EGIT_PROJECT EGIT_DIR
+	EGIT_REPO_URI="${BASE_URI}-${1}.pk3dir.git" \
+	EGIT_SOURCEDIR="${S}/data/${MY_PN}-${1}.pk3dir" \
+	git-2_src_unpack
 }
 
 src_unpack() {
 	# root
-	git_src_unpack
+	git-2_src_unpack
 
 	# Data
 	git_pk3_unpack data



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gamerlay:master commit in: games-fps/xonotic-data/
@ 2011-07-06 12:43 Nikoli
  0 siblings, 0 replies; 5+ messages in thread
From: Nikoli @ 2011-07-06 12:43 UTC (permalink / raw
  To: gentoo-commits

commit:     9d9540c79bc0a52225653ab66b330a84267aa4a1
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Wed Jul  6 12:43:36 2011 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Wed Jul  6 12:43:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=9d9540c7

xonotic-data: fix store dir

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

---
 games-fps/xonotic-data/ChangeLog                |    3 +++
 games-fps/xonotic-data/xonotic-data-9999.ebuild |    1 -
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/games-fps/xonotic-data/ChangeLog b/games-fps/xonotic-data/ChangeLog
index eeb45fe..265ecb1 100644
--- a/games-fps/xonotic-data/ChangeLog
+++ b/games-fps/xonotic-data/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jul 2011; Nikoli <nikoli@lavabit.com> xonotic-data-9999.ebuild:
+  fix store dir
+
   05 Jul 2011; Nikoli <nikoli@lavabit.com> xonotic-data-9999.ebuild:
   migrate to git-2
 

diff --git a/games-fps/xonotic-data/xonotic-data-9999.ebuild b/games-fps/xonotic-data/xonotic-data-9999.ebuild
index 4d5e481..a00eb14 100644
--- a/games-fps/xonotic-data/xonotic-data-9999.ebuild
+++ b/games-fps/xonotic-data/xonotic-data-9999.ebuild
@@ -11,7 +11,6 @@ DESCRIPTION="Xonotic data files"
 HOMEPAGE="http://www.xonotic.org/"
 BASE_URI="git://git.xonotic.org/${MY_PN}/${MY_PN}"
 EGIT_REPO_URI="${BASE_URI}.git"
-EGIT_PROJECT="${MY_PN}"
 
 LICENSE="GPL-2"
 SLOT="0"



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gamerlay:master commit in: games-fps/xonotic-data/
@ 2013-03-06 14:56 Azamat H. Hackimov
  0 siblings, 0 replies; 5+ messages in thread
From: Azamat H. Hackimov @ 2013-03-06 14:56 UTC (permalink / raw
  To: gentoo-commits

commit:     dcb10d75c657671a180a638661cc7e8c4f6b778f
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Wed Mar  6 14:55:54 2013 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Wed Mar  6 14:55:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=dcb10d75

[games-fps/xonotic-data] Refresh ebuild, fix QA warnings for req-check.

Package-Manager: portage-2.1.11.52
Manifest-Sign-Key: A018DE8C

---
 games-fps/xonotic-data/ChangeLog                |    7 +++-
 games-fps/xonotic-data/xonotic-data-9999.ebuild |   33 ++++++++++------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/games-fps/xonotic-data/ChangeLog b/games-fps/xonotic-data/ChangeLog
index 265ecb1..14b2c92 100644
--- a/games-fps/xonotic-data/ChangeLog
+++ b/games-fps/xonotic-data/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for games-fps/xonotic-data
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Mar 2013; Azamat H. Hackimov <azamat.hackimov@gmail.com>
+  xonotic-data-9999.ebuild:
+  [games-fps/xonotic-data] Refresh ebuild, fix QA warnings for req-check.
+
   06 Jul 2011; Nikoli <nikoli@lavabit.com> xonotic-data-9999.ebuild:
   fix store dir
 
@@ -20,4 +24,3 @@
   17 Jan 2011; Nikoli <nikoli@lavabit.com> +xonotic-data-9999.ebuild,
   +metadata.xml:
   initial ebuild
-

diff --git a/games-fps/xonotic-data/xonotic-data-9999.ebuild b/games-fps/xonotic-data/xonotic-data-9999.ebuild
index 06b9354..3ce4766 100644
--- a/games-fps/xonotic-data/xonotic-data-9999.ebuild
+++ b/games-fps/xonotic-data/xonotic-data-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=5
 
 inherit games check-reqs git-2
 
@@ -28,9 +28,20 @@ DEPEND="
 "
 PDEPEND="maps? ( ~games-fps/xonotic-maps-9999 )"
 
-pkg_setup() {
-	games_pkg_setup
+if use !client; then
+	CHECKREQS_DISK_BUILD="3000M"
+	CHECKREQS_DISK_USR="320M"
+else
+	if use zip; then
+		CHECKREQS_DISK_BUILD="3850M"
+		CHECKREQS_DISK_USR="1830M"
+	else
+		CHECKREQS_DISK_BUILD="7020M"
+		CHECKREQS_DISK_USR="3520M"
+	fi
+fi
 
+pkg_setup() {
 	if use convert; then
 		ewarn "cached-converter.sh will use \"xonotic-cached-converter\" subdirectory of your DISTDIR"
 		echo
@@ -41,21 +52,7 @@ pkg_setup() {
 		ewarn "This feature is experimental, if anything goes wrong, contact the maintainer."
 		echo
 	fi
-
-	ewarn "You need 1,5 Gb diskspace for distfiles."
-	if use !client; then
-		CHECKREQS_DISK_BUILD="3000"
-		CHECKREQS_DISK_USR="320"
-	else
-		if use zip; then
-			CHECKREQS_DISK_BUILD="3850"
-			CHECKREQS_DISK_USR="1830"
-		else
-			CHECKREQS_DISK_BUILD="7020"
-			CHECKREQS_DISK_USR="3520"
-		fi
-	fi
-	check_reqs
+	check-reqs_pkg_setup
 }
 
 git_pk3_unpack() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gamerlay:master commit in: games-fps/xonotic-data/
@ 2013-07-19 16:43 Nikoli
  0 siblings, 0 replies; 5+ messages in thread
From: Nikoli @ 2013-07-19 16:43 UTC (permalink / raw
  To: gentoo-commits

commit:     34ee35edd21f3ac9a68c768f8cf668c8af61b354
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Fri Jul 19 16:21:28 2013 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Fri Jul 19 16:21:28 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=34ee35ed

xonotic-data: update

Package-Manager: portage-2.1.12.2

---
 games-fps/xonotic-data/metadata.xml             |  1 -
 games-fps/xonotic-data/xonotic-data-9999.ebuild | 83 ++++++++++++++-----------
 2 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/games-fps/xonotic-data/metadata.xml b/games-fps/xonotic-data/metadata.xml
index 18dad08..82a6eba 100644
--- a/games-fps/xonotic-data/metadata.xml
+++ b/games-fps/xonotic-data/metadata.xml
@@ -9,7 +9,6 @@
 		<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>
 </pkgmetadata>

diff --git a/games-fps/xonotic-data/xonotic-data-9999.ebuild b/games-fps/xonotic-data/xonotic-data-9999.ebuild
index fbadff3..160f6cf 100644
--- a/games-fps/xonotic-data/xonotic-data-9999.ebuild
+++ b/games-fps/xonotic-data/xonotic-data-9999.ebuild
@@ -15,10 +15,11 @@ EGIT_REPO_URI="${BASE_URI}.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+client +convert low +maps +zip"
+IUSE="+client +convert low +zip"
 
 RDEPEND=""
 DEPEND="
+	dev-lang/perl
 	~games-util/gmqcc-9999
 	convert? (
 		media-gfx/imagemagick[jpeg,png]
@@ -26,7 +27,7 @@ DEPEND="
 	)
 	zip? ( app-arch/p7zip )
 "
-PDEPEND="maps? ( ~games-fps/xonotic-maps-9999 )"
+RESTRICT="test"
 
 if use !client; then
 	CHECKREQS_DISK_BUILD="3000M"
@@ -41,7 +42,15 @@ else
 	fi
 fi
 
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
 pkg_setup() {
+	ewarn "You need at least 4 Gb diskspace for distfiles."
+	check-reqs_pkg_setup
+	games_pkg_setup
+
 	if use convert; then
 		ewarn "cached-converter.sh will use \"xonotic-cached-converter\" subdirectory of your DISTDIR"
 		echo
@@ -52,14 +61,6 @@ pkg_setup() {
 		ewarn "This feature is experimental, if anything goes wrong, contact the maintainer."
 		echo
 	fi
-	check-reqs_pkg_setup
-}
-
-git_pk3_unpack() {
-	unset EGIT_MASTER EGIT_BRANCH EGIT_COMMIT EGIT_PROJECT EGIT_DIR
-	EGIT_REPO_URI="${BASE_URI}-${1}.pk3dir.git" \
-	EGIT_SOURCEDIR="${S}/data/${MY_PN}-${1}.pk3dir" \
-	git-2_src_unpack
 }
 
 src_unpack() {
@@ -67,6 +68,11 @@ src_unpack() {
 	git-2_src_unpack
 
 	# Data
+	git_pk3_unpack() {
+		EGIT_REPO_URI="${BASE_URI}-${1}.pk3dir.git" \
+		EGIT_SOURCEDIR="${S}/data/${MY_PN}-${1}.pk3dir" \
+		git-2_src_unpack
+	}
 	git_pk3_unpack data
 	git_pk3_unpack maps
 	# needed only for client
@@ -74,21 +80,21 @@ src_unpack() {
 		git_pk3_unpack music
 		git_pk3_unpack nexcompat
 	else
-		rm -rf "${S}"/data/font-*.pk3dir || die "rm failed"
+		rm -rf "${S}"/data/font-*.pk3dir || die
 	fi
 }
 
 src_prepare() {
 	# Data
 	if use !client; then
-		pushd data
+		pushd data || die
 		rm -rf \
 			xonotic-data.pk3dir/gfx \
 			xonotic-data.pk3dir/particles \
 			xonotic-data.pk3dir/sound/cyberparcour01/rocket.txt \
 			xonotic-data.pk3dir/textures \
 			xonotic-maps.pk3dir/textures \
-			|| die "rm failed"
+			|| die
 		rm -f \
 			$(find -type f -name '*.jpg') \
 			$(find -type f -name '*.png' ! -name 'sky??.png') \
@@ -102,31 +108,24 @@ src_prepare() {
 			$(find -type f -name '*.zym') \
 			$(find -type f -name '*.obj') \
 			$(find -type f -name '*.blend') \
-			|| die "rm failed"
+			|| die
 		find -type d \
-			-exec rmdir '{}' &>/dev/null \;
+			-exec rmdir '{}' &>/dev/null \; || die
 		sed -i \
 			-e '/^qc-recursive:/s/menu.dat//' \
-			xonotic-data.pk3dir/Makefile || die "sed failed"
-		popd
+			xonotic-data.pk3dir/qcsrc/Makefile || die
+		popd || die
 	fi
 }
 
 src_compile() {
 	# Data
-	cd data
-	pushd xonotic-data.pk3dir
-	emake || die "emake data.pk3 failed"
-	popd
-
-	rm -rf \
-		$(find -name '.git*') \
-		$(find -type d -name '.svn') \
-		$(find -type d -name 'qcsrc') \
-		$(find -type f -name '*.sh') \
-		$(find -type f -name '*.pl') \
-		$(find -type f -name 'Makefile') \
-		|| die "rm failed"
+	cd data || die
+	pushd xonotic-data.pk3dir || die
+	emake \
+		QCC="${EPREFIX}/usr/bin/gmqcc" \
+		QCCFLAGS_WATERMARK=''
+	popd || die
 
 	if use convert; then
 		# Used git.eclass,v 1.50 as example
@@ -154,22 +153,34 @@ src_compile() {
 		fi
 
 		for i in data music maps nexcompat; do
+			einfo "Converting ${i}"
 			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
+				xargs -0 "${S}"/misc/tools/cached-converter.sh || die
 		done
 	fi
 
+	einfo "Removing useless files"
+	rm -rvf \
+		$(find -name '.git*') \
+		$(find -type d -name '.svn') \
+		$(find -type d -name 'qcsrc') \
+		$(find -type f -name '*.sh') \
+		$(find -type f -name '*.pl') \
+		$(find -type f -name 'Makefile') \
+		|| die
+
 	if use zip; then
 		for d in *.pk3dir; do
-			pushd "${d}"
-			7za a -tzip "../${d%dir}" . || die "zip failed"
-			popd
-			rm -rf "${d}" || die "rm failed"
+			pushd "${d}" || die
+			einfo "Compressing ${d}"
+			7za a -tzip "../${d%dir}" . || die
+			popd || die
+			rm -rf "${d}" || die
 		done
 	fi
 }
@@ -177,7 +188,7 @@ src_compile() {
 src_install() {
 	# Data
 	insinto "${GAMES_DATADIR}/${MY_PN}"
-	doins -r data || die "doins data failed"
+	doins -r data
 
 	prepgamesdirs
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2013-07-19 16:44 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-06 12:43 [gentoo-commits] proj/gamerlay:master commit in: games-fps/xonotic-data/ Nikoli
  -- strict thread matches above, loose matches on Subject: below --
2013-07-19 16:43 Nikoli
2013-03-06 14:56 Azamat H. Hackimov
2011-07-05 21:45 Nikoli
2011-03-27 19:38 Nikoli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox