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 1QWNFN-0003hR-FA for garchives@archives.gentoo.org; Tue, 14 Jun 2011 06:37:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8550C1C013; Tue, 14 Jun 2011 06:36:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 43ADB1C013 for ; Tue, 14 Jun 2011 06:36:47 +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 721F41B4020 for ; Tue, 14 Jun 2011 06:36:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 98F4F8003C for ; Tue, 14 Jun 2011 06:36:45 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <252a554bb4f95f338c25e26495506e36799eb41b.nirbheek@gentoo> 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.13.ebuild app-portage/packagekit/packagekit-0.6.14.ebuild app-portage/packagekit/packagekit-0.6.15.ebuild app-portage/packagekit/packagekit-9999.ebuild X-VCS-Directories: app-portage/packagekit/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 252a554bb4f95f338c25e26495506e36799eb41b Date: Tue, 14 Jun 2011 06:36:45 +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: 2f865f2067de9fbd1023c4cb93316745 commit: 252a554bb4f95f338c25e26495506e36799eb41b Author: Alexandre Rostovtsev gmail com> AuthorDate: Sat Jun 11 17:29:49 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Tue Jun 14 05:59:00 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D252a554b app-portage/packagekit: 0.6.14 =E2=86=92 0.6.15 Version bump. Punt 0.6.13. Add a sed to 0.6.14 so that it builds with >=3Dglib-2.28.7 (upstream commit f8771f7ab15f297ad38ce8ee03b0566ff76dafbc= ). RESTRICT=3Dtests for all versions since tests fail for all of them. Add >=3Dsys-fs/udev-171[gudev] as an alternative dependency to >=3Dsys-fs/udev-145[extras] (bug #348472). Signed-off-by: Nirbheek Chauhan gentoo.org> --- app-portage/packagekit/packagekit-0.6.14.ebuild | 12 ++++++- ...ekit-0.6.13.ebuild =3D> packagekit-0.6.15.ebuild} | 30 ++++++++++++= +------ app-portage/packagekit/packagekit-9999.ebuild | 8 ++++- 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/app-portage/packagekit/packagekit-0.6.14.ebuild b/app-portag= e/packagekit/packagekit-0.6.14.ebuild index 8047d99..dfd3fa0 100644 --- a/app-portage/packagekit/packagekit-0.6.14.ebuild +++ b/app-portage/packagekit/packagekit-0.6.14.ebuild @@ -18,7 +18,6 @@ if [[ ${PV} =3D 9999 ]]; then EGIT_REPO_URI=3D"git://anongit.freedesktop.org/git/${PN}/${MY_PN}" KEYWORDS=3D"" DEPEND=3D">=3Ddev-util/gtk-doc-1.9" - RESTRICT=3D"test" # tests are failing atm DOCS=3D"AUTHORS MAINTAINERS NEWS README TODO" else MY_P=3D${MY_PN}-${PV} @@ -51,7 +50,8 @@ CDEPEND=3D" qt4? ( >=3Dx11-libs/qt-core-4.4.0 >=3Dx11-libs/qt-dbus-4.4.0 >=3Dx11-libs/qt-sql-4.4.0 ) - udev? ( >=3Dsys-fs/udev-145[extras] ) + udev? ( || ( >=3Dsys-fs/udev-171[gudev] + >=3Dsys-fs/udev-145[extras] ) ) dev-db/sqlite:3 >=3Ddev-libs/dbus-glib-0.74 >=3Ddev-libs/glib-2.22:2 @@ -72,6 +72,10 @@ DEPEND=3D"${CDEPEND} dev-util/pkgconfig sys-devel/gettext" =20 +# FIXME: tests are failing +# PackageKit:ERROR:pk-self-test.c:949:pk_test_control_get_properties_cb:= assertion failed (text =3D=3D "application/x-rpm;application/x-deb"): ("= " =3D=3D "application/x-rpm;application/x-deb") +RESTRICT=3D"test" + # NOTES: # doc is in the tarball and always installed # using >=3Ddbus-1.3.0 instead of >=3Ddbus-1.1.1 because of a bug fixed = in 1.3.0 @@ -98,6 +102,10 @@ 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() { diff --git a/app-portage/packagekit/packagekit-0.6.13.ebuild b/app-portag= e/packagekit/packagekit-0.6.15.ebuild similarity index 88% rename from app-portage/packagekit/packagekit-0.6.13.ebuild rename to app-portage/packagekit/packagekit-0.6.15.ebuild index 8abafc1..2fc09af 100644 --- a/app-portage/packagekit/packagekit-0.6.13.ebuild +++ b/app-portage/packagekit/packagekit-0.6.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 @@ -18,7 +18,6 @@ if [[ ${PV} =3D 9999 ]]; then EGIT_REPO_URI=3D"git://anongit.freedesktop.org/git/${PN}/${MY_PN}" KEYWORDS=3D"" DEPEND=3D">=3Ddev-util/gtk-doc-1.9" - RESTRICT=3D"test" # tests are failing atm DOCS=3D"AUTHORS MAINTAINERS NEWS README TODO" else MY_P=3D${MY_PN}-${PV} @@ -30,38 +29,42 @@ fi =20 LICENSE=3D"GPL-2" SLOT=3D"0" -IUSE=3D"connman cron gtk +introspection networkmanager nls nsplugin pm-u= tils qt4 -test udev" +IUSE=3D"connman cron gtk +introspection networkmanager nls nsplugin pm-u= tils qt4 test udev" =20 CDEPEND=3D" connman? ( net-misc/connman ) - introspection? ( >=3Ddev-libs/gobject-introspection-0.9.8 ) 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 ) networkmanager? ( >=3Dnet-misc/networkmanager-0.6.4 ) nsplugin? ( dev-libs/dbus-glib dev-libs/glib:2 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 >=3Dx11-libs/qt-sql-4.4.0 ) - udev? ( >=3Dsys-fs/udev-145[extras] ) + udev? ( || ( >=3Dsys-fs/udev-171[gudev] + >=3Dsys-fs/udev-145[extras] ) ) dev-db/sqlite:3 >=3Ddev-libs/dbus-glib-0.74 >=3Ddev-libs/glib-2.22:2 >=3Dsys-apps/dbus-1.1.0 - >=3Dsys-auth/polkit-0.97" + >=3Dsys-auth/polkit-0.97 +" RDEPEND=3D"${CDEPEND} pm-utils? ( sys-power/pm-utils ) >=3Dapp-portage/layman-1.2.3 >=3Dsys-apps/portage-2.2_rc39 - sys-auth/consolekit" -DEPEND=3D"${CDEPEND} ${DEPEND} + sys-auth/consolekit +" +DEPEND=3D"${CDEPEND} nsplugin? ( >=3Dnet-libs/xulrunner-1.9.1 ) test? ( qt4? ( dev-util/cppunit >=3Dx11-libs/qt-gui-4.4.0 ) ) dev-libs/libxslt @@ -69,6 +72,10 @@ DEPEND=3D"${CDEPEND} ${DEPEND} dev-util/pkgconfig sys-devel/gettext" =20 +# FIXME: tests are failing +# PackageKit:ERROR:pk-self-test.c:949:pk_test_control_get_properties_cb:= assertion failed (text =3D=3D "application/x-rpm;application/x-deb"): ("= " =3D=3D "application/x-rpm;application/x-deb") +RESTRICT=3D"test" + # NOTES: # doc is in the tarball and always installed # using >=3Ddbus-1.3.0 instead of >=3Ddbus-1.1.1 because of a bug fixed = in 1.3.0 @@ -82,6 +89,10 @@ DEPEND=3D"${CDEPEND} ${DEPEND} # 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 @@ -105,7 +116,6 @@ src_configure() { ${myconf} \ --localstatedir=3D/var \ --disable-dependency-tracking \ - --enable-option-checking \ --enable-libtool-lock \ --disable-strict \ --disable-local \ diff --git a/app-portage/packagekit/packagekit-9999.ebuild b/app-portage/= packagekit/packagekit-9999.ebuild index 7535da1..21a59dc 100644 --- a/app-portage/packagekit/packagekit-9999.ebuild +++ b/app-portage/packagekit/packagekit-9999.ebuild @@ -18,7 +18,6 @@ if [[ ${PV} =3D 9999 ]]; then EGIT_REPO_URI=3D"git://anongit.freedesktop.org/git/${PN}/${MY_PN}" KEYWORDS=3D"" DEPEND=3D">=3Ddev-util/gtk-doc-1.9" - RESTRICT=3D"test" # tests are failing atm DOCS=3D"AUTHORS MAINTAINERS NEWS README TODO" else MY_P=3D${MY_PN}-${PV} @@ -49,7 +48,8 @@ CDEPEND=3D" qt4? ( >=3Dx11-libs/qt-core-4.4.0 >=3Dx11-libs/qt-dbus-4.4.0 >=3Dx11-libs/qt-sql-4.4.0 ) - udev? ( >=3Dsys-fs/udev-145[extras] ) + udev? ( || ( >=3Dsys-fs/udev-171[gudev] + >=3Dsys-fs/udev-145[extras] ) ) dev-db/sqlite:3 >=3Ddev-libs/dbus-glib-0.74 >=3Ddev-libs/glib-2.22:2 @@ -70,6 +70,10 @@ DEPEND=3D"${CDEPEND} dev-util/pkgconfig sys-devel/gettext" =20 +# FIXME: tests are failing +# PackageKit:ERROR:pk-self-test.c:949:pk_test_control_get_properties_cb:= assertion failed (text =3D=3D "application/x-rpm;application/x-deb"): ("= " =3D=3D "application/x-rpm;application/x-deb") +RESTRICT=3D"test" + # NOTES: # doc is in the tarball and always installed # using >=3Ddbus-1.3.0 instead of >=3Ddbus-1.1.1 because of a bug fixed = in 1.3.0