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 1QJ7ui-0000hF-Ke for garchives@archives.gentoo.org; Sun, 08 May 2011 17:37:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88D091C028; Sun, 8 May 2011 17:36:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 47EEF1C028 for ; Sun, 8 May 2011 17:36:52 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 86A1A1B4014 for ; Sun, 8 May 2011 17:36:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BA75D45B2A for ; Sun, 8 May 2011 17:36:50 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" 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.8.ebuild app-portage/packagekit/packagekit-9999.ebuild X-VCS-Directories: app-portage/packagekit/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: dfeaf2888e0b5dd40a220dd8c49f54c88ab0b287 Date: Sun, 8 May 2011 17:36:50 +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: 8842c95c3d2649083280cbba3a8dc349 commit: dfeaf2888e0b5dd40a220dd8c49f54c88ab0b287 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun May 8 15:47:40 2011 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun May 8 15:47:40 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Ddfeaf288 app-portage/packagekit: 0.6.13 =E2=86=92 0.6.13 --- ...gekit-0.6.8.ebuild =3D> packagekit-0.6.14.ebuild} | 98 +++++++++---= -------- app-portage/packagekit/packagekit-9999.ebuild | 14 ++-- 2 files changed, 51 insertions(+), 61 deletions(-) diff --git a/app-portage/packagekit/packagekit-0.6.8.ebuild b/app-portage= /packagekit/packagekit-0.6.14.ebuild similarity index 61% rename from app-portage/packagekit/packagekit-0.6.8.ebuild rename to app-portage/packagekit/packagekit-0.6.14.ebuild index 8e8cadf..8047d99 100644 --- a/app-portage/packagekit/packagekit-0.6.8.ebuild +++ b/app-portage/packagekit/packagekit-0.6.14.ebuild @@ -5,33 +5,49 @@ EAPI=3D"2" =20 inherit eutils multilib python nsplugins +if [[ ${PV} =3D 9999 ]]; then + inherit autotools git +fi =20 MY_PN=3D"PackageKit" -MY_P=3D${MY_PN}-${PV} =20 DESCRIPTION=3D"Manage packages in a secure way using a cross-distro and = cross-architecture API" HOMEPAGE=3D"http://www.packagekit.org/" -SRC_URI=3D"http://www.packagekit.org/releases/${MY_P}.tar.gz" + +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} + SRC_URI=3D"http://www.packagekit.org/releases/${MY_P}.tar.gz" + KEYWORDS=3D"~amd64 ~ppc ~x86" + S=3D"${WORKDIR}/${MY_P}" + DOCS=3D"AUTHORS ChangeLog MAINTAINERS NEWS README TODO" +fi =20 LICENSE=3D"GPL-2" SLOT=3D"0" -KEYWORDS=3D"~amd64 ~ppc ~x86" -IUSE=3D"connman +consolekit cron gtk networkmanager nls nsplugin pm-util= s +policykit qt4 static-libs test udev" +IUSE=3D"connman cron gtk +introspection networkmanager nls nsplugin pm-u= tils qt4 test udev" =20 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 ) 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 ) - policykit? ( >=3Dsys-auth/polkit-0.97 ) qt4? ( >=3Dx11-libs/qt-core-4.4.0 >=3Dx11-libs/qt-dbus-4.4.0 >=3Dx11-libs/qt-sql-4.4.0 ) @@ -39,12 +55,15 @@ CDEPEND=3D" dev-db/sqlite:3 >=3Ddev-libs/dbus-glib-0.74 >=3Ddev-libs/glib-2.22:2 - >=3Dsys-apps/dbus-1.1.0" + >=3Dsys-apps/dbus-1.1.0 + >=3Dsys-auth/polkit-0.97 +" RDEPEND=3D"${CDEPEND} - consolekit? ( sys-auth/consolekit ) pm-utils? ( sys-power/pm-utils ) >=3Dapp-portage/layman-1.2.3 - >=3Dsys-apps/portage-2.2_rc39" + >=3Dsys-apps/portage-2.2_rc39 + 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 ) ) @@ -53,15 +72,8 @@ DEPEND=3D"${CDEPEND} dev-util/pkgconfig sys-devel/gettext" =20 -S=3D"${WORKDIR}/${MY_P}" -RESTRICT=3D"test" # tests are failing atm - # NOTES: -# polkit is in gnome overlay, otherwise, should use policykit -# do not use a specific user, useless and not more secure according to u= pstream # doc is in the tarball and always installed -# mono doesn't install anything (RDEPEND dev-dotnet/gtk-sharp-gapi:2 -# (R)DEPEND dev-dotnet/glib-sharp:2 dev-lang/mono), upstream bug 23247 # using >=3Ddbus-1.3.0 instead of >=3Ddbus-1.1.1 because of a bug fixed = in 1.3.0 =20 # TODO: @@ -73,28 +85,24 @@ RESTRICT=3D"test" # tests are failing atm # documentation/website with --enable-doc-install # failing tests =20 +pkg_setup() { + python_set_active_version 2 +} + src_prepare() { - # fix sandbox issue with gapi2-* tools - # TODO: commented because mono is broken but: - # TODO: should be in pkg_setup ? could be done better ? - #if use mono; then - # addwrite "/root/.wapi" - #fi + if [[ ${PV} =3D 9999 ]]; then + gtkdocize || die + intltoolize --force || die + eautoreconf + fi =20 # prevent pyc/pyo generation - rm py-compile || die "rm py-compile failed" - ln -s $(type -P true) py-compile + ln -sfn $(type -P true) py-compile } =20 src_configure() { local myconf=3D"" =20 - if use policykit; then - myconf=3D"${myconf} --with-security-framework=3Dpolkit" - else - myconf=3D"${myconf} --with-security-framework=3Ddummy" - fi - # localstatedir: for gentoo it's /var/lib but for $PN it's /var # dep-tracking,option-check,libtool-lock,strict,local: obvious reasons # gtk-doc: doc already built @@ -104,7 +112,6 @@ src_configure() { ${myconf} \ --localstatedir=3D/var \ --disable-dependency-tracking \ - --enable-option-checking \ --enable-libtool-lock \ --disable-strict \ --disable-local \ @@ -113,21 +120,21 @@ src_configure() { --disable-debuginfo-install \ --disable-gstreamer-plugin \ --disable-service-packs \ - --disable-managed \ + --disable-static \ --enable-man-pages \ --disable-dummy \ --enable-portage \ --with-default-backend=3Dportage \ - --disable-introspection \ + --with-security-framework=3Dpolkit \ $(use_enable connman) \ $(use_enable cron) \ $(use_enable gtk gtk-module) \ + $(use_enable introspection) \ $(use_enable networkmanager) \ $(use_enable nls) \ $(use_enable nsplugin browser-plugin) \ $(use_enable pm-utils) \ $(use_enable qt4 qt) \ - $(use_enable static-libs static) \ $(use_enable test tests) \ $(use_enable udev device-rebind) } @@ -135,36 +142,19 @@ src_configure() { src_install() { emake DESTDIR=3D"${D}" install || die "emake install failed" =20 - dodoc AUTHORS ChangeLog MAINTAINERS NEWS README TODO || die "dodoc fail= ed" + dodoc ${DOCS} || die "dodoc failed" =20 if use nsplugin; then src_mv_plugins /usr/$(get_libdir)/mozilla/plugins fi =20 - if ! use static-libs; then - find "${D}" -name *.la | xargs rm || die "removing .la files failed" - fi + ebegin "Removing .la files" + find "${D}" -name '*.la' -exec rm -f '{}' + || die + eend } =20 pkg_postinst() { python_mod_optimize $(python_get_sitedir)/${PN} - - if ! use policykit; then - ewarn "You are not using policykit, the daemon can't be considered as = secure." - ewarn "All users will be able to do anything through ${MY_PN}." - ewarn "Please, consider rebuilding ${MY_PN} with policykit USE flag." - ewarn "THIS IS A SECURITY ISSUE." - ewarn "" - ebeep - epause 5 - fi - - if ! use consolekit; then - ewarn "You have disabled consolekit support." - ewarn "Even if you can run ${MY_PN} without a running ConsoleKit daemo= n," - ewarn "it is not recommanded nor supported upstream." - ewarn "" - fi } =20 pkg_prerm() { diff --git a/app-portage/packagekit/packagekit-9999.ebuild b/app-portage/= packagekit/packagekit-9999.ebuild index 8abafc1..7535da1 100644 --- a/app-portage/packagekit/packagekit-9999.ebuild +++ b/app-portage/packagekit/packagekit-9999.ebuild @@ -30,16 +30,15 @@ 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.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 @@ -55,13 +54,15 @@ CDEPEND=3D" >=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 @@ -105,7 +106,6 @@ src_configure() { ${myconf} \ --localstatedir=3D/var \ --disable-dependency-tracking \ - --enable-option-checking \ --enable-libtool-lock \ --disable-strict \ --disable-local \