Version bump, drop old

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 11 insertions, 86 deletions

diff --git a/dev-util/gdbus-codegen/ChangeLog b/dev-util/gdbus-codegen/ChangeLog
index 55a1445c6e54..a54657981efb 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/ChangeLog,v 1.109 2015/02/11 04:18:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/ChangeLog,v 1.110 2015/02/26 19:24:39 pacho Exp $
+
+*gdbus-codegen-2.42.2 (26 Feb 2015)
+
+  26 Feb 2015; Pacho Ramos <pacho@gentoo.org> +gdbus-codegen-2.42.2.ebuild,
+  -files/gdbus-codegen-2.36.0-sitedir.patch, -gdbus-codegen-2.38.2.ebuild,
+  -gdbus-codegen-2.40.0.ebuild:
+  Version bump, drop old
 
   11 Feb 2015; Mike Frysinger <vapier@gentoo.org> gdbus-codegen-2.40.0.ebuild,
   gdbus-codegen-2.40.2.ebuild:
diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.36.0-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.36.0-sitedir.patch
deleted file mode 100755
index 795d8395032e..000000000000
--- a/dev-util/gdbus-codegen/files/gdbus-codegen-2.36.0-sitedir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 626f79dcfb1f26997f2807829c6fa19f6c3303f5 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Sun, 20 Jan 2013 20:25:13 +0330
-Subject: [PATCH] glib-2.35.4-external-gdbus-codegen
-
----
- gio/gdbus-2.0/codegen/gdbus-codegen.in | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-index 253d151..2295481 100644
---- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
-+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-@@ -29,13 +29,7 @@ srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None)
- 
- if srcdir is not None:
-     path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
--elif os.name == 'nt':
--    # Makes gdbus-codegen 'relocatable' at runtime on Windows.
--    path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gdbus-2.0')
- else:
--    path = os.path.join('@datadir@', 'glib-2.0')
--
--sys.path.insert(0, os.path.abspath(path))
--from codegen import codegen_main
-+   from gdbus_codegen import codegen_main
- 
- sys.exit(codegen_main.codegen_main())
--- 
-1.8.1
-
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.38.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.38.2.ebuild
deleted file mode 100644
index cabadceff2ef..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.38.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 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.38.2.ebuild,v 1.13 2014/04/21 10:29:02 ago Exp $
-
-EAPI="5"
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.36.0-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
-		-i config.py || die "sed config.py failed"
-
-	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
-	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() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.40.0.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.42.2.ebuild
index a70e7aa37c47..c89695e25de9 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.40.0.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.42.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 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.40.0.ebuild,v 1.12 2015/02/11 04:18:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.42.2.ebuild,v 1.1 2015/02/26 19:24:39 pacho Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils gnome.org distutils-r1
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
@@ -30,8 +30,6 @@ python_prepare_all() {
 		"${FILESDIR}/${PN}-2.40.0-sitedir.patch"
 	)
 	distutils-r1_python_prepare_all
-	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
-		-i config.py || die "sed config.py failed"
 
 	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
 	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"