remove cdinstall and demo useflag in preparation for arx-fatalis-data revbump

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

3 files changed, 25 insertions, 30 deletions

diff --git a/games-rpg/arx-libertatis/ChangeLog b/games-rpg/arx-libertatis/ChangeLog
index ac18a6261253..44f011a1ad7c 100644
--- a/games-rpg/arx-libertatis/ChangeLog
+++ b/games-rpg/arx-libertatis/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-rpg/arx-libertatis
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/ChangeLog,v 1.13 2013/03/03 02:08:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/ChangeLog,v 1.14 2013/03/14 00:56:08 hasufell Exp $
+
+  14 Mar 2013; Julian Ospald <hasufell@gentoo.org> arx-libertatis-1.0.3.ebuild:
+  remove cdinstall and demo useflag in preparation for arx-fatalis-data revbump
 
   03 Mar 2013; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Adjust metadata for Qt category move.
diff --git a/games-rpg/arx-libertatis/Manifest b/games-rpg/arx-libertatis/Manifest
index a91d888856a2..1ade7b42ca40 100644
--- a/games-rpg/arx-libertatis/Manifest
+++ b/games-rpg/arx-libertatis/Manifest
@@ -9,23 +9,17 @@ AUX arx-libertatis-1.0.3-gentoo.patch 2009 SHA256 99ee2ac74a12adf7d614a1561e4eec
 DIST arx-libertatis-1.0.2.tar.xz 912096 SHA256 cd40510563f93149f237df55d373900f85eb05c9cc5731efe4d173f314d4fadd SHA512 87b52feac0edaea009c25cab84cf206322be7440dc4ee04484578ae18bd340a11dde3fd10dce13c801d510d335d0afb219d4b6fb2eae4fdda2136caeaf1e9e9e WHIRLPOOL 7c8855868fd9fa865af1eaa88aa8c99e59f1db8a62eb3de407e5163eeb8f529e6709c7269ef8cd617131f0b5c5f5efdf97270bb2590be8f2291baeaee6267bbb
 DIST arx-libertatis-1.0.3.tar.xz 912288 SHA256 5719e1602051f6a6dc13ac0366ff03804f914ffbd855e7e06fdeb0d065fb6d32 SHA512 e1e8d581b6a7928911abad124a6f9670c28f2a56bc7f7f3bae965f717977a0e9a3953514a663c3f7eb4a802cca8e5607feec829a3b7ffeccc83a835fd77a74b6 WHIRLPOOL 321ec489a474b9a63a762756d929371bd8c05ea5d2fa7994c597a86dc20009f385c5f8d23c1da5f978e9f358949a96bf23bf218245633fd5f4393294fbecee75
 EBUILD arx-libertatis-1.0.2-r1.ebuild 2377 SHA256 50e195807c44572e79c4bd294adcd4aa343a5f56bf414680b4fba98af9becb4f SHA512 0b9f6428df4d59ba4270e4a219dc1f4a46d397d9ab9f0b67d7716e23f8080400514dbea682cc639ac9a54f0126f6cf62f18f303fc6fd5d129352d2357f8d2d50 WHIRLPOOL 75976394fa485e5544a2fa4f416b72fe3cae0c88010094803755bf6f8b99294615b3ee423ac0f2ed468678e37032185074634712bd8e953fb0272754df9918a9
-EBUILD arx-libertatis-1.0.3.ebuild 2373 SHA256 88382303011deeeb8d5211bb1ca734af3a18ee2fc637e1ba9c1f62551d9b4d6d SHA512 400df55bdb30671ca186f4412e67ee8144f92084edb507c5be2495c64c34ffa66ac06905f98c88be6b9ade6e1d411aab2a375a4589845b2fb390e317085d8757 WHIRLPOOL 5652cf8bd39afd8a2cca9101174ac702ad00eae587acbb5edc8fca2efa56b8883102eb927e998f4e4d674f5b5585c71c7c28eb5366e06d7928271501f7655e35
-MISC ChangeLog 2114 SHA256 2c06c91e01b0a57353787f385c858ee19de278d0820925265862a89cd267c8d5 SHA512 b9b32209a00b42aef8e4e2a03ee97991e4c7119b338676e2027ee47e035a078433dc7a4c180ca4edef88d9e32083962fa7e1f1cbc02c586995e3db2f72609c24 WHIRLPOOL 4705d3c4c370235b2876ce8984021286f8ee080236ec71ce2da987a5e3948e15ef529313402bfeb076eb9f8e992912162b4fabc949d0afd4d120089b1c68c85a
+EBUILD arx-libertatis-1.0.3.ebuild 2267 SHA256 c5633fd12847864dbe8b22af1c63427a299778629e2883182977df157c497ef9 SHA512 f9529ece9262247fb6c2ca389639df6bc35ababeee86b458bc03f192457857296074f25ed84ee2c7b16bebb692e3fb90456ee56e5dc21980d6f2d90394b8147b WHIRLPOOL b2038510559b4a418aa240df77d07d4595b7988b2ffc92a083a4121c6b5979ae29046505431ec652c20803f723d4e755bdb6ad2346eef7e94e1350dfef00a70d
+MISC ChangeLog 2279 SHA256 b472181620b420e7832e9addd7b30fd7294bb93f09406ae63e34cbc8cf9d4c96 SHA512 b288d3a5bde1707c6244a9e22a6edb1637c60840a951908089f34d21dd4d133d77c4e72eda220fb641448fb59cbc9e76abeed96e9fd2120ac2fdfe47b4e12c7c WHIRLPOOL aafe2b568faea27536bcee2650703aa5f5918b68bb38d1b20983b7c975f41c9d4b0bc473db1b3c7b63865958c8eeaa580bf3e1b8e189dc23b2a650abe1543a04
 MISC metadata.xml 949 SHA256 cf3b35f120b7c0c9b820b13f7f06bda3a66ffb7001d1696a27765a65ae78b498 SHA512 95c8e75cde52512427cc544795db386e2e8d02f8303d9b3c3f8dbbb10674b846feb1faea757857fae862731ac70f9ab9eb81023811454a7a8a4e5cf133a004c6 WHIRLPOOL e0e8c765b3c8a7303bafae09160f3d4b23884b73d5ff28844aad53767ea7358c3291a92568b8322c7c659f917ec9c082326169df4f463393cf0270c0e22d74d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRMrCaAAoJENXLsxwXqFxyc78QALAJMo/W8UAad9VBLgml2pll
