Version bump for Gnome 3.6. Switch to EAPI=5 and python-r1.eclass.

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

4 files changed, 153 insertions, 111 deletions

diff --git a/gnome-extra/gnome-packagekit/ChangeLog b/gnome-extra/gnome-packagekit/ChangeLog
index 2e2aa3068657..f1e1b8fdb040 100644
--- a/gnome-extra/gnome-packagekit/ChangeLog
+++ b/gnome-extra/gnome-packagekit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-packagekit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/ChangeLog,v 1.8 2012/12/11 09:29:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/ChangeLog,v 1.9 2012/12/24 00:20:41 eva Exp $
+
+*gnome-packagekit-3.6.1-r1 (24 Dec 2012)
+
+  24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-packagekit-3.2.1.ebuild, +gnome-packagekit-3.6.1-r1.ebuild,
+  metadata.xml:
+  Version bump for Gnome 3.6. Switch to EAPI=5 and python-r1.eclass.
 
   11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
   gnome-packagekit-3.2.1.ebuild, gnome-packagekit-3.4.2.ebuild:
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.2.1.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.2.1.ebuild
deleted file mode 100644
index a76c066414dd..000000000000
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.2.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/gnome-packagekit-3.2.1.ebuild,v 1.5 2012/12/11 09:29:35 ssuominen Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2"
-
-inherit eutils gnome2 python virtualx
-
-DESCRIPTION="PackageKit client for the GNOME desktop"
-HOMEPAGE="http://www.packagekit.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc nls test udev"
-
-# gdk-pixbuf ised in gpk-animated-icon
-# pango used on gpk-common
-RDEPEND="
-	>=dev-libs/glib-2.25.9:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.91.0:3
-	>=x11-libs/libnotify-0.7.0
-	x11-libs/pango
-	>=dev-libs/dbus-glib-0.73
-
-	>=app-admin/packagekit-base-0.6.5[udev]
-	>=app-admin/packagekit-gtk-0.6.5
-	>=media-libs/libcanberra-0.10[gtk3]
-	>=sys-apps/dbus-1.1.2
-	>=sys-power/upower-0.9.0
-
-	media-libs/fontconfig
-	x11-libs/libX11
-
-	udev? ( virtual/udev[gudev] )"
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-utils
-	>=app-text/gnome-doc-utils-0.3.2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-# NOTES:
-# app-text/docbook-sgml-utils required for man pages
-# app-text/gnome-doc-utils and dev-libs/libxslt required for gnome help files
-# gtk-doc is generating a useless file, don't need it
-
-# UPSTREAM:
-# misuse of CPPFLAGS/CXXFLAGS ?
-# see if tests can forget about display (use eclass for that ?)
-# intltool and gettext only with +nls
-
-pkg_setup() {
-	DOCS="AUTHORS MAINTAINERS NEWS README TODO"
-	# localstatedir: /var for upstream /var/lib for gentoo
-	# scrollkeeper and schemas-install: managed by gnome2 eclass
-	# tests: not working (need DISPLAY)
-	# gtk-doc: not needed (builded file is useless)
-#		--enable-libtool-lock
-#		--disable-dependency-tracking
-#		--enable-option-checking
-	G2CONF="${G2CONF}
-		--localstatedir=/var
-		--enable-compile-warnings=yes
-		--enable-iso-c
-		--disable-scrollkeeper
-		--disable-schemas-compile
-		--disable-strict
-		$(use_enable nls)
-		$(use_enable test tests)
-		$(use_enable udev gudev)"
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# fix pyc/pyo generation
-	>py-compile
-
-	# disable tests with graphical dialogs and that require packagekitd to be
-	# run with the dummy backend
-	epatch "${FILESDIR}/${PN}-3.1.90-tests.patch"
-}
-
-src_test() {
-	unset DISPLAY
-	Xemake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_need_rebuild
-	python_mod_optimize packagekit
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup packagekit
-}
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.6.1-r1.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..0f45dfce2065
--- /dev/null
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.6.1-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/gnome-packagekit-3.6.1-r1.ebuild,v 1.1 2012/12/24 00:20:41 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_{5,6,7} python3_{1,2} )
+
+inherit eutils gnome2 python-r1 virtualx
+
+DESCRIPTION="PackageKit client for the GNOME desktop"
+HOMEPAGE="http://www.packagekit.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls systemd test udev"
+
+# FIXME: add PYTHON_USEDEPS on packagekit-base when available
+# gdk-pixbuf ised in gpk-animated-icon
+# pango used on gpk-common
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.91.0:3
+	>=x11-libs/libnotify-0.7.0:=
+	x11-libs/pango
+	>=dev-libs/dbus-glib-0.73
+
+	>=app-admin/packagekit-base-0.7.2[udev]
+	>=app-admin/packagekit-gtk-0.7.2
+	>=media-libs/libcanberra-0.10[gtk3]
+	>=sys-apps/dbus-1.1.2
+	>=sys-power/upower-0.9.0
+
+	media-libs/fontconfig
+	x11-libs/libX11
+
+	systemd? ( >=sys-apps/systemd-42 )
+	!systemd? ( sys-auth/consolekit )
+	udev? ( >=virtual/udev-171[gudev] )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-sgml-utils
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	dev-libs/libxslt
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# NOTES:
+# app-text/docbook-sgml-utils required for man pages
+# app-text/gnome-doc-utils and dev-libs/libxslt required for gnome help files
+# gtk-doc is generating a useless file, don't need it
+
+# UPSTREAM:
+# misuse of CPPFLAGS/CXXFLAGS ?
+# see if tests can forget about display (use eclass for that ?)
+# intltool and gettext only with +nls
+
+src_prepare() {
+	# Regenerate marshalers for <glib-2.31 compat
+	rm -v src/gpk-marshal.{c,h} || die
+
+	# * disable tests with graphical dialogs and that require packagekitd
+	#   to be run with the dummy backend
+	# * disable tests that fails every time packagekit developers make a
+	#   tiny change to headers
+	sed -e '/gpk_enum_test (test)/d' \
+		-e '/gpk_error_test (test)/d' \
+		-e '/gpk_modal_dialog_test (test)/d' \
+		-e '/gpk_task_test (test)/d' \
+		-i src/gpk-self-test.c || die
+
+	# Leave python build to us
+	sed '/python.*\\/d' -i Makefile.am Makefile.in || die
+
+	# Disable stupid flags
+	# FIXME: touching configure.ac triggers maintainer-mode
+	sed -e '/CPPFLAGS="$CPPFLAGS -g"/d' -i configure || die
+
+	mkdir -p "${S}_default" || die
+	prepare_python() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+	python_foreach_impl prepare_python
+	gnome2_src_prepare
+}
+
+src_configure() {
+	G2CONF="${G2CONF}
+		--localstatedir=/var
+		--enable-compile-warnings=yes
+		--enable-iso-c
+		--disable-strict
+		$(use_enable nls)
+		$(use_enable systemd)
+		$(use_enable test tests)
+		$(use_enable udev gudev)
+		ITSTOOL=$(type -P true)"
+
+	cd "${S}_default" || die
+	ECONF_SOURCE="${S}" gnome2_src_configure
+	configure_python() {
+		mkdir -p "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+		ECONF_SOURCE="${S}" gnome2_src_configure
+	}
+	python_foreach_impl configure_python
+}
+
+src_compile() {
+	cd "${S}_default" || die
+	gnome2_src_compile
+	build_python() {
+		cd "${BUILD_DIR}"/python || die
+		default
+	}
+	python_foreach_impl build_python
+}
+
+src_test() {
+	unset DISPLAY
+	cd "${S}_default" || die
+	Xemake check
+}
+
+src_install() {
+	cd "${S}_default" || die
+	gnome2_src_install
+
+	install_python() {
+		cd "${BUILD_DIR}"/python || die
+		emake install DESTDIR="${D}" VPATH="${S}/python/packagekit:${BUILD_DIR}" || die
+	}
+	python_foreach_impl install_python
+
+	cd "${S}" || die
+	dodoc AUTHORS MAINTAINERS NEWS README TODO
+}
diff --git a/gnome-extra/gnome-packagekit/metadata.xml b/gnome-extra/gnome-packagekit/metadata.xml
index 71d2b76596d5..5978c4034444 100644
--- a/gnome-extra/gnome-packagekit/metadata.xml
+++ b/gnome-extra/gnome-packagekit/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<use>
-	<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
+  <herd>gnome</herd>
+  <use>
+    <flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
 		<pkg>sys-auth/consolekit</pkg> for rebooting</flag>
-</use>
+  </use>
 </pkgmetadata>