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

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

4 files changed, 69 insertions, 50 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/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
+}