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 1PpVZr-0004G9-BM for garchives@archives.gentoo.org; Wed, 16 Feb 2011 00:49:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96BCAE08F7; Wed, 16 Feb 2011 00:48:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3DD7DE08F7 for ; Wed, 16 Feb 2011 00:48:57 +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 B0C281B4056 for ; Wed, 16 Feb 2011 00:48:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 164C48006A for ; Wed, 16 Feb 2011 00:48:56 +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: <52caaaebc50f0c754993634d415538c51ecb4768.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.12.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: 52caaaebc50f0c754993634d415538c51ecb4768 Date: Wed, 16 Feb 2011 00:48:56 +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: 67a468f35aaa3a34778bcaa502ef76f2 commit: 52caaaebc50f0c754993634d415538c51ecb4768 Author: Nirbheek Chauhan gentoo org> AuthorDate: Wed Feb 16 00:29:05 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Wed Feb 16 00:39:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D52caaaeb app-portage/packagekit: bump to 0.6.12, update live --- ...agekit-9999.ebuild =3D> packagekit-0.6.12.ebuild} | 114 +++++++++---= ------- app-portage/packagekit/packagekit-9999.ebuild | 114 +++++++++-----= ----- 2 files changed, 108 insertions(+), 120 deletions(-) diff --git a/app-portage/packagekit/packagekit-9999.ebuild b/app-portage/= packagekit/packagekit-0.6.12.ebuild similarity index 55% copy from app-portage/packagekit/packagekit-9999.ebuild copy to app-portage/packagekit/packagekit-0.6.12.ebuild index 01c97a4..b3d6fc7 100644 --- a/app-portage/packagekit/packagekit-9999.ebuild +++ b/app-portage/packagekit/packagekit-0.6.12.ebuild @@ -1,31 +1,43 @@ -# 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" =20 -inherit autotools eutils git python nsplugins +inherit eutils multilib python nsplugins =20 MY_PN=3D"PackageKit" =20 DESCRIPTION=3D"Manage packages in a secure way using a cross-distro and = cross-architecture API" HOMEPAGE=3D"http://www.packagekit.org/" -EGIT_REPO_URI=3D"git://anongit.freedesktop.org/git/${PN}/${MY_PN}" + +if [[ ${PV} =3D 9999 ]]; then + inherit autotools git + 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"" # live ebuild -IUSE=3D"connman +consolekit cron doc gtk mono networkmanager nls nsplugi= n pm-utils -+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 ) + 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 ) - mono? ( dev-dotnet/glib-sharp:2 - dev-lang/mono ) networkmanager? ( >=3Dnet-misc/networkmanager-0.6.4 ) nsplugin? ( dev-libs/dbus-glib dev-libs/glib:2 @@ -33,60 +45,60 @@ CDEPEND=3D" x11-libs/cairo >=3Dx11-libs/gtk+-2.14.0:2 x11-libs/pango ) - policykit? ( >=3Dsys-auth/polkit-0.92 ) 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] ) dev-db/sqlite:3 >=3Ddev-libs/dbus-glib-0.74 - >=3Ddev-libs/glib-2.16.1:2 - >=3Dsys-apps/dbus-1.3.0" + >=3Ddev-libs/glib-2.22:2 + >=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" -DEPEND=3D"${CDEPEND} - doc? ( >=3Ddev-util/gtk-doc-1.9 ) - mono? ( dev-dotnet/gtk-sharp-gapi:2 ) + >=3Dsys-apps/portage-2.2_rc39 + sys-auth/consolekit" +DEPEND=3D"${CDEPEND} ${DEPEND} nsplugin? ( >=3Dnet-libs/xulrunner-1.9.1 ) test? ( qt4? ( dev-util/cppunit >=3Dx11-libs/qt-gui-4.4.0 ) ) dev-libs/libxslt - dev-util/gtk-doc >=3Ddev-util/intltool-0.35.0 dev-util/pkgconfig sys-devel/gettext" =20 -RESTRICT=3D"test" # tests in live ebuild is not a good idea - # NOTES: -# gtk-doc, gettext and intltool are mandatory for eautoreconf +# 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 + +# TODO: +# gettext is probably needed only if +nls but too long to fix +# +doc to install doc/website +# check if test? qt? ( really needs qt-gui) + +# UPSTREAM: +# documentation/website with --enable-doc-install +# failing tests =20 src_prepare() { - gtkdocize || die "gtkdocize failed" - eautoreconf - intltoolize || die "intltoolize failed" + 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 # command,debuginfo,gstreamer,service-packs: not supported by backend - # man-pages: we want them + # managed: failing (see UPSTREAM in ebuild header) econf \ ${myconf} \ --localstatedir=3D/var \ @@ -95,25 +107,26 @@ src_configure() { --enable-libtool-lock \ --disable-strict \ --disable-local \ + --disable-gtk-doc \ --disable-command-not-found \ --disable-debuginfo-install \ --disable-gstreamer-plugin \ --disable-service-packs \ + --disable-static \ + --enable-man-pages \ --disable-dummy \ --enable-portage \ --with-default-backend=3Dportage \ - --enable-man-pages \ + --with-security-framework=3Dpolkit \ $(use_enable connman) \ $(use_enable cron) \ - $(use_enable doc gtk-doc) \ $(use_enable gtk gtk-module) \ - $(use_enable mono managed) \ + $(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) } @@ -121,38 +134,19 @@ src_configure() { src_install() { emake DESTDIR=3D"${D}" install || die "emake install failed" =20 - dodoc AUTHORS MAINTAINERS NEWS README RELEASE TODO || die "dodoc failed= " + 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 - - ewarn "${MY_PN} live ebuild could be broken because of need of SVN vers= ion of portage." } =20 pkg_prerm() { diff --git a/app-portage/packagekit/packagekit-9999.ebuild b/app-portage/= packagekit/packagekit-9999.ebuild index 01c97a4..b3d6fc7 100644 --- a/app-portage/packagekit/packagekit-9999.ebuild +++ b/app-portage/packagekit/packagekit-9999.ebuild @@ -1,31 +1,43 @@ -# 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" =20 -inherit autotools eutils git python nsplugins +inherit eutils multilib python nsplugins =20 MY_PN=3D"PackageKit" =20 DESCRIPTION=3D"Manage packages in a secure way using a cross-distro and = cross-architecture API" HOMEPAGE=3D"http://www.packagekit.org/" -EGIT_REPO_URI=3D"git://anongit.freedesktop.org/git/${PN}/${MY_PN}" + +if [[ ${PV} =3D 9999 ]]; then + inherit autotools git + 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"" # live ebuild -IUSE=3D"connman +consolekit cron doc gtk mono networkmanager nls nsplugi= n pm-utils -+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 ) + 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 ) - mono? ( dev-dotnet/glib-sharp:2 - dev-lang/mono ) networkmanager? ( >=3Dnet-misc/networkmanager-0.6.4 ) nsplugin? ( dev-libs/dbus-glib dev-libs/glib:2 @@ -33,60 +45,60 @@ CDEPEND=3D" x11-libs/cairo >=3Dx11-libs/gtk+-2.14.0:2 x11-libs/pango ) - policykit? ( >=3Dsys-auth/polkit-0.92 ) 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] ) dev-db/sqlite:3 >=3Ddev-libs/dbus-glib-0.74 - >=3Ddev-libs/glib-2.16.1:2 - >=3Dsys-apps/dbus-1.3.0" + >=3Ddev-libs/glib-2.22:2 + >=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" -DEPEND=3D"${CDEPEND} - doc? ( >=3Ddev-util/gtk-doc-1.9 ) - mono? ( dev-dotnet/gtk-sharp-gapi:2 ) + >=3Dsys-apps/portage-2.2_rc39 + sys-auth/consolekit" +DEPEND=3D"${CDEPEND} ${DEPEND} nsplugin? ( >=3Dnet-libs/xulrunner-1.9.1 ) test? ( qt4? ( dev-util/cppunit >=3Dx11-libs/qt-gui-4.4.0 ) ) dev-libs/libxslt - dev-util/gtk-doc >=3Ddev-util/intltool-0.35.0 dev-util/pkgconfig sys-devel/gettext" =20 -RESTRICT=3D"test" # tests in live ebuild is not a good idea - # NOTES: -# gtk-doc, gettext and intltool are mandatory for eautoreconf +# 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 + +# TODO: +# gettext is probably needed only if +nls but too long to fix +# +doc to install doc/website +# check if test? qt? ( really needs qt-gui) + +# UPSTREAM: +# documentation/website with --enable-doc-install +# failing tests =20 src_prepare() { - gtkdocize || die "gtkdocize failed" - eautoreconf - intltoolize || die "intltoolize failed" + 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 # command,debuginfo,gstreamer,service-packs: not supported by backend - # man-pages: we want them + # managed: failing (see UPSTREAM in ebuild header) econf \ ${myconf} \ --localstatedir=3D/var \ @@ -95,25 +107,26 @@ src_configure() { --enable-libtool-lock \ --disable-strict \ --disable-local \ + --disable-gtk-doc \ --disable-command-not-found \ --disable-debuginfo-install \ --disable-gstreamer-plugin \ --disable-service-packs \ + --disable-static \ + --enable-man-pages \ --disable-dummy \ --enable-portage \ --with-default-backend=3Dportage \ - --enable-man-pages \ + --with-security-framework=3Dpolkit \ $(use_enable connman) \ $(use_enable cron) \ - $(use_enable doc gtk-doc) \ $(use_enable gtk gtk-module) \ - $(use_enable mono managed) \ + $(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) } @@ -121,38 +134,19 @@ src_configure() { src_install() { emake DESTDIR=3D"${D}" install || die "emake install failed" =20 - dodoc AUTHORS MAINTAINERS NEWS README RELEASE TODO || die "dodoc failed= " + 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 - - ewarn "${MY_PN} live ebuild could be broken because of need of SVN vers= ion of portage." } =20 pkg_prerm() {