[gentoo-commits] proj/gnome:master commit in: app-portage/packagekit/

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     be605781ad0051ea2b740e2e52f6a6b89e60cbda
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 19 03:25:52 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 19 03:31:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=be605781

app-portage/packagekit: 0.6.15 → 0.6.16

Version bump with various bugfixes. Use EAPI 3 and .xz tarballs. Update
copyright year. Update dependencies (the browser plugin is gtk2-only).
Update python_mod_{optimize,cleanup} to be relative to
site-packages. Punt obsolete version 0.6.14.

---
 app-portage/packagekit/packagekit-0.6.15.ebuild    |    9 ++++-----
 ...ekit-0.6.14.ebuild => packagekit-0.6.16.ebuild} |   15 +++++----------
 app-portage/packagekit/packagekit-9999.ebuild      |   13 +++++++++----
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/app-portage/packagekit/packagekit-0.6.15.ebuild b/app-portage/packagekit/packagekit-0.6.15.ebuild
index 3c25db0..5962259 100644
--- a/app-portage/packagekit/packagekit-0.6.15.ebuild
+++ b/app-portage/packagekit/packagekit-0.6.15.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils multilib python nsplugins
 if [[ ${PV} = 9999 ]]; then
@@ -45,7 +45,6 @@ CDEPEND="
 		dev-libs/nspr
 		x11-libs/cairo
 		>=x11-libs/gtk+-2.14.0:2
-		>=x11-libs/gtk+-2.91.0:3
 		x11-libs/pango )
 	qt4? ( >=x11-libs/qt-core-4.4.0
 		>=x11-libs/qt-dbus-4.4.0
@@ -160,7 +159,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/${PN}
+	python_mod_optimize ${PN}
 }
 
 pkg_prerm() {
@@ -170,5 +169,5 @@ pkg_prerm() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/${PN}
+	python_mod_cleanup ${PN}
 }

diff --git a/app-portage/packagekit/packagekit-0.6.14.ebuild b/app-portage/packagekit/packagekit-0.6.16.ebuild
similarity index 90%
rename from app-portage/packagekit/packagekit-0.6.14.ebuild
rename to app-portage/packagekit/packagekit-0.6.16.ebuild
index cd1539c..1ee771f 100644
--- a/app-portage/packagekit/packagekit-0.6.14.ebuild
+++ b/app-portage/packagekit/packagekit-0.6.16.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils multilib python nsplugins
 if [[ ${PV} = 9999 ]]; then
@@ -21,7 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 	DOCS="AUTHORS MAINTAINERS NEWS README TODO"
 else
 	MY_P=${MY_PN}-${PV}
-	SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.gz"
+	SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
 	KEYWORDS="~amd64 ~ppc ~x86"
 	S="${WORKDIR}/${MY_P}"
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
@@ -45,7 +45,6 @@ CDEPEND="
 		dev-libs/nspr
 		x11-libs/cairo
 		>=x11-libs/gtk+-2.14.0:2
-		>=x11-libs/gtk+-2.91.0:3
 		x11-libs/pango )
 	qt4? ( >=x11-libs/qt-core-4.4.0
 		>=x11-libs/qt-dbus-4.4.0
@@ -104,10 +103,6 @@ src_prepare() {
 
 	# prevent pyc/pyo generation
 	ln -sfn $(type -P true) py-compile
-
-	# allow building with >=glib-2.28.7:2 (fixed upstream in 0.6.15)
-	sed -e 's:GLIB_CHECK_VERSION(2,28,7):GLIB_CHECK_VERSION(2,29,4):g' \
-		-i src/pk-main.c || die "sed src/pk-main.c failed"
 }
 
 src_configure() {
@@ -164,7 +159,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/${PN}
+	python_mod_optimize ${PN}
 }
 
 pkg_prerm() {
@@ -174,5 +169,5 @@ pkg_prerm() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/${PN}
+	python_mod_cleanup ${PN}
 }

diff --git a/app-portage/packagekit/packagekit-9999.ebuild b/app-portage/packagekit/packagekit-9999.ebuild
index b8bbbc7..1ee771f 100644
--- a/app-portage/packagekit/packagekit-9999.ebuild
+++ b/app-portage/packagekit/packagekit-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils multilib python nsplugins
 if [[ ${PV} = 9999 ]]; then
@@ -21,7 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 	DOCS="AUTHORS MAINTAINERS NEWS README TODO"
 else
 	MY_P=${MY_PN}-${PV}
-	SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.gz"
+	SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
 	KEYWORDS="~amd64 ~ppc ~x86"
 	S="${WORKDIR}/${MY_P}"
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
@@ -35,6 +35,7 @@ CDEPEND="
 	connman? ( net-misc/connman )
 	gtk? ( dev-libs/dbus-glib
 		media-libs/fontconfig
+		>=x11-libs/gtk+-2.14.0:2
 		>=x11-libs/gtk+-2.91.0:3
 		x11-libs/pango )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
@@ -89,6 +90,10 @@ RESTRICT="test"
 # documentation/website with --enable-doc-install
 # failing tests
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
 	if [[ ${PV} = 9999 ]]; then
 		gtkdocize || die
@@ -154,7 +159,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/${PN}
+	python_mod_optimize ${PN}
 }
 
 pkg_prerm() {
@@ -164,5 +169,5 @@ pkg_prerm() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/${PN}
+	python_mod_cleanup ${PN}
 }