Add demo USE flag, bug #178443

Package-Manager: portage-2.1.3_rc8

4 files changed, 49 insertions, 25 deletions

diff --git a/games-fps/rott/ChangeLog b/games-fps/rott/ChangeLog
index 2fd4f0b1629f..e3770e292bcb 100644
--- a/games-fps/rott/ChangeLog
+++ b/games-fps/rott/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/rott
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/rott/ChangeLog,v 1.7 2007/03/12 15:08:23 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rott/ChangeLog,v 1.8 2007/07/22 13:10:50 nyhm Exp $
+
+  22 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/rott-1.0-full-version.patch, rott-1.0.ebuild:
+  Add demo USE flag, bug #178443
 
   12 Mar 2007; Marius Mauch <genone@gentoo.org> rott-1.0.ebuild:
   Replacing einfo with elog
diff --git a/games-fps/rott/Manifest b/games-fps/rott/Manifest
index ff9bf36091a0..73d1d24d5b1c 100644
--- a/games-fps/rott/Manifest
+++ b/games-fps/rott/Manifest
@@ -5,20 +5,24 @@ AUX 1.0-custom-datapath.patch 1530 RMD160 656a997f4666380e3741a3c2467961dc703180
 MD5 cdef8cd1a4ab591b6298c6aed56c3d1d files/1.0-custom-datapath.patch 1530
 RMD160 656a997f4666380e3741a3c2467961dc703180d4 files/1.0-custom-datapath.patch 1530
 SHA256 dc5b896b5b0ce890033147e12e679b374a0131712dde8438512c5ff13bfff48f files/1.0-custom-datapath.patch 1530
+AUX rott-1.0-full-version.patch 298 RMD160 ae9adb06af3370ce5c9833a26eebf17578384058 SHA1 482d9552e418fbaa9e09cae44c7e1ddd8975de6c SHA256 08394445e09435b107451b1fcf2bfd4c46e23e60707059437ebf3dc3e47e4ce3
+MD5 25951b221e90075499c08e3348db27f1 files/rott-1.0-full-version.patch 298
+RMD160 ae9adb06af3370ce5c9833a26eebf17578384058 files/rott-1.0-full-version.patch 298
+SHA256 08394445e09435b107451b1fcf2bfd4c46e23e60707059437ebf3dc3e47e4ce3 files/rott-1.0-full-version.patch 298
 AUX rott-1.0-gcc41.patch 730 RMD160 add48ea08f48014a3406879585c2ef988a46ac19 SHA1 4d4c34b42f71ce150025fd52b0d7db5aba5048c2 SHA256 845feaeae78d7bfcc1b83f4a7cd2f4842477cfdf61d686eb8b4b49f16878625e
 MD5 93c4d4fa050c72a94f4053b7d4450382 files/rott-1.0-gcc41.patch 730
 RMD160 add48ea08f48014a3406879585c2ef988a46ac19 files/rott-1.0-gcc41.patch 730
 SHA256 845feaeae78d7bfcc1b83f4a7cd2f4842477cfdf61d686eb8b4b49f16878625e files/rott-1.0-gcc41.patch 730
 DIST rott-1.0.tar.gz 777281 RMD160 539125b1e2f820f61029397df7c5ae829c043cc2 SHA1 eca5a183486adc229d45b33907385c20ca7f601b SHA256 11f9cc331d0be87f0f172840e2bb6e03e27c3b8e9ecbb3eb8cffdc5b73afbd95
 DIST swdata.zip 2889672 RMD160 1a51acf050d543acbb22e99ae2a2d5f32e0c503a SHA1 11ffe61045d590103409b76ce72815988a6c2cd1 SHA256 e226d4958ce1294886b32faf782d9db3d3e66f875d9addd62982e2c8d104fd6b
-EBUILD rott-1.0.ebuild 1267 RMD160 54f727bdedf3dfa8fb8091aaa6e25a9769891d14 SHA1 40fb7a66fda55fe2f90282ea53417da2d016d024 SHA256 8d3f49eaa580d910ab88696c11e5111cc55bc57a11d0e3472b5f22d952bc25f8
-MD5 cbc3639433103e8ba4b9311a4a21163e rott-1.0.ebuild 1267
-RMD160 54f727bdedf3dfa8fb8091aaa6e25a9769891d14 rott-1.0.ebuild 1267
-SHA256 8d3f49eaa580d910ab88696c11e5111cc55bc57a11d0e3472b5f22d952bc25f8 rott-1.0.ebuild 1267
-MISC ChangeLog 722 RMD160 732b808744897714993bfa60c97f6fba5d93861a SHA1 cea10669dcd9888161397930637426d29526c6a3 SHA256 1a9c305cd312f6891772fb8a8a778862f0d2bacb5d9e6c2c5610afdba7641147
-MD5 ebb6c85de13616e37ed21d2a6745d560 ChangeLog 722
-RMD160 732b808744897714993bfa60c97f6fba5d93861a ChangeLog 722
-SHA256 1a9c305cd312f6891772fb8a8a778862f0d2bacb5d9e6c2c5610afdba7641147 ChangeLog 722
+EBUILD rott-1.0.ebuild 1348 RMD160 4d2459f836d9342ce4de94eea7ab80c18d5381cb SHA1 10a01280ed56efe538c20192c55820efe4af0444 SHA256 7571accb7df11b2166a7369211aff065c59c5901a42bcaf7fe0563a1ecc35b09
+MD5 422e55448c296bacd3501f8871e6d6c9 rott-1.0.ebuild 1348
+RMD160 4d2459f836d9342ce4de94eea7ab80c18d5381cb rott-1.0.ebuild 1348
+SHA256 7571accb7df11b2166a7369211aff065c59c5901a42bcaf7fe0563a1ecc35b09 rott-1.0.ebuild 1348
+MISC ChangeLog 857 RMD160 554ed3fb71376e9cb76d1c26934a371110eac62c SHA1 e4d06c18d71c995ec97cab88c364c935ea58ee7f SHA256 021bc2ef3f5d4f6395870a105c8c663dfd73d1c27416f8649512c1f64a67772f
+MD5 e601e0921069a470c90d2ded0fd13d7a ChangeLog 857
+RMD160 554ed3fb71376e9cb76d1c26934a371110eac62c ChangeLog 857
+SHA256 021bc2ef3f5d4f6395870a105c8c663dfd73d1c27416f8649512c1f64a67772f ChangeLog 857
 MISC metadata.xml 916 RMD160 b08e869db0a83956f7f1d44e9c0a34409e68888b SHA1 acf4c9db03a340e669e159f99882d2ee4eed9d72 SHA256 fee9f7a26e10e7427a174fb9946ee05a6bba347f8296342021d7005418bcd34c
 MD5 1a68e9776451c3d02e735258e21bba90 metadata.xml 916
 RMD160 b08e869db0a83956f7f1d44e9c0a34409e68888b metadata.xml 916
