* [gentoo-commits] proj/gnome:master commit in: app-portage/packagekit/
@ 2011-02-16 0:48 Nirbheek Chauhan
0 siblings, 0 replies; 6+ messages in thread
From: Nirbheek Chauhan @ 2011-02-16 0:48 UTC (permalink / raw
To: gentoo-commits
commit: 52caaaebc50f0c754993634d415538c51ecb4768
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 00:29:05 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 00:39:34 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=52caaaeb
app-portage/packagekit: bump to 0.6.12, update live
---
...agekit-9999.ebuild => 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: $
EAPI="2"
-inherit autotools eutils git python nsplugins
+inherit eutils multilib python nsplugins
MY_PN="PackageKit"
DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
HOMEPAGE="http://www.packagekit.org/"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${MY_PN}"
+
+if [[ ${PV} = 9999 ]]; then
+ inherit autotools git
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${MY_PN}"
+ KEYWORDS=""
+ DEPEND=">=dev-util/gtk-doc-1.9"
+ RESTRICT="test" # tests are failing atm
+ DOCS="AUTHORS MAINTAINERS NEWS README TODO"
+else
+ MY_P=${MY_PN}-${PV}
+ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~ppc ~x86"
+ S="${WORKDIR}/${MY_P}"
+ DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+fi
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="" # live ebuild
-IUSE="connman +consolekit cron doc gtk mono networkmanager nls nsplugin pm-utils
-+policykit qt4 static-libs test udev"
+IUSE="connman cron gtk +introspection networkmanager nls nsplugin pm-utils qt4
+test udev"
CDEPEND="
connman? ( net-misc/connman )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
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 )
- mono? ( dev-dotnet/glib-sharp:2
- dev-lang/mono )
networkmanager? ( >=net-misc/networkmanager-0.6.4 )
nsplugin? ( dev-libs/dbus-glib
dev-libs/glib:2
@@ -33,60 +45,60 @@ CDEPEND="
x11-libs/cairo
>=x11-libs/gtk+-2.14.0:2
x11-libs/pango )
- policykit? ( >=sys-auth/polkit-0.92 )
qt4? ( >=x11-libs/qt-core-4.4.0
>=x11-libs/qt-dbus-4.4.0
>=x11-libs/qt-sql-4.4.0 )
udev? ( >=sys-fs/udev-145[extras] )
dev-db/sqlite:3
>=dev-libs/dbus-glib-0.74
- >=dev-libs/glib-2.16.1:2
- >=sys-apps/dbus-1.3.0"
+ >=dev-libs/glib-2.22:2
+ >=sys-apps/dbus-1.1.0
+ >=sys-auth/polkit-0.97"
RDEPEND="${CDEPEND}
- consolekit? ( sys-auth/consolekit )
pm-utils? ( sys-power/pm-utils )
>=app-portage/layman-1.2.3
- >=sys-apps/portage-2.2_rc39"
-DEPEND="${CDEPEND}
- doc? ( >=dev-util/gtk-doc-1.9 )
- mono? ( dev-dotnet/gtk-sharp-gapi:2 )
+ >=sys-apps/portage-2.2_rc39
+ sys-auth/consolekit"
+DEPEND="${CDEPEND} ${DEPEND}
nsplugin? ( >=net-libs/xulrunner-1.9.1 )
test? ( qt4? ( dev-util/cppunit >=x11-libs/qt-gui-4.4.0 ) )
dev-libs/libxslt
- dev-util/gtk-doc
>=dev-util/intltool-0.35.0
dev-util/pkgconfig
sys-devel/gettext"
-RESTRICT="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 >=dbus-1.3.0 instead of >=dbus-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
src_prepare() {
- gtkdocize || die "gtkdocize failed"
- eautoreconf
- intltoolize || die "intltoolize failed"
+ if [[ ${PV} = 9999 ]]; then
+ gtkdocize || die
+ intltoolize --force || die
+ eautoreconf
+ fi
# 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
}
src_configure() {
local myconf=""
- if use policykit; then
- myconf="${myconf} --with-security-framework=polkit"
- else
- myconf="${myconf} --with-security-framework=dummy"
- 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=/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=portage \
- --enable-man-pages \
+ --with-security-framework=polkit \
$(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="${D}" install || die "emake install failed"
- dodoc AUTHORS MAINTAINERS NEWS README RELEASE TODO || die "dodoc failed"
+ dodoc ${DOCS} || die "dodoc failed"
if use nsplugin; then
src_mv_plugins /usr/$(get_libdir)/mozilla/plugins
fi
- 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
}
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 daemon,"
- ewarn "it is not recommanded nor supported upstream."
- ewarn ""
- fi
-
- ewarn "${MY_PN} live ebuild could be broken because of need of SVN version of portage."
}
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: $
EAPI="2"
-inherit autotools eutils git python nsplugins
+inherit eutils multilib python nsplugins
MY_PN="PackageKit"
DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
HOMEPAGE="http://www.packagekit.org/"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${MY_PN}"
+
+if [[ ${PV} = 9999 ]]; then
+ inherit autotools git
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${MY_PN}"
+ KEYWORDS=""
+ DEPEND=">=dev-util/gtk-doc-1.9"
+ RESTRICT="test" # tests are failing atm
+ DOCS="AUTHORS MAINTAINERS NEWS README TODO"
+else
+ MY_P=${MY_PN}-${PV}
+ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~ppc ~x86"
+ S="${WORKDIR}/${MY_P}"
+ DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+fi
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="" # live ebuild
-IUSE="connman +consolekit cron doc gtk mono networkmanager nls nsplugin pm-utils
-+policykit qt4 static-libs test udev"
+IUSE="connman cron gtk +introspection networkmanager nls nsplugin pm-utils qt4
+test udev"
CDEPEND="
connman? ( net-misc/connman )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
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 )
- mono? ( dev-dotnet/glib-sharp:2
- dev-lang/mono )
networkmanager? ( >=net-misc/networkmanager-0.6.4 )
nsplugin? ( dev-libs/dbus-glib
dev-libs/glib:2
@@ -33,60 +45,60 @@ CDEPEND="
x11-libs/cairo
>=x11-libs/gtk+-2.14.0:2
x11-libs/pango )
- policykit? ( >=sys-auth/polkit-0.92 )
qt4? ( >=x11-libs/qt-core-4.4.0
>=x11-libs/qt-dbus-4.4.0
>=x11-libs/qt-sql-4.4.0 )
udev? ( >=sys-fs/udev-145[extras] )
dev-db/sqlite:3
>=dev-libs/dbus-glib-0.74
- >=dev-libs/glib-2.16.1:2
- >=sys-apps/dbus-1.3.0"
+ >=dev-libs/glib-2.22:2
+ >=sys-apps/dbus-1.1.0
+ >=sys-auth/polkit-0.97"
RDEPEND="${CDEPEND}
- consolekit? ( sys-auth/consolekit )
pm-utils? ( sys-power/pm-utils )
>=app-portage/layman-1.2.3
- >=sys-apps/portage-2.2_rc39"
-DEPEND="${CDEPEND}
- doc? ( >=dev-util/gtk-doc-1.9 )
- mono? ( dev-dotnet/gtk-sharp-gapi:2 )
+ >=sys-apps/portage-2.2_rc39
+ sys-auth/consolekit"
+DEPEND="${CDEPEND} ${DEPEND}
nsplugin? ( >=net-libs/xulrunner-1.9.1 )
test? ( qt4? ( dev-util/cppunit >=x11-libs/qt-gui-4.4.0 ) )
dev-libs/libxslt
- dev-util/gtk-doc
>=dev-util/intltool-0.35.0
dev-util/pkgconfig
sys-devel/gettext"
-RESTRICT="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 >=dbus-1.3.0 instead of >=dbus-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
src_prepare() {
- gtkdocize || die "gtkdocize failed"
- eautoreconf
- intltoolize || die "intltoolize failed"
+ if [[ ${PV} = 9999 ]]; then
+ gtkdocize || die
+ intltoolize --force || die
+ eautoreconf
+ fi
# 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
}
src_configure() {
local myconf=""
- if use policykit; then
- myconf="${myconf} --with-security-framework=polkit"
- else
- myconf="${myconf} --with-security-framework=dummy"
- 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=/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=portage \
- --enable-man-pages \
+ --with-security-framework=polkit \
$(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="${D}" install || die "emake install failed"
- dodoc AUTHORS MAINTAINERS NEWS README RELEASE TODO || die "dodoc failed"
+ dodoc ${DOCS} || die "dodoc failed"
if use nsplugin; then
src_mv_plugins /usr/$(get_libdir)/mozilla/plugins
fi
- 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
}
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 daemon,"
- ewarn "it is not recommanded nor supported upstream."
- ewarn ""
- fi
-
- ewarn "${MY_PN} live ebuild could be broken because of need of SVN version of portage."
}
pkg_prerm() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: app-portage/packagekit/
@ 2011-03-23 5:20 Nirbheek Chauhan
0 siblings, 0 replies; 6+ messages in thread
From: Nirbheek Chauhan @ 2011-03-23 5:20 UTC (permalink / raw
To: gentoo-commits
commit: a5eb4d6295c04602cc82fb61eadcee956e0a9d7e
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 05:06:08 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 05:06:08 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a5eb4d62
app-portage/packagekit: 0.6.12 → 0.6.13
* Port to new NM
---
...ekit-0.6.12.ebuild => packagekit-0.6.13.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/app-portage/packagekit/packagekit-0.6.12.ebuild b/app-portage/packagekit/packagekit-0.6.13.ebuild
similarity index 100%
rename from app-portage/packagekit/packagekit-0.6.12.ebuild
rename to app-portage/packagekit/packagekit-0.6.13.ebuild
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: app-portage/packagekit/
@ 2011-05-08 17:36 Gilles Dartiguelongue
0 siblings, 0 replies; 6+ messages in thread
From: Gilles Dartiguelongue @ 2011-05-08 17:36 UTC (permalink / raw
To: gentoo-commits
commit: dfeaf2888e0b5dd40a220dd8c49f54c88ab0b287
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 15:47:40 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 8 15:47:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dfeaf288
app-portage/packagekit: 0.6.13 → 0.6.13
---
...gekit-0.6.8.ebuild => 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="2"
inherit eutils multilib python nsplugins
+if [[ ${PV} = 9999 ]]; then
+ inherit autotools git
+fi
MY_PN="PackageKit"
-MY_P=${MY_PN}-${PV}
DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
HOMEPAGE="http://www.packagekit.org/"
-SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.gz"
+
+if [[ ${PV} = 9999 ]]; then
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${MY_PN}"
+ KEYWORDS=""
+ DEPEND=">=dev-util/gtk-doc-1.9"
+ RESTRICT="test" # tests are failing atm
+ DOCS="AUTHORS MAINTAINERS NEWS README TODO"
+else
+ MY_P=${MY_PN}-${PV}
+ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~ppc ~x86"
+ S="${WORKDIR}/${MY_P}"
+ DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+fi
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="connman +consolekit cron gtk networkmanager nls nsplugin pm-utils +policykit qt4 static-libs test udev"
+IUSE="connman cron gtk +introspection networkmanager nls nsplugin pm-utils qt4 test udev"
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 )
networkmanager? ( >=net-misc/networkmanager-0.6.4 )
nsplugin? ( dev-libs/dbus-glib
dev-libs/glib:2
dev-libs/nspr
x11-libs/cairo
>=x11-libs/gtk+-2.14.0:2
+ >=x11-libs/gtk+-2.91.0:3
x11-libs/pango )
- policykit? ( >=sys-auth/polkit-0.97 )
qt4? ( >=x11-libs/qt-core-4.4.0
>=x11-libs/qt-dbus-4.4.0
>=x11-libs/qt-sql-4.4.0 )
@@ -39,12 +55,15 @@ CDEPEND="
dev-db/sqlite:3
>=dev-libs/dbus-glib-0.74
>=dev-libs/glib-2.22:2
- >=sys-apps/dbus-1.1.0"
+ >=sys-apps/dbus-1.1.0
+ >=sys-auth/polkit-0.97
+"
RDEPEND="${CDEPEND}
- consolekit? ( sys-auth/consolekit )
pm-utils? ( sys-power/pm-utils )
>=app-portage/layman-1.2.3
- >=sys-apps/portage-2.2_rc39"
+ >=sys-apps/portage-2.2_rc39
+ sys-auth/consolekit
+"
DEPEND="${CDEPEND}
nsplugin? ( >=net-libs/xulrunner-1.9.1 )
test? ( qt4? ( dev-util/cppunit >=x11-libs/qt-gui-4.4.0 ) )
@@ -53,15 +72,8 @@ DEPEND="${CDEPEND}
dev-util/pkgconfig
sys-devel/gettext"
-S="${WORKDIR}/${MY_P}"
-RESTRICT="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 upstream
# 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 >=dbus-1.3.0 instead of >=dbus-1.1.1 because of a bug fixed in 1.3.0
# TODO:
@@ -73,28 +85,24 @@ RESTRICT="test" # tests are failing atm
# documentation/website with --enable-doc-install
# failing tests
+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} = 9999 ]]; then
+ gtkdocize || die
+ intltoolize --force || die
+ eautoreconf
+ fi
# 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
}
src_configure() {
local myconf=""
- if use policykit; then
- myconf="${myconf} --with-security-framework=polkit"
- else
- myconf="${myconf} --with-security-framework=dummy"
- 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=/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=portage \
- --disable-introspection \
+ --with-security-framework=polkit \
$(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="${D}" install || die "emake install failed"
- dodoc AUTHORS ChangeLog MAINTAINERS NEWS README TODO || die "dodoc failed"
+ dodoc ${DOCS} || die "dodoc failed"
if use nsplugin; then
src_mv_plugins /usr/$(get_libdir)/mozilla/plugins
fi
- 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
}
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 daemon,"
- ewarn "it is not recommanded nor supported upstream."
- ewarn ""
- fi
}
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
LICENSE="GPL-2"
SLOT="0"
-IUSE="connman cron gtk +introspection networkmanager nls nsplugin pm-utils qt4
-test udev"
+IUSE="connman cron gtk +introspection networkmanager nls nsplugin pm-utils qt4 test udev"
CDEPEND="
connman? ( net-misc/connman )
- introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
gtk? ( dev-libs/dbus-glib
media-libs/fontconfig
>=x11-libs/gtk+-2.91.0:3
x11-libs/pango )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
networkmanager? ( >=net-misc/networkmanager-0.6.4 )
nsplugin? ( dev-libs/dbus-glib
dev-libs/glib:2
@@ -55,13 +54,15 @@ CDEPEND="
>=dev-libs/dbus-glib-0.74
>=dev-libs/glib-2.22:2
>=sys-apps/dbus-1.1.0
- >=sys-auth/polkit-0.97"
+ >=sys-auth/polkit-0.97
+"
RDEPEND="${CDEPEND}
pm-utils? ( sys-power/pm-utils )
>=app-portage/layman-1.2.3
>=sys-apps/portage-2.2_rc39
- sys-auth/consolekit"
-DEPEND="${CDEPEND} ${DEPEND}
+ sys-auth/consolekit
+"
+DEPEND="${CDEPEND}
nsplugin? ( >=net-libs/xulrunner-1.9.1 )
test? ( qt4? ( dev-util/cppunit >=x11-libs/qt-gui-4.4.0 ) )
dev-libs/libxslt
@@ -105,7 +106,6 @@ src_configure() {
${myconf} \
--localstatedir=/var \
--disable-dependency-tracking \
- --enable-option-checking \
--enable-libtool-lock \
--disable-strict \
--disable-local \
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: app-portage/packagekit/
@ 2011-06-14 6:36 Nirbheek Chauhan
0 siblings, 0 replies; 6+ messages in thread
From: Nirbheek Chauhan @ 2011-06-14 6:36 UTC (permalink / raw
To: gentoo-commits
commit: 252a554bb4f95f338c25e26495506e36799eb41b
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Jun 11 17:29:49 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 05:59:00 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=252a554b
app-portage/packagekit: 0.6.14 → 0.6.15
Version bump. Punt 0.6.13. Add a sed to 0.6.14 so that it builds with
>=glib-2.28.7 (upstream commit f8771f7ab15f297ad38ce8ee03b0566ff76dafbc).
RESTRICT=tests for all versions since tests fail for all of them. Add
>=sys-fs/udev-171[gudev] as an alternative dependency to
>=sys-fs/udev-145[extras] (bug #348472).
Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org>
---
app-portage/packagekit/packagekit-0.6.14.ebuild | 12 ++++++-
...ekit-0.6.13.ebuild => 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-portage/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} = 9999 ]]; then
EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${MY_PN}"
KEYWORDS=""
DEPEND=">=dev-util/gtk-doc-1.9"
- RESTRICT="test" # tests are failing atm
DOCS="AUTHORS MAINTAINERS NEWS README TODO"
else
MY_P=${MY_PN}-${PV}
@@ -51,7 +50,8 @@ CDEPEND="
qt4? ( >=x11-libs/qt-core-4.4.0
>=x11-libs/qt-dbus-4.4.0
>=x11-libs/qt-sql-4.4.0 )
- udev? ( >=sys-fs/udev-145[extras] )
+ udev? ( || ( >=sys-fs/udev-171[gudev]
+ >=sys-fs/udev-145[extras] ) )
dev-db/sqlite:3
>=dev-libs/dbus-glib-0.74
>=dev-libs/glib-2.22:2
@@ -72,6 +72,10 @@ DEPEND="${CDEPEND}
dev-util/pkgconfig
sys-devel/gettext"
+# FIXME: tests are failing
+# PackageKit:ERROR:pk-self-test.c:949:pk_test_control_get_properties_cb: assertion failed (text == "application/x-rpm;application/x-deb"): ("" == "application/x-rpm;application/x-deb")
+RESTRICT="test"
+
# NOTES:
# doc is in the tarball and always installed
# using >=dbus-1.3.0 instead of >=dbus-1.1.1 because of a bug fixed in 1.3.0
@@ -98,6 +102,10 @@ 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() {
diff --git a/app-portage/packagekit/packagekit-0.6.13.ebuild b/app-portage/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: $
@@ -18,7 +18,6 @@ if [[ ${PV} = 9999 ]]; then
EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${MY_PN}"
KEYWORDS=""
DEPEND=">=dev-util/gtk-doc-1.9"
- RESTRICT="test" # tests are failing atm
DOCS="AUTHORS MAINTAINERS NEWS README TODO"
else
MY_P=${MY_PN}-${PV}
@@ -30,38 +29,42 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="connman cron gtk +introspection networkmanager nls nsplugin pm-utils qt4
-test udev"
+IUSE="connman cron gtk +introspection networkmanager nls nsplugin pm-utils qt4 test udev"
CDEPEND="
connman? ( net-misc/connman )
- introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
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 )
networkmanager? ( >=net-misc/networkmanager-0.6.4 )
nsplugin? ( dev-libs/dbus-glib
dev-libs/glib:2
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
>=x11-libs/qt-sql-4.4.0 )
- udev? ( >=sys-fs/udev-145[extras] )
+ udev? ( || ( >=sys-fs/udev-171[gudev]
+ >=sys-fs/udev-145[extras] ) )
dev-db/sqlite:3
>=dev-libs/dbus-glib-0.74
>=dev-libs/glib-2.22:2
>=sys-apps/dbus-1.1.0
- >=sys-auth/polkit-0.97"
+ >=sys-auth/polkit-0.97
+"
RDEPEND="${CDEPEND}
pm-utils? ( sys-power/pm-utils )
>=app-portage/layman-1.2.3
>=sys-apps/portage-2.2_rc39
- sys-auth/consolekit"
-DEPEND="${CDEPEND} ${DEPEND}
+ sys-auth/consolekit
+"
+DEPEND="${CDEPEND}
nsplugin? ( >=net-libs/xulrunner-1.9.1 )
test? ( qt4? ( dev-util/cppunit >=x11-libs/qt-gui-4.4.0 ) )
dev-libs/libxslt
@@ -69,6 +72,10 @@ DEPEND="${CDEPEND} ${DEPEND}
dev-util/pkgconfig
sys-devel/gettext"
+# FIXME: tests are failing
+# PackageKit:ERROR:pk-self-test.c:949:pk_test_control_get_properties_cb: assertion failed (text == "application/x-rpm;application/x-deb"): ("" == "application/x-rpm;application/x-deb")
+RESTRICT="test"
+
# NOTES:
# doc is in the tarball and always installed
# using >=dbus-1.3.0 instead of >=dbus-1.1.1 because of a bug fixed in 1.3.0
@@ -82,6 +89,10 @@ DEPEND="${CDEPEND} ${DEPEND}
# documentation/website with --enable-doc-install
# failing tests
+pkg_setup() {
+ python_set_active_version 2
+}
+
src_prepare() {
if [[ ${PV} = 9999 ]]; then
gtkdocize || die
@@ -105,7 +116,6 @@ src_configure() {
${myconf} \
--localstatedir=/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} = 9999 ]]; then
EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${MY_PN}"
KEYWORDS=""
DEPEND=">=dev-util/gtk-doc-1.9"
- RESTRICT="test" # tests are failing atm
DOCS="AUTHORS MAINTAINERS NEWS README TODO"
else
MY_P=${MY_PN}-${PV}
@@ -49,7 +48,8 @@ CDEPEND="
qt4? ( >=x11-libs/qt-core-4.4.0
>=x11-libs/qt-dbus-4.4.0
>=x11-libs/qt-sql-4.4.0 )
- udev? ( >=sys-fs/udev-145[extras] )
+ udev? ( || ( >=sys-fs/udev-171[gudev]
+ >=sys-fs/udev-145[extras] ) )
dev-db/sqlite:3
>=dev-libs/dbus-glib-0.74
>=dev-libs/glib-2.22:2
@@ -70,6 +70,10 @@ DEPEND="${CDEPEND}
dev-util/pkgconfig
sys-devel/gettext"
+# FIXME: tests are failing
+# PackageKit:ERROR:pk-self-test.c:949:pk_test_control_get_properties_cb: assertion failed (text == "application/x-rpm;application/x-deb"): ("" == "application/x-rpm;application/x-deb")
+RESTRICT="test"
+
# NOTES:
# doc is in the tarball and always installed
# using >=dbus-1.3.0 instead of >=dbus-1.1.1 because of a bug fixed in 1.3.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: app-portage/packagekit/
@ 2011-07-01 21:07 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-07-01 21:07 UTC (permalink / raw
To: gentoo-commits
commit: e4fd59fbc0961bb5c9de32afabb14d207cf76da3
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri Jul 1 21:06:27 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Jul 1 21:06:27 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e4fd59fb
app-portage/packagekit: add docbook-xml-dtd:4.2 build-time dependency
---
app-portage/packagekit/packagekit-0.6.14.ebuild | 2 ++
app-portage/packagekit/packagekit-0.6.15.ebuild | 2 ++
app-portage/packagekit/packagekit-9999.ebuild | 2 ++
3 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/app-portage/packagekit/packagekit-0.6.14.ebuild b/app-portage/packagekit/packagekit-0.6.14.ebuild
index dfd3fa0..cd1539c 100644
--- a/app-portage/packagekit/packagekit-0.6.14.ebuild
+++ b/app-portage/packagekit/packagekit-0.6.14.ebuild
@@ -64,9 +64,11 @@ RDEPEND="${CDEPEND}
>=sys-apps/portage-2.2_rc39
sys-auth/consolekit
"
+# docbook-xml-dtd:4.2 needed for man page generation
DEPEND="${CDEPEND}
nsplugin? ( >=net-libs/xulrunner-1.9.1 )
test? ( qt4? ( dev-util/cppunit >=x11-libs/qt-gui-4.4.0 ) )
+ app-text/docbook-xml-dtd:4.2
dev-libs/libxslt
>=dev-util/intltool-0.35.0
dev-util/pkgconfig
diff --git a/app-portage/packagekit/packagekit-0.6.15.ebuild b/app-portage/packagekit/packagekit-0.6.15.ebuild
index 2fc09af..3c25db0 100644
--- a/app-portage/packagekit/packagekit-0.6.15.ebuild
+++ b/app-portage/packagekit/packagekit-0.6.15.ebuild
@@ -64,9 +64,11 @@ RDEPEND="${CDEPEND}
>=sys-apps/portage-2.2_rc39
sys-auth/consolekit
"
+# docbook-xml-dtd:4.2 needed for man page generation
DEPEND="${CDEPEND}
nsplugin? ( >=net-libs/xulrunner-1.9.1 )
test? ( qt4? ( dev-util/cppunit >=x11-libs/qt-gui-4.4.0 ) )
+ app-text/docbook-xml-dtd:4.2
dev-libs/libxslt
>=dev-util/intltool-0.35.0
dev-util/pkgconfig
diff --git a/app-portage/packagekit/packagekit-9999.ebuild b/app-portage/packagekit/packagekit-9999.ebuild
index 21a59dc..b8bbbc7 100644
--- a/app-portage/packagekit/packagekit-9999.ebuild
+++ b/app-portage/packagekit/packagekit-9999.ebuild
@@ -62,9 +62,11 @@ RDEPEND="${CDEPEND}
>=sys-apps/portage-2.2_rc39
sys-auth/consolekit
"
+# docbook-xml-dtd:4.2 needed for man page generation
DEPEND="${CDEPEND}
nsplugin? ( >=net-libs/xulrunner-1.9.1 )
test? ( qt4? ( dev-util/cppunit >=x11-libs/qt-gui-4.4.0 ) )
+ app-text/docbook-xml-dtd:4.2
dev-libs/libxslt
>=dev-util/intltool-0.35.0
dev-util/pkgconfig
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: app-portage/packagekit/
@ 2011-07-19 3:36 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-07-19 3:36 UTC (permalink / raw
To: gentoo-commits
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}
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-07-19 3:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-23 5:20 [gentoo-commits] proj/gnome:master commit in: app-portage/packagekit/ Nirbheek Chauhan
-- strict thread matches above, loose matches on Subject: below --
2011-07-19 3:36 Alexandre Restovtsev
2011-07-01 21:07 Alexandre Restovtsev
2011-06-14 6:36 Nirbheek Chauhan
2011-05-08 17:36 Gilles Dartiguelongue
2011-02-16 0:48 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox