Version bump (bug #451752, thanks to Agostino Sarubbo). Update to python-single-r1.eclass and EAPI5. Update license. Drop old.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 87 insertions, 54 deletions

diff --git a/app-cdr/gcdemu/ChangeLog b/app-cdr/gcdemu/ChangeLog
index 731c407ef502..e7bce01e739e 100644
--- a/app-cdr/gcdemu/ChangeLog
+++ b/app-cdr/gcdemu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/gcdemu
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/ChangeLog,v 1.23 2012/05/03 07:51:49 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/ChangeLog,v 1.24 2013/01/28 00:24:30 tetromino Exp $
+
+*gcdemu-2.0.0 (27 Jan 2013)
+
+  27 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gcdemu-1.4.0.ebuild, gcdemu-1.5.0.ebuild, +gcdemu-2.0.0.ebuild:
+  Version bump (bug #451752, thanks to Agostino Sarubbo). Update to
+  python-single-r1.eclass and EAPI5. Update license. Drop old.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> gcdemu-1.4.0.ebuild,
   gcdemu-1.5.0.ebuild:
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
index ea41978a7936..63454f0138ed 100644
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@@ -1,6 +1,20 @@
-DIST gcdemu-1.4.0.tar.gz 127488 SHA256 c8a1f7b6ced6926e49315f3f69a51253ec4ec523b7bd362ddeb08408c5a505a0 SHA512 55e07e07b617ac55655762c267abfc2aac912132d5923e98c2416e38acaa896cdbaaeebdcf566b07c2d9b61b823d60950b47af5f04f3dd11a2f597052a265a6f WHIRLPOOL 4f0bff1cc2243e32f9eee0d33be82007bd98a26c7c764d660da7e211749fe80f29e3f806ca53b7df8e214ea88ff6428fd0ff02dbd83c581effe5eb1ca033fd89
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST gcdemu-1.5.0.tar.bz2 106163 SHA256 43f3da30eb95759618d258acd312f45a7fe4a9792952954c77b0fea9459d0c85 SHA512 8e599426c4f8817164ef44f4d06b823dd549e57b5e9b00ae8df7510ea2468c51e444c61ab8cf089b8e9cccd068b6df392ab34e2ba1d8c84dd18f5b783b240ed1 WHIRLPOOL 19d34d926e5df188abf605c11a3530bd9ab4e05e15cf36683aefe38dee25f10411ef6f1f230bf419915f91173f3591ad729423dccbd48c11c092f730f9f3c2e7
-EBUILD gcdemu-1.4.0.ebuild 947 SHA256 d7238673a94b180a2b7e343562e94d2c559e5d9cbeb6b472477448bdd1f10899 SHA512 fdf726627c967b2e5d6648accb0cc6a607118f4a531264a3d2d44cfcdd69545f89605797344720c9232337eac2e4cb6e6716bb12e4c0db536988158755ab53f0 WHIRLPOOL 49d64577c3eb5adc30dae238265438c7b282a9f4b36ffa1c2e55eb3227aababa1a04ea8bfcb305f1c8431330933ef5775129bb60b8626aeb8db930e9ff7428bf
-EBUILD gcdemu-1.5.0.ebuild 968 SHA256 709042992dccce47805d7dbd7a9adbbfb962e17fd645b109017dfcac9c4eff0d SHA512 e72a1d36999748a0db14bca022150ab9419c2f8d03178d48371bca9116886f1fd193b8aafbf0eb581a750ac79e1980e0942e1a5700afbf0264eec34dcc907c0c WHIRLPOOL 4ac00f7be5eb49168b0f26ceb2c0e92a01ff639ef0c2e296a6af3a08abeb38fcc58f4f38e9bb76e650132f5b03790e77ec3a2be7cf9e82912a3c2fe975f0db24
-MISC ChangeLog 4183 SHA256 ba82036cbc3f8b9f020a3a33e6480e84b31e4464eac125f5b163a8ff2f6230fa SHA512 ff13fe734969ee4b2add07969ac1a94d2f646e7f5a744629b0c529597499fd6252862fbd09afe7ea89dc4ddcd4f00b54a88be6b9822e1cd435fd53e4990bd633 WHIRLPOOL 55fef2a5a94ca827aa06b551b3bc4948888067f222e52332c64d8adf8c0f1b923e8c832f422e81386218b7dea921726db1000fa079b4e631830a356ef7481998
+DIST gcdemu-2.0.0.tar.bz2 39502 SHA256 c6afa3b720618389119fd12c6006218510c1515d77637f27087b06f1a258c54f SHA512 af2ba5ac7bc8ef9ef442c511a28e0d77309b6b1d58170803ed072b712a52a5283e5b4c4c3b2c79cf687b1decfb87128a2cd956dfb8a0f32143ba8d9efe23c610 WHIRLPOOL b33ebb8c184c93e8e1e7d3fea4c99d6f3c4f063a8e4c80eca8829348d477eb1fc55581c41b123ccd878f8f28c24e9b817831f3fd55886b687d92baaab3d55a08
+EBUILD gcdemu-1.5.0.ebuild 964 SHA256 5e36ded0a73ad11b02a54ea50c96e72c33450a00eadb547f7413bd7c1b6a45ca SHA512 6becf33262180729c910edd3ec65e334cac0524997af4f92184b2b8f666fc03b39a03777db59f8a0e267b09261c76503d7ca7bb84a66d882d9a5c8df8640c72f WHIRLPOOL 532d0989e9791fd9d557677a8b3d3d38c5b4e640e38eab4ea0c78e312fe8b769e85263144e9b8d2f4a822c69f5da810a2954b78b5f798856d45d1f54c8cd8dfd
+EBUILD gcdemu-2.0.0.ebuild 1359 SHA256 4a583f25f94a7c11f44ae4202a22828068f839145bf1206521488ec261a765ee SHA512 d12d93a992f7bc32a40fe724702275e7db8f282589d56aa92446ce422ae887653fe9cac06f896cf0fb89451dc6518f220e8898a136048641dd713410b689b97e WHIRLPOOL c4b5cd8cb7503432234ff81316319444dc4e0bb2c7520c136b0b3def56ee053aa6688ea24c6f2841dfe89355ea5552b1c5b36ded7c288279dcf28881810ac77e
+MISC ChangeLog 4473 SHA256 61f4390e3117cb32e2c1e974c94ff9398fe08666ea1498ae3f7eb29c1fd485eb SHA512 87ebb0bb10f2664935273dd766f03b6da91b47684268174c135a542aa1da4942a7dc6b5008075fc2e945c494ffbfffaa6c58c3d0e36015a2613132fcd556e05b WHIRLPOOL e971b7c8bd0cfa033536942afb9556d389a2565cc49979e0f1d14ba87b6bef97d9428f44837712c7b4de0f934f72d2fad0f8888d919fea85917b03f691ff8877
 MISC metadata.xml 240 SHA256 4a0db93c159180b93d98dadc1cb36f054f18a7413357a0dd753c9264a43f7477 SHA512 14c9405275f11667ad7e035376fe7e5caf99ac982596621cda18a2f8a99e9a9b2464806be5d016d1a4c2fa794bf8b1400a5cb658a7a874e65d825b8baea69d62 WHIRLPOOL 0e2fbd97c0146322cf226d3086acf3e95dc86d17409f3d350ba2de1b81a2d93b0dc3f370d5c444475e129fa511791ea5b48ca00c47583cedc6ed60ef9e61fae7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRBcU/AAoJEJ0WA1zPCt1hFPwH/A5yXX9+BjMETGjEAzkwU/hp
+QLPWKqpoThDH2+0+A84LxIyc2SCVaAwOAgzD5VCN/tlhd6hCQCYs6XGStbvo5iFq
+h7UslFayPjbVE8kU2kR48hyvNJTSWOcViizB0rI6bq2JH5kVVgGG6d2R4EzDydgu
+XGZjwFCRBkrDozxcL4+XQSS7CRDUvVwQHz/17m3CFUuv9rgK4P4Og8f4KUHctGm+
+8yT0/jEeBqfFn7z4fT9xJU/6L3DTWgpzaDjt0LAa7/u17tPrGvtyKdk2eMEdI684
+Kc4KJBjPCDXzrp4esN4EcRZL2g+cvO+v1qsyyF79Nm+mX4YO2VPr6IJOA0Gvq6E=
+=Y1Hh
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/gcdemu/gcdemu-1.4.0.ebuild b/app-cdr/gcdemu/gcdemu-1.4.0.ebuild
deleted file mode 100644
index eec59213d33c..000000000000
--- a/app-cdr/gcdemu/gcdemu-1.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/gcdemu-1.4.0.ebuild,v 1.3 2012/05/03 07:51:49 jdhore Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-
-inherit gnome2 python
-
-DESCRIPTION="Gtk+ GUI for controlling the CDEmu daemon (cdemud)"
-HOMEPAGE="http://cdemu.org/"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="libnotify"
-
-RDEPEND=">=app-cdr/cdemud-1.4.0
-	>=dev-python/dbus-python-0.71
-	dev-python/gconf-python
-	>=dev-python/pygobject-2.6:2
-	>=dev-python/pygtk-2.6
-	gnome-base/gconf:2
-
-	libnotify? ( dev-python/notify-python )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.21
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOCS="AUTHORS ChangeLog README"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs 2 src/gcdemu
-	gnome2_src_prepare
-}
diff --git a/app-cdr/gcdemu/gcdemu-1.5.0.ebuild b/app-cdr/gcdemu/gcdemu-1.5.0.ebuild
index ee167995e77e..009e1cab3f87 100644
--- a/app-cdr/gcdemu/gcdemu-1.5.0.ebuild
+++ b/app-cdr/gcdemu/gcdemu-1.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/gcdemu-1.5.0.ebuild,v 1.4 2012/05/03 07:51:49 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/gcdemu-1.5.0.ebuild,v 1.5 2013/01/28 00:24:30 tetromino Exp $
 
 EAPI="4"
 
@@ -8,16 +8,16 @@ PYTHON_DEPEND="2:2.6"
 
 inherit gnome2 python
 
-DESCRIPTION="Gtk+ GUI for controlling the CDEmu daemon (cdemud)"
+DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
 HOMEPAGE="http://cdemu.org/"
 SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND=">=app-cdr/cdemud-1.5.0
+RDEPEND="~app-cdr/cdemu-daemon-${PV}
 	>=dev-libs/glib-2.28:2
 	dev-libs/gobject-introspection
 	dev-python/pygobject:3
diff --git a/app-cdr/gcdemu/gcdemu-2.0.0.ebuild b/app-cdr/gcdemu/gcdemu-2.0.0.ebuild
new file mode 100644
index 000000000000..143de9e051ee
--- /dev/null
+++ b/app-cdr/gcdemu/gcdemu-2.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/gcdemu-2.0.0.ebuild,v 1.1 2013/01/28 00:24:30 tetromino Exp $
+
+EAPI="5"
+
+CMAKE_MIN_VERSION="2.8.5"
+PYTHON_COMPAT=( python2_6 python2_7 )
+PLOCALES="de fr no pl sl zh_CN"
+
+# cmake-utils after gnome2, to make sure cmake-utils is used for building
+inherit gnome2 cmake-utils l10n python-single-r1
+
+DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
+HOMEPAGE="http://cdemu.org/"
+SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	app-cdr/cdemu-daemon:0/4
+	>=dev-libs/glib-2.28:2
+	dev-libs/gobject-introspection
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	sys-apps/dbus
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]"
+DEPEND="${COMMON_DEPEND}
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.21
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang src/gcdemu
+	# build system doesn't respect LINGUAS :/
+	rm_po() {
+		rm po/$1.po || die
+	}
+	l10n_for_each_disabled_locale_do rm_po
+}
+
+src_configure() {
+	DOCS="AUTHORS README"
+	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
+	cmake-utils_src_configure
+}