From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qj16X-0003E7-82 for garchives@archives.gentoo.org; Tue, 19 Jul 2011 03:36:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87E1B21C221; Tue, 19 Jul 2011 03:36:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4160321C221 for ; Tue, 19 Jul 2011 03:36:04 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8979A1BC015 for ; Tue, 19 Jul 2011 03:36:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A99748003D for ; Tue, 19 Jul 2011 03:36:02 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: app-portage/packagekit/ X-VCS-Repository: proj/gnome X-VCS-Files: app-portage/packagekit/packagekit-0.6.14.ebuild app-portage/packagekit/packagekit-0.6.15.ebuild app-portage/packagekit/packagekit-0.6.16.ebuild app-portage/packagekit/packagekit-9999.ebuild X-VCS-Directories: app-portage/packagekit/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: be605781ad0051ea2b740e2e52f6a6b89e60cbda Date: Tue, 19 Jul 2011 03:36:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c96a3005e073253e77d1f0cc4bbe3d4c commit: be605781ad0051ea2b740e2e52f6a6b89e60cbda Author: Alexandre Rostovtsev gmail com> AuthorDate: Tue Jul 19 03:25:52 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Tue Jul 19 03:31:35 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dbe605781 app-portage/packagekit: 0.6.15 =E2=86=92 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 =3D> 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-portag= e/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: $ =20 -EAPI=3D"2" +EAPI=3D"3" =20 inherit eutils multilib python nsplugins if [[ ${PV} =3D 9999 ]]; then @@ -45,7 +45,6 @@ CDEPEND=3D" dev-libs/nspr x11-libs/cairo >=3Dx11-libs/gtk+-2.14.0:2 - >=3Dx11-libs/gtk+-2.91.0:3 x11-libs/pango ) qt4? ( >=3Dx11-libs/qt-core-4.4.0 >=3Dx11-libs/qt-dbus-4.4.0 @@ -160,7 +159,7 @@ src_install() { } =20 pkg_postinst() { - python_mod_optimize $(python_get_sitedir)/${PN} + python_mod_optimize ${PN} } =20 pkg_prerm() { @@ -170,5 +169,5 @@ pkg_prerm() { } =20 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-portag= e/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: $ =20 -EAPI=3D"2" +EAPI=3D"3" =20 inherit eutils multilib python nsplugins if [[ ${PV} =3D 9999 ]]; then @@ -21,7 +21,7 @@ if [[ ${PV} =3D 9999 ]]; then DOCS=3D"AUTHORS MAINTAINERS NEWS README TODO" else MY_P=3D${MY_PN}-${PV} - SRC_URI=3D"http://www.packagekit.org/releases/${MY_P}.tar.gz" + SRC_URI=3D"http://www.packagekit.org/releases/${MY_P}.tar.xz" KEYWORDS=3D"~amd64 ~ppc ~x86" S=3D"${WORKDIR}/${MY_P}" DOCS=3D"AUTHORS ChangeLog MAINTAINERS NEWS README TODO" @@ -45,7 +45,6 @@ CDEPEND=3D" dev-libs/nspr x11-libs/cairo >=3Dx11-libs/gtk+-2.14.0:2 - >=3Dx11-libs/gtk+-2.91.0:3 x11-libs/pango ) qt4? ( >=3Dx11-libs/qt-core-4.4.0 >=3Dx11-libs/qt-dbus-4.4.0 @@ -104,10 +103,6 @@ src_prepare() { =20 # prevent pyc/pyo generation ln -sfn $(type -P true) py-compile - - # allow building with >=3Dglib-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" } =20 src_configure() { @@ -164,7 +159,7 @@ src_install() { } =20 pkg_postinst() { - python_mod_optimize $(python_get_sitedir)/${PN} + python_mod_optimize ${PN} } =20 pkg_prerm() { @@ -174,5 +169,5 @@ pkg_prerm() { } =20 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: $ =20 -EAPI=3D"2" +EAPI=3D"3" =20 inherit eutils multilib python nsplugins if [[ ${PV} =3D 9999 ]]; then @@ -21,7 +21,7 @@ if [[ ${PV} =3D 9999 ]]; then DOCS=3D"AUTHORS MAINTAINERS NEWS README TODO" else MY_P=3D${MY_PN}-${PV} - SRC_URI=3D"http://www.packagekit.org/releases/${MY_P}.tar.gz" + SRC_URI=3D"http://www.packagekit.org/releases/${MY_P}.tar.xz" KEYWORDS=3D"~amd64 ~ppc ~x86" S=3D"${WORKDIR}/${MY_P}" DOCS=3D"AUTHORS ChangeLog MAINTAINERS NEWS README TODO" @@ -35,6 +35,7 @@ CDEPEND=3D" connman? ( net-misc/connman ) gtk? ( dev-libs/dbus-glib media-libs/fontconfig + >=3Dx11-libs/gtk+-2.14.0:2 >=3Dx11-libs/gtk+-2.91.0:3 x11-libs/pango ) introspection? ( >=3Ddev-libs/gobject-introspection-0.9.8 ) @@ -89,6 +90,10 @@ RESTRICT=3D"test" # documentation/website with --enable-doc-install # failing tests =20 +pkg_setup() { + python_set_active_version 2 +} + src_prepare() { if [[ ${PV} =3D 9999 ]]; then gtkdocize || die @@ -154,7 +159,7 @@ src_install() { } =20 pkg_postinst() { - python_mod_optimize $(python_get_sitedir)/${PN} + python_mod_optimize ${PN} } =20 pkg_prerm() { @@ -164,5 +169,5 @@ pkg_prerm() { } =20 pkg_postrm() { - python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/${PN} + python_mod_cleanup ${PN} }