Version bump, drop old. Make license more precise.

(Portage version: 2.2.0_alpha132/cvs/Linux x86_64)

5 files changed, 30 insertions, 114 deletions

diff --git a/dev-util/gdbus-codegen/ChangeLog b/dev-util/gdbus-codegen/ChangeLog
index 286e4dd75000..23fc87f45a1a 100644
--- a/dev-util/gdbus-codegen/ChangeLog
+++ b/dev-util/gdbus-codegen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/gdbus-codegen
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/ChangeLog,v 1.27 2012/07/16 04:26:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/ChangeLog,v 1.28 2012/09/25 11:42:03 tetromino Exp $
+
+*gdbus-codegen-2.34.0 (25 Sep 2012)
+
+  25 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gdbus-codegen-2.30.2.ebuild, -gdbus-codegen-2.32.3.ebuild,
+  +gdbus-codegen-2.34.0.ebuild:
+  Version bump, drop old. Make license more precise.
 
 *gdbus-codegen-2.32.4 (16 Jul 2012)
 
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.30.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.30.2.ebuild
deleted file mode 100644
index 9c4547b05298..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.30.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.30.2.ebuild,v 1.11 2012/03/25 15:12:45 armin76 Exp $
-
-EAPI="4"
-GNOME_ORG_MODULE="glib"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
-
-inherit gnome.org multilib python
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs 2 gdbus-codegen.in
-	sed -e "s:@libdir@:${EPREFIX}/usr/$(get_libdir):" \
-		-i gdbus-codegen.in || die "sed gdbus-codegen.in failed"
-	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
-		-i config.py || die "sed config.py failed"
-}
-
-src_test() {
-	elog "Skipping tests. This package is tested by dev-libs/glib"
-	elog "when merged with FEATURES=test"
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)/gdbus-2.0/codegen"
-
-	# Keep in sync with Makefile.am!
-	doins __init__.py \
-		codegen.py \
-		codegen_main.py \
-		codegen_docbook.py \
-		config.py \
-		dbustypes.py \
-		parser.py \
-		utils.py
-
-	newbin gdbus-codegen.in gdbus-codegen
-
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-pkg_postinst() {
-	python_need_rebuild
-	python_mod_optimize /usr/$(get_libdir)/gdbus-2.0/codegen
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/gdbus-2.0/codegen
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.30.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.30.3.ebuild
index 973605e70843..c46e860c9cdf 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.30.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.30.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.30.3.ebuild,v 1.8 2012/07/15 17:04:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.30.3.ebuild,v 1.9 2012/09/25 11:42:03 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="glib"
@@ -12,7 +12,7 @@ inherit gnome.org multilib python
 DESCRIPTION="GDBus code and documentation generator"
 HOMEPAGE="http://www.gtk.org/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.32.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.32.4.ebuild
index d321687971d4..92d6f63d7f55 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.32.4.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.32.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.32.4.ebuild,v 1.1 2012/07/16 04:26:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.32.4.ebuild,v 1.2 2012/09/25 11:42:03 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="glib"
@@ -11,7 +11,7 @@ inherit eutils gnome.org python-distutils-ng
 DESCRIPTION="GDBus code and documentation generator"
 HOMEPAGE="http://www.gtk.org/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.32.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.34.0.ebuild
index a88792548abb..5fe7bb8c205e 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.32.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.34.0.ebuild
@@ -1,40 +1,42 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.32.3.ebuild,v 1.1 2012/05/15 09:02:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.34.0.ebuild,v 1.1 2012/09/25 11:42:03 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="glib"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
+PYTHON_COMPAT="python2_5 python2_6 python2_7 python3_1 python3_2"
 
-inherit gnome.org multilib python
+inherit eutils gnome.org python-distutils-ng
 
 DESCRIPTION="GDBus code and documentation generator"
 HOMEPAGE="http://www.gtk.org/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
+RDEPEND="python_targets_python2_5? ( dev-lang/python:2.5[xml] )
+	python_targets_python2_6? ( dev-lang/python:2.6[xml] )
+	python_targets_python2_7? ( dev-lang/python:2.7[xml] )
+	python_targets_python3_1? ( dev-lang/python:3.1[xml] )
+	python_targets_python3_2? ( dev-lang/python:3.2[xml] )
+"
 DEPEND=""
-RDEPEND="${DEPEND}"
+
 # To prevent circular dependencies with glib[test]
 PDEPEND=">=dev-libs/glib-${PV}:2"
 
 S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs 2 gdbus-codegen.in
-	sed -e "s:@libdir@:${EPREFIX}/usr/$(get_libdir):" \
-		-i gdbus-codegen.in || die "sed gdbus-codegen.in failed"
+python_prepare_all() {
+	epatch "${FILESDIR}/${PN}-2.32.4-sitedir.patch"
 	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
 		-i config.py || die "sed config.py failed"
+
+	mv gdbus-codegen.in gdbus-codegen || die "mv failed"
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
 }
 
 src_test() {
@@ -42,29 +44,6 @@ src_test() {
 	elog "when merged with FEATURES=test"
 }
 
-src_install() {
-	insinto "/usr/$(get_libdir)/gdbus-2.0/codegen"
-
-	# Keep in sync with gio/gdbus-2.0/codegen/Makefile.am!
-	doins __init__.py \
-		codegen.py \
-		codegen_main.py \
-		codegen_docbook.py \
-		config.py \
-		dbustypes.py \
-		parser.py \
-		utils.py
-
-	newbin gdbus-codegen.in gdbus-codegen
-
+python_install_all() {
 	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
 }
-
-pkg_postinst() {
-	python_need_rebuild
-	python_mod_optimize /usr/$(get_libdir)/gdbus-2.0/codegen
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/gdbus-2.0/codegen
-}