-xgNYOT1mOUX1PDiZ6phTV9RKqWkmLgyAsECZ1is45rkMpy3gKA5WjkCmgAEChghA
-wKu+9C9QSrHL9k+diH5KmSMP7tZhAykIuD10FSOAslm6xdU3vb9oAtxWCk8/x+la
-yo1VkZvXlkbYeSbi0bb//WJMNWyFtGYMd5SgQeCWQLLNQO18KSMZqGAlQIMkwTfO
-ngHX2nRw27m17hX1saubwk0w/ZzxAhiuSDCPJCHik4/9o0DhmNKEs326GmujokAd
-B/ikjLRK/1SElCOrC1lo7eRUhMCz1dFYNHL0eDjiBVGCI/Z56G/7CY4Xa8bWTWUO
-g5U8IZCzyw+fQnhVeTzUnaxihO23SpdMhHz9he9Wzf1rB0mjY/sECUEYIZnkTGHY
-l8w95GrTCd+MZr+QL0u8BZxXH7so7lR71YBXRiyV4/quUabNyq5SGMAd9/9RcFZz
-nc2f8R3wf2Ecu7MRh1e+dIrprQ7ggFK56uh2nPJyKC65n4C8NUwIac7dMCBYO2U2
-CynBSA3EQMKDCYG08Q83lJvr86HT0/MyrNhc+5MMkmHR3iusRcpDu5xku+/Qd3/t
-BiMvRGwgulnyOkKvoysmPNyYnnFFtsnP/RO9CHFee2fYAFfewv2RpS7emfP98W9J
-4yJYTPbwJyb6zCvoWRhB
-=gqD1
+iQEcBAEBCAAGBQJRQSAtAAoJEFpvPKfnPDWzK9oH/1wM56NUu+y9hLjKHPEMe+PO
+T6ZiHm5rLDlpXKnMKwHetXZwteqc73mWHzDQdOBozxgzl60tzvgRj3y75EbTfk+x
+1YQqFeoEBc1HU/Ugg+DxsbwGIeQKLsmM56j3Y/7kx+MzOME23WYeD/raOyfUtOwV
+7QGo205agkS7qq/YqAIOZEuuGeC/+HUlUg6LByy5u/jMIwnE6oeuGXcjmA8hQ3/D
+DV6Yn7j6l9wwOP6vq9Pjb2XlndxGMnjBz49hk37386PXjl40VTikRwSzM348+L8P
+tXhMY04sVflBUcUjZ77Ak1j3gMSSDCxra5Dzz2rjBLJwtJyX4CtJXVhiEfIi/tw=
+=4DeF
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild
index ba8e360419dc..3acef8003218 100644
--- a/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild
+++ b/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild,v 1.5 2013/03/02 21:20:49 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild,v 1.6 2013/03/14 00:56:08 hasufell Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/arx/${P}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="cdinstall demo debug unity-build crash-reporter tools"
+IUSE="debug unity-build crash-reporter tools"
 
 COMMON_DEPEND=">=dev-libs/boost-1.39
 	media-libs/devil[jpeg]
@@ -31,8 +31,6 @@ COMMON_DEPEND=">=dev-libs/boost-1.39
 RDEPEND="${COMMON_DEPEND}
 	crash-reporter? ( sys-devel/gdb )"
 DEPEND="${COMMON_DEPEND}"
-PDEPEND="cdinstall? ( >=games-rpg/arx-fatalis-data-1.21 )
-	demo? ( games-rpg/arx-fatalis-demo )"
 
 DOCS=( README.md AUTHORS CHANGELOG )
 
@@ -73,16 +71,16 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	einfo "This package only installs the game binary."
-	if ! use cdinstall || ! use demo ; then
-		elog "You need the demo or full game data."
-		elog "See http://wiki.arx-libertatis.org/Getting_the_game_data for more information"
-		elog
-		elog "You might want to enable cdinstall or demo useflag."
-		elog
-		elog "If you have already installed the game or use the STEAM version,"
-		elog "run \"${GAMES_BINDIR}/arx-data-copy /path/to/installed-arx /usr/local/share/games/arx\"."
-	fi
+	elog "optional dependencies:"
+	elog "  games-rpg/arx-fatalis-data (from CD or GOG)"
+	elog "  games-rpg/arx-fatalis-demo (free demo)"
+	elog
+	elog "This package only installs the game binary."
+	elog "You need the demo or full game data. Also see:"
+	elog "http://wiki.arx-libertatis.org/Getting_the_game_data"
+	elog
+	elog "If you have already installed the game or use the STEAM version,"
+	elog "run \"${GAMES_BINDIR}/arx-data-copy /path/to/installed-arx /usr/local/share/games/arx\"."
 
 	games_pkg_postinst
 	gnome2_icon_cache_update