@@ -27,9 +31,9 @@ MD5 c1736c718d83908669decbc49c0e1d92 files/digest-rott-1.0 440
 RMD160 fd66afaa9e3f431d133f9d530d063cfac006518d files/digest-rott-1.0 440
 SHA256 c4e6a45ef0dbb53aaccb52bce6390793c74a1eab6d855ae971e234f135573ae1 files/digest-rott-1.0 440
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFF9W3m6J2i8a8J4okRArX9AKCkUdkdbt87Z9hrXJbvCrRpAohz3gCfZrBh
-7x2cdkGj8ZKIGC6y2/hqvCo=
-=tpmf
+iD8DBQFGo1dYdz7hIScOURERAqOwAJ9Oc1r/a4FyQrTcLLcD20Z2EZ0jrwCg3ONT
+i7xkHI+1D/1np2WwYB6F9N4=
+=6rDR
 -----END PGP SIGNATURE-----
diff --git a/games-fps/rott/files/rott-1.0-full-version.patch b/games-fps/rott/files/rott-1.0-full-version.patch
new file mode 100644
index 000000000000..e1615e77f7fa
--- /dev/null
+++ b/games-fps/rott/files/rott-1.0-full-version.patch
@@ -0,0 +1,11 @@
+--- develop.h.orig	2007-05-13 22:42:39.000000000 +0200
++++ develop.h	2007-05-13 22:42:44.000000000 +0200
+@@ -40,7 +40,7 @@
+ #define LOWCOST  0
+ 
+ // Make sure only one of the following are on at one time
+-#define SHAREWARE   1
++#define SHAREWARE   0
+ #define SUPERROTT   0
+ #define SITELICENSE 0
+ 
diff --git a/games-fps/rott/rott-1.0.ebuild b/games-fps/rott/rott-1.0.ebuild
index 184070098613..265b8440629a 100644
--- a/games-fps/rott/rott-1.0.ebuild
+++ b/games-fps/rott/rott-1.0.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/rott/rott-1.0.ebuild,v 1.9 2007/03/12 15:08:23 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rott/rott-1.0.ebuild,v 1.10 2007/07/22 13:10:49 nyhm Exp $
 
 inherit eutils games
 
 DESCRIPTION="Rise of the Triad for Linux!"
 HOMEPAGE="http://www.icculus.org/rott/"
 SRC_URI="http://www.icculus.org/rott/releases/${P}.tar.gz
-	http://filesingularity.timedoctor.org/swdata.zip"
+	demo? ( http://filesingularity.timedoctor.org/swdata.zip )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc x86"
-IUSE=""
+IUSE="demo"
 
 RDEPEND="media-libs/libsdl
 	media-libs/sdl-mixer"
@@ -24,12 +24,14 @@ S=${WORKDIR}/${P}/rott
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-custom-datapath.patch \
-		"${FILESDIR}/${P}"-gcc41.patch
+	epatch \
+		"${FILESDIR}"/${PV}-custom-datapath.patch \
+		"${FILESDIR}"/${P}-gcc41.patch
+	use demo || epatch "${FILESDIR}"/${P}-full-version.patch
 }
 
 src_compile() {
-	make clean || die
+	emake clean || die
 	emake -j1 EXTRACFLAGS="${CFLAGS} -DDATADIR=\\\"${GAMES_DATADIR}/${PN}/\\\"" \
 		|| die "emake failed"
 }
@@ -37,15 +39,18 @@ src_compile() {
 src_install() {
 	dogamesbin rott || die "dogamesbin failed"
 	dodoc *.txt ../{README,readme.txt}
-	cd "${WORKDIR}"
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins *.dmo huntbgin.* remote1.rts || die "doins failed"
+	if use demo ; then
+		cd "${WORKDIR}"
+		insinto "${GAMES_DATADIR}"/${PN}
+		doins *.dmo huntbgin.* remote1.rts || die "doins failed"
+	fi
 	prepgamesdirs
 }
 
 pkg_postinst() {
 	games_pkg_postinst
-	elog "The shareware version has been installed."
-	elog "To play the full version, just copy the"
-	elog "data files to ${GAMES_DATADIR}/${PN}/"
+	if ! use demo ; then
+		elog "To play the full version, just copy the"
+		elog "data files to ${GAMES_DATADIR}/${PN}/"
+	fi
 }