Move to new CDROM_OPTIONAL variable.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 29 insertions, 25 deletions

diff --git a/games-action/d1x-rebirth/ChangeLog b/games-action/d1x-rebirth/ChangeLog
index 9bd3da5ea267..6d40480e898c 100644
--- a/games-action/d1x-rebirth/ChangeLog
+++ b/games-action/d1x-rebirth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/d1x-rebirth
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/d1x-rebirth/ChangeLog,v 1.7 2012/01/16 18:58:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/d1x-rebirth/ChangeLog,v 1.8 2012/01/18 12:42:50 vapier Exp $
+
+  18 Jan 2012; Mike Frysinger <vapier@gentoo.org> d1x-rebirth-0.55.1.ebuild,
+  d1x-rebirth-0.56.ebuild:
+  Move to new CDROM_OPTIONAL variable.
 
   16 Jan 2012; Ulrich Müller <ulm@gentoo.org> d1x-rebirth-0.55.1.ebuild,
   d1x-rebirth-0.56.ebuild:
diff --git a/games-action/d1x-rebirth/Manifest b/games-action/d1x-rebirth/Manifest
index 62712edea994..c1a62f3f8562 100644
--- a/games-action/d1x-rebirth/Manifest
+++ b/games-action/d1x-rebirth/Manifest
@@ -13,24 +13,24 @@ DIST d1xrdata.zip 1364601 RMD160 e425d4da73d13597daaf3f9cb1a30a41d4069e65 SHA1 2
 DIST descent_midi.zip 416641 RMD160 084622f94a32ccb07b57ed2326e63b67e02cb5e4 SHA1 11303ab85bf0f4bbdd1cd8bcd2adc99888946240 SHA256 0def03b36edb592fc9eda6c3f1b6e9c47a7bde89909c911f632f5a8fa7ba684a
 DIST dxx-rebirth_icons.zip 137392 RMD160 2e82d09ecd6e249aa7964221be3dc2647e31d505 SHA1 7228b659259aed6960760ee163dfa41ff2cf2740 SHA256 d38ba8730335b13d63ddf9119ad180e3f6c29e3f238baad87080cf60c4730efc
 EBUILD d1x-rebirth-0.50.ebuild 3427 RMD160 1d5f74273129a0e9d2f7eb17ab1f3c03572b8889 SHA1 2f91f7592da9fcd6d9138181f296be10befbf91a SHA256 a9f2c846bc08d6b52fbaa5bbe5da44cdb898dc477a7fc7fa23ce5591ff0cece5
-EBUILD d1x-rebirth-0.55.1.ebuild 2990 RMD160 db31cd00100fe517799a65f8ade37e9c60832c3c SHA1 090ab416d6dd2103d823800d2e3f87ee3a22f1ce SHA256 cf44747e3a2bda41b045ba7c9a514bb694733719c040f127f41fbdf6dd2a8c3e
-EBUILD d1x-rebirth-0.56.ebuild 3008 RMD160 c10f021c4cd2e1743e72108585aa9505b597a2ca SHA1 bcb66258447b995d3a3da8d46f231a3f8353094c SHA256 452f71192fbf0103637ca82cffb3b17f3b79f33ef8b12a5c66d6a541715e115b
-MISC ChangeLog 1539 RMD160 def2289aaf25ccf1df2bbfff7559ac5f055db68e SHA1 cc5a234a599b9f150a152a6edf2bcc7f39af08fc SHA256 0a8b8df40eb6db7ac5e18411433e784729279c6b71a9a325766a377be9fea0e7
+EBUILD d1x-rebirth-0.55.1.ebuild 2938 RMD160 199effc92a87d75840432077316055c2ec4ad60c SHA1 1ef73d2da2c802039207ded027a93814eaee8df5 SHA256 cf869a6895d633005bd744bb2e6bd2793fdf778100d3c637c66807022517dbd0
+EBUILD d1x-rebirth-0.56.ebuild 2956 RMD160 a2e47afe757e65dd77f1c5a5ddd50ebe5ebda640 SHA1 554a11f08b0f535a5fd1228d59f505cb402d4ff9 SHA256 a6b376a35df1a8a8f095854adebd6193b41070f0c25d5c92641f259bf7fa2d2a
+MISC ChangeLog 1686 RMD160 abda5f561b8e18a285afe38e563980acdb9b1143 SHA1 0bc77082c6e0e93bbd7b21c6f8f08d4aba733871 SHA256 4ddbe9aaec7fd40ae2c32485dfd2eaacfb0601f2696199c527e3f09637ea3836
 MISC metadata.xml 752 RMD160 b74938f0fa4a1a801aa9905874fa31bd85a0b810 SHA1 9f5b365989eb181750d5728a1d30eddfd44b8ec0 SHA256 de6c290faddf553cbb805fa1dece43a54ca0baf81f3ed1bd7117b0e3c5c2dc8c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPFHOGAAoJEDxpGckxwJCBWTwP/2DSn6oHjTqGT73lScObEmyP
-FTMdleTM7iBnmKMmNxJEXAVW51ZCa4Ml9SOtoxiYASTHZn14tAVwVt7Xo5+EQ/+1
-GXLxVSD2HMxKtsAxlcjcAsq8bcXjbdIhfnzATk6Phoo1qltRmWNH2hIWaHkFH0g/
-HNV/gEgFm06m6fLjk/Gov54c08MbzADUuw/5VzcZC0WspEE8gM70vIF4lHEH9ilE
-iabCCUg3GrVgOkBdRR7x+tKuqqLEl3hBbSdpLdqU0pC87ZMFR36g1DF9vp4tArOB
-8zkd8KzEVzF5sfQJJArAAdNSpnDspt8NGa+cIwaNJrSF7ZRLtzVKmV+6S+HgrS9e
-AvSJ/NNV5bfEo7X1x7/8g7RVe1N/05h7+Pu+dUeAciYY6Hlik2sJYafcCeOUokpq
-kKwjI4HAquA+IvA07zKp208Lqt6LZFdo63qkL5qNkS12ZW25qiZM7BBOqeZKIjBI
-iNskwGqlVfpDugq4cDbt7wTmsSKrI3QKNbqnAVjcfOdG4ibB/a49cxhg5z2SC8SO
-nw0mcJ1RuJWQymxQg7jHB9WYBX30FdWy6svbBKWlQlzwEQGdnXzmh+OdCPWBJjT5
-SALXaKmjnMbcCPa2349YBKCWxGmLw9Za/FTt1zLLtrOj//Uk0fjIRsp5rmyWWs/J
-I9H+Yuc9gsEWYWxXXvYx
-=8YRy
+iQIcBAEBAgAGBQJPFr5WAAoJELEHsLL7fEFWlCsP/2JyMIErpWLSmiJpTO+J7nCY
+A+4m32Qoj8k4wYJO6LpXJbaHPbG7FXxgYHPZ7LW+YDCmHBWAvwnu8tpyQFrnLj/h
+1Q00KSu4/+6FKSgpTfmQj5jCpGh48Rekh95QPGltvcdrNdKcomVpbhNlKFAFRQWE
+taXYs/d1GfN+XvmHZ3oLQelsl1wzwYS/8t5OomDhmV4VYnvPR/xfXotnOs+rpKOM
+hvSaUzG1IeaEqS7Vq73nYv0J3Ge168efAs41yZcOIvEVvRjy1391y56QXVy9BKqU
+lo4hsal8ufY+0Jbp5uviNmAAYaFHyjtYDLOLgVxsdoUflQXfWoMXWzyhdiNQpTHP
+/9pkE4GUcDYTUPRd/s1L9zXxHe8Q1k6SIAKvnGxxOooG1DwqtPJoHwY+GxABM0pB
+sDdsW2esr1e/wpT9bMwZKYmUG9yqVx9Yi9eH+MlF5MtWwJO+P2aUB8e81Zry8WDU
+DYo9Hogf4W3i24OoVwlTCGHLIl+SRtYEUH/pu7lF25OEZc8iECm96qgVDy7l35+6
+1g/T73BikubvKdsPqdUj/hDY2Uq3h+rRPzXOKulXfqPsiFavlSEkxXbAZNnSb3Jv
+dP7hf9sbO0329Jz1qfIbi4XpaPQOVl+iJ92VxnyAYBXfxA/gr8OfY39QLMAVrXUF
+2rscJQvyDmb7pqkUlEnO
+=Gn0B
 -----END PGP SIGNATURE-----
diff --git a/games-action/d1x-rebirth/d1x-rebirth-0.55.1.ebuild b/games-action/d1x-rebirth/d1x-rebirth-0.55.1.ebuild
index 26a2b0bf169f..1a8ff6086cda 100644
--- a/games-action/d1x-rebirth/d1x-rebirth-0.55.1.ebuild
+++ b/games-action/d1x-rebirth/d1x-rebirth-0.55.1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/d1x-rebirth/d1x-rebirth-0.55.1.ebuild,v 1.4 2012/01/16 18:58:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/d1x-rebirth/d1x-rebirth-0.55.1.ebuild,v 1.5 2012/01/18 12:42:50 vapier Exp $
 
 EAPI=2
-CDROM_DISABLE_PROPERTIES=1
+
+CDROM_OPTIONAL="yes"
 inherit eutils cdrom games
 
 DV=1
@@ -19,8 +20,7 @@ SRC_URI="mirror://sourceforge/dxx-rebirth/${PN}_v${PV}-src.tar.gz
 LICENSE="D1X GPL-2 as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall ipv6 linguas_de opengl timidity"
-PROPERTIES="cdinstall? ( interactive )"
+IUSE="ipv6 linguas_de opengl timidity"
 
 RDEPEND="virtual/opengl
 	virtual/glu
diff --git a/games-action/d1x-rebirth/d1x-rebirth-0.56.ebuild b/games-action/d1x-rebirth/d1x-rebirth-0.56.ebuild
index bce3c6496d8d..163621c1f5e9 100644
--- a/games-action/d1x-rebirth/d1x-rebirth-0.56.ebuild
+++ b/games-action/d1x-rebirth/d1x-rebirth-0.56.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/d1x-rebirth/d1x-rebirth-0.56.ebuild,v 1.3 2012/01/16 18:58:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/d1x-rebirth/d1x-rebirth-0.56.ebuild,v 1.4 2012/01/18 12:42:50 vapier Exp $
 
 EAPI=2
-CDROM_DISABLE_PROPERTIES=1
+
+CDROM_OPTIONAL="yes"
 inherit eutils cdrom scons-utils games
 
 DV=1
@@ -19,8 +20,7 @@ SRC_URI="mirror://sourceforge/dxx-rebirth/${PN}_v${PV}-src.tar.gz
 LICENSE="D1X GPL-2 as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall ipv6 linguas_de opengl timidity"
-PROPERTIES="cdinstall? ( interactive )"
+IUSE="ipv6 linguas_de opengl timidity"
 
 RDEPEND="opengl? ( virtual/opengl virtual/glu )
 	dev-games/physfs[hog,zip]