* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-settings-daemon/, app-portage/packagekit/, x11-libs/gtk+/, ...
@ 2011-07-20 6:44 Alexandre Restovtsev
0 siblings, 0 replies; only message in thread
From: Alexandre Restovtsev @ 2011-07-20 6:44 UTC (permalink / raw
To: gentoo-commits
commit: dd09d89d050523efb5a69934442553a0be8a5dfe
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jul 20 04:09:44 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jul 20 05:16:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dd09d89d
app-portage/packagekit: split and moved to app-admin in gx86
packagekit is now in gx86, in app-admin, and split into 4 packages:
packagekit-base, packagekit-gtk, packagekit-qt, and packagekit (the
meta package). Many thanks to lxnay and the sabayon people for doing
this work.
Unfortunately, there is no way to provide a smooth upgrade path from
monolithic packagekit in the overlay to the split one in gx86,
particularly when both the overlay and gx86 contain the same version of
packagekit. The best one can do is to add an app-admin/packagekit-base
ebuild to the overlay that hard-blocks the old app-portage/packagekit.
In addition, all the packagekit dependencies in the overlay have had to
be updated. Most of them (with the notable exception of
gnome-packagekit) only need packagekit-base.
---
.../packagekit-base/packagekit-base-0.6.16.ebuild | 181 ++++++++++++++++++++
app-arch/file-roller/file-roller-3.0.2.ebuild | 2 +-
app-arch/file-roller/file-roller-9999.ebuild | 2 +-
app-cdr/brasero/brasero-3.0.0.ebuild | 2 +-
app-cdr/brasero/brasero-9999.ebuild | 2 +-
app-portage/packagekit/metadata.xml | 21 ---
app-portage/packagekit/packagekit-0.6.15.ebuild | 173 -------------------
app-portage/packagekit/packagekit-0.6.16.ebuild | 173 -------------------
app-portage/packagekit/packagekit-9999.ebuild | 173 -------------------
.../gnome-settings-daemon-3.1.3.ebuild | 2 +-
.../gnome-settings-daemon-9999.ebuild | 2 +-
gnome-base/nautilus/nautilus-3.1.3.ebuild | 2 +-
gnome-base/nautilus/nautilus-9999.ebuild | 2 +-
.../gnome-color-manager-3.0.0.ebuild | 2 +-
.../gnome-packagekit-2.32.0.ebuild | 3 +-
.../gnome-packagekit/gnome-packagekit-3.0.3.ebuild | 3 +-
status/portage-configs/package.keywords.gnome3 | 3 +-
x11-libs/gtk+/gtk+-3.1.8.ebuild | 2 +-
x11-libs/gtk+/gtk+-9999.ebuild | 2 +-
19 files changed, 198 insertions(+), 554 deletions(-)
diff --git a/app-admin/packagekit-base/packagekit-base-0.6.16.ebuild b/app-admin/packagekit-base/packagekit-base-0.6.16.ebuild
new file mode 100644
index 0000000..e9d9ee7
--- /dev/null
+++ b/app-admin/packagekit-base/packagekit-base-0.6.16.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.6.16.ebuild,v 1.1 2011/07/19 19:12:59 lxnay Exp $
+
+# This ebuild is here purely to provide a collision-free upgrade path from gnome
+# overlay's monolithic app-portage/packagekit to the split app-admin/packagekit
+# now in gx86.
+# Remove this ebuild in 08-2011 or when packagekit-base-0.6.17 is in gx86.
+
+EAPI="3"
+
+inherit eutils multilib python nsplugins bash-completion
+
+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.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="connman cron doc +introspection networkmanager nsplugin pm-utils +policykit entropy static-libs test udev"
+
+CDEPEND="connman? ( net-misc/connman )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
+ networkmanager? ( >=net-misc/networkmanager-0.6.4 )
+ nsplugin? (
+ dev-libs/nspr
+ x11-libs/cairo
+ >=x11-libs/gtk+-2.14.0:2
+ x11-libs/pango
+ )
+ policykit? ( >=sys-auth/polkit-0.94 )
+ 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.16.1:2
+ >=sys-apps/dbus-1.3.0"
+DEPEND="${CDEPEND}
+ doc? ( dev-util/gtk-doc )
+ nsplugin? ( >=net-libs/xulrunner-1.9.1 )
+ dev-libs/libxslt
+ >=dev-util/intltool-0.35.0
+ dev-util/pkgconfig
+ sys-devel/gettext"
+
+RDEPEND="${CDEPEND}
+ entropy? ( >=sys-apps/entropy-1.0_rc27 )
+ pm-utils? ( sys-power/pm-utils )
+ >=app-portage/layman-1.2.3
+ >=sys-apps/portage-2.1.9
+ sys-auth/consolekit
+ !!<=app-portage/packagekit-0.6.16"
+# that last blocker is to ensure people upgrading from the monolithic packagekit
+# formerly in the overlay don't run into file collisions
+
+APP_LINGUAS="as bg bn ca cs da de el en_GB es fi fr gu he hi hu it ja kn ko ml mr
+ms nb nl or pa pl pt pt_BR ro ru sk sr sr@latin sv ta te th tr uk zh_CN zh_TW"
+for X in ${APP_LINGUAS}; do
+ IUSE=" ${IUSE} linguas_${X}"
+done
+
+S="${WORKDIR}/${MY_P}"
+RESTRICT="test" # tests are failing atm
+
+# NOTES:
+# 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
+
+# UPSTREAM:
+# documentation/website with --enable-doc-install
+# failing tests
+
+src_configure() {
+ local myconf=""
+
+ if use policykit; then
+ myconf+=" --with-security-framework=polkit"
+ else
+ myconf+=" --with-security-framework=dummy"
+ fi
+
+ if [[ -z "${LINGUAS}" ]]; then
+ myconf+=" --disable-nls"
+ else
+ myconf+=" --enable-nls"
+ fi
+
+ # localstatedir: for gentoo it's /var/lib but for $PN it's /var
+ # dep-tracking,option-check,libtool-lock,strict,local: obvious reasons
+ # command,debuginfo,gstreamer,service-packs: not supported by backend
+
+ # NOTE: default backend is autodetected at runtime, also
+ if use entropy; then
+ myconf+=" --with-default-backend=entropy"
+ else
+ myconf+=" --with-default-backend=portage"
+ fi
+ econf \
+ ${myconf} \
+ --enable-introspection=no \
+ --localstatedir=/var \
+ --disable-dependency-tracking \
+ --enable-option-checking \
+ --enable-libtool-lock \
+ --disable-strict \
+ --disable-local \
+ $(use_enable doc gtk-doc) \
+ $(use_enable bash-completion command-not-found) \
+ --disable-debuginfo-install \
+ --disable-gstreamer-plugin \
+ --disable-service-packs \
+ --enable-man-pages \
+ --enable-portage \
+ $(use_enable entropy) \
+ $(use_enable cron) \
+ --disable-gtk-module \
+ $(use_enable introspection) \
+ $(use_enable networkmanager) \
+ $(use_enable nsplugin browser-plugin) \
+ $(use_enable pm-utils) \
+ --disable-qt \
+ $(use_enable static-libs static) \
+ $(use_enable test tests) \
+ $(use_enable udev device-rebind)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ dodoc AUTHORS MAINTAINERS NEWS README TODO || die "dodoc failed"
+ dodoc ChangeLog || 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
+
+ # Remove precompiled python modules, we handle byte compiling
+ rm -f "${D}/$(python_get_sitedir)"/${PN}*.py[co]
+
+ dobashcompletion "${S}/contrib/pk-completion.bash" ${PN}
+ # Remove bashcomp file installed by build-system
+ rm -f "${D}/bash_completion.d/pk-completion.bash"
+
+ # Remove unwanted PackageKit website stuff
+ rm -rf "${D}/usr/share/PackageKit/website"
+
+}
+
+pkg_postinst() {
+ python_mod_optimize ${PN/-base}
+
+ 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."
+ echo
+ ebeep
+ epause 5
+ fi
+ bash-completion_pkg_postinst
+}
+
+pkg_prerm() {
+ einfo "Removing downloaded files with ${MY_PN}..."
+ [[ -d "${ROOT}"/var/cache/${MY_PN}/downloads/ ]] && \
+ rm -rf /var/cache/PackageKit/downloads/*
+}
+
+pkg_postrm() {
+ python_mod_cleanup ${PN/-base}
+}
diff --git a/app-arch/file-roller/file-roller-3.0.2.ebuild b/app-arch/file-roller/file-roller-3.0.2.ebuild
index 19314d0..9bccd68 100644
--- a/app-arch/file-roller/file-roller-3.0.2.ebuild
+++ b/app-arch/file-roller/file-roller-3.0.2.ebuild
@@ -27,7 +27,7 @@ RDEPEND=">=dev-libs/glib-2.25.5:2
>=x11-libs/gtk+-3.0.2:3
sys-apps/file
nautilus? ( >=gnome-base/nautilus-2.22.2 )
- packagekit? ( app-portage/packagekit )
+ packagekit? ( app-admin/packagekit-base )
"
DEPEND="${RDEPEND}
sys-devel/gettext
diff --git a/app-arch/file-roller/file-roller-9999.ebuild b/app-arch/file-roller/file-roller-9999.ebuild
index 19314d0..9bccd68 100644
--- a/app-arch/file-roller/file-roller-9999.ebuild
+++ b/app-arch/file-roller/file-roller-9999.ebuild
@@ -27,7 +27,7 @@ RDEPEND=">=dev-libs/glib-2.25.5:2
>=x11-libs/gtk+-3.0.2:3
sys-apps/file
nautilus? ( >=gnome-base/nautilus-2.22.2 )
- packagekit? ( app-portage/packagekit )
+ packagekit? ( app-admin/packagekit-base )
"
DEPEND="${RDEPEND}
sys-devel/gettext
diff --git a/app-cdr/brasero/brasero-3.0.0.ebuild b/app-cdr/brasero/brasero-3.0.0.ebuild
index 453cfe0..93652a7 100644
--- a/app-cdr/brasero/brasero-3.0.0.ebuild
+++ b/app-cdr/brasero/brasero-3.0.0.ebuild
@@ -50,7 +50,7 @@ RDEPEND="${COMMON_DEPEND}
app-cdr/cdrdao
app-cdr/dvd+rw-tools
virtual/cdrtools )
- packagekit? ( app-portage/packagekit )"
+ packagekit? ( app-admin/packagekit-base )"
DEPEND="${COMMON_DEPEND}
app-text/gnome-doc-utils
dev-util/pkgconfig
diff --git a/app-cdr/brasero/brasero-9999.ebuild b/app-cdr/brasero/brasero-9999.ebuild
index 453cfe0..93652a7 100644
--- a/app-cdr/brasero/brasero-9999.ebuild
+++ b/app-cdr/brasero/brasero-9999.ebuild
@@ -50,7 +50,7 @@ RDEPEND="${COMMON_DEPEND}
app-cdr/cdrdao
app-cdr/dvd+rw-tools
virtual/cdrtools )
- packagekit? ( app-portage/packagekit )"
+ packagekit? ( app-admin/packagekit-base )"
DEPEND="${COMMON_DEPEND}
app-text/gnome-doc-utils
dev-util/pkgconfig
diff --git a/app-portage/packagekit/metadata.xml b/app-portage/packagekit/metadata.xml
deleted file mode 100644
index 56f5560..0000000
--- a/app-portage/packagekit/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>no-herd</herd>
- <maintainer>
- <email>volkmar@gentoo.org</email>
- <name>Mounir Lamouri</name>
- </maintainer>
- <use>
- <flag name="consolekit">
- Use sys-auth/consolekit to determine proxy settings
- </flag>
- <flag name="cron">Install cron script for auto-update</flag>
- <flag name="pm-utils">
- Add pm-utils (suspend/resume) functionalities
- </flag>
- <flag name="ruck">Build ruck (rug-like) client</flag>
- <flag name="static-libs">Compile static archives</flag>
- </use>
-</pkgmetadata>
-
diff --git a/app-portage/packagekit/packagekit-0.6.15.ebuild b/app-portage/packagekit/packagekit-0.6.15.ebuild
deleted file mode 100644
index 5962259..0000000
--- a/app-portage/packagekit/packagekit-0.6.15.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils multilib python nsplugins
-if [[ ${PV} = 9999 ]]; then
- inherit autotools git
-fi
-
-MY_PN="PackageKit"
-
-DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
-HOMEPAGE="http://www.packagekit.org/"
-
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${MY_PN}"
- KEYWORDS=""
- DEPEND=">=dev-util/gtk-doc-1.9"
- 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"
-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/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-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
-"
-RDEPEND="${CDEPEND}
- pm-utils? ( sys-power/pm-utils )
- >=app-portage/layman-1.2.3
- >=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
- 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
-
-# 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
-
-pkg_setup() {
- python_set_active_version 2
-}
-
-src_prepare() {
- if [[ ${PV} = 9999 ]]; then
- gtkdocize || die
- intltoolize --force || die
- eautoreconf
- fi
-
- # prevent pyc/pyo generation
- ln -sfn $(type -P true) py-compile
-}
-
-src_configure() {
- local myconf=""
-
- # 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
- # managed: failing (see UPSTREAM in ebuild header)
- econf \
- ${myconf} \
- --localstatedir=/var \
- --disable-dependency-tracking \
- --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 \
- --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 test tests) \
- $(use_enable udev device-rebind)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc ${DOCS} || die "dodoc failed"
-
- if use nsplugin; then
- src_mv_plugins /usr/$(get_libdir)/mozilla/plugins
- fi
-
- ebegin "Removing .la files"
- find "${D}" -name '*.la' -exec rm -f '{}' + || die
- eend
-}
-
-pkg_postinst() {
- python_mod_optimize ${PN}
-}
-
-pkg_prerm() {
- einfo "Removing downloaded files with ${MY_PN}..."
- [[ -d "${ROOT}"/var/cache/${MY_PN}/downloads/ ]] && \
- rm -rf /var/cache/PackageKit/downloads/*
-}
-
-pkg_postrm() {
- python_mod_cleanup ${PN}
-}
diff --git a/app-portage/packagekit/packagekit-0.6.16.ebuild b/app-portage/packagekit/packagekit-0.6.16.ebuild
deleted file mode 100644
index 1ee771f..0000000
--- a/app-portage/packagekit/packagekit-0.6.16.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils multilib python nsplugins
-if [[ ${PV} = 9999 ]]; then
- inherit autotools git
-fi
-
-MY_PN="PackageKit"
-
-DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
-HOMEPAGE="http://www.packagekit.org/"
-
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${MY_PN}"
- KEYWORDS=""
- DEPEND=">=dev-util/gtk-doc-1.9"
- DOCS="AUTHORS MAINTAINERS NEWS README TODO"
-else
- MY_P=${MY_PN}-${PV}
- 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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-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/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-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
-"
-RDEPEND="${CDEPEND}
- pm-utils? ( sys-power/pm-utils )
- >=app-portage/layman-1.2.3
- >=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
- 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
-
-# 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
-
-pkg_setup() {
- python_set_active_version 2
-}
-
-src_prepare() {
- if [[ ${PV} = 9999 ]]; then
- gtkdocize || die
- intltoolize --force || die
- eautoreconf
- fi
-
- # prevent pyc/pyo generation
- ln -sfn $(type -P true) py-compile
-}
-
-src_configure() {
- local myconf=""
-
- # 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
- # managed: failing (see UPSTREAM in ebuild header)
- econf \
- ${myconf} \
- --localstatedir=/var \
- --disable-dependency-tracking \
- --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 \
- --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 test tests) \
- $(use_enable udev device-rebind)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc ${DOCS} || die "dodoc failed"
-
- if use nsplugin; then
- src_mv_plugins /usr/$(get_libdir)/mozilla/plugins
- fi
-
- ebegin "Removing .la files"
- find "${D}" -name '*.la' -exec rm -f '{}' + || die
- eend
-}
-
-pkg_postinst() {
- python_mod_optimize ${PN}
-}
-
-pkg_prerm() {
- einfo "Removing downloaded files with ${MY_PN}..."
- [[ -d "${ROOT}"/var/cache/${MY_PN}/downloads/ ]] && \
- rm -rf /var/cache/PackageKit/downloads/*
-}
-
-pkg_postrm() {
- python_mod_cleanup ${PN}
-}
diff --git a/app-portage/packagekit/packagekit-9999.ebuild b/app-portage/packagekit/packagekit-9999.ebuild
deleted file mode 100644
index 1ee771f..0000000
--- a/app-portage/packagekit/packagekit-9999.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils multilib python nsplugins
-if [[ ${PV} = 9999 ]]; then
- inherit autotools git
-fi
-
-MY_PN="PackageKit"
-
-DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
-HOMEPAGE="http://www.packagekit.org/"
-
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${MY_PN}"
- KEYWORDS=""
- DEPEND=">=dev-util/gtk-doc-1.9"
- DOCS="AUTHORS MAINTAINERS NEWS README TODO"
-else
- MY_P=${MY_PN}-${PV}
- 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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-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/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-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
-"
-RDEPEND="${CDEPEND}
- pm-utils? ( sys-power/pm-utils )
- >=app-portage/layman-1.2.3
- >=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
- 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
-
-# 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
-
-pkg_setup() {
- python_set_active_version 2
-}
-
-src_prepare() {
- if [[ ${PV} = 9999 ]]; then
- gtkdocize || die
- intltoolize --force || die
- eautoreconf
- fi
-
- # prevent pyc/pyo generation
- ln -sfn $(type -P true) py-compile
-}
-
-src_configure() {
- local myconf=""
-
- # 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
- # managed: failing (see UPSTREAM in ebuild header)
- econf \
- ${myconf} \
- --localstatedir=/var \
- --disable-dependency-tracking \
- --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 \
- --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 test tests) \
- $(use_enable udev device-rebind)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc ${DOCS} || die "dodoc failed"
-
- if use nsplugin; then
- src_mv_plugins /usr/$(get_libdir)/mozilla/plugins
- fi
-
- ebegin "Removing .la files"
- find "${D}" -name '*.la' -exec rm -f '{}' + || die
- eend
-}
-
-pkg_postinst() {
- python_mod_optimize ${PN}
-}
-
-pkg_prerm() {
- einfo "Removing downloaded files with ${MY_PN}..."
- [[ -d "${ROOT}"/var/cache/${MY_PN}/downloads/ ]] && \
- rm -rf /var/cache/PackageKit/downloads/*
-}
-
-pkg_postrm() {
- python_mod_cleanup ${PN}
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.1.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.1.3.ebuild
index a41db6c..0e2613d 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.1.3.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.1.3.ebuild
@@ -51,7 +51,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
packagekit? (
|| ( sys-fs/udev[gudev]
sys-fs/udev[extras] )
- >=app-portage/packagekit-0.6.4
+ >=app-admin/packagekit-base-0.6.4
>=sys-power/upower-0.9.1 )
policykit? (
>=sys-auth/polkit-0.97
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index fb3b0ab..3893704 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -52,7 +52,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
packagekit? (
|| ( sys-fs/udev[gudev]
sys-fs/udev[extras] )
- >=app-portage/packagekit-0.6.4 )
+ >=app-admin/packagekit-base-0.6.4 )
policykit? (
>=sys-auth/polkit-0.97
>=sys-apps/dbus-1.1.2 )
diff --git a/gnome-base/nautilus/nautilus-3.1.3.ebuild b/gnome-base/nautilus/nautilus-3.1.3.ebuild
index e9f4eaf..961259a 100644
--- a/gnome-base/nautilus/nautilus-3.1.3.ebuild
+++ b/gnome-base/nautilus/nautilus-3.1.3.ebuild
@@ -46,7 +46,7 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
doc? ( >=dev-util/gtk-doc-1.4 )"
RDEPEND="${COMMON_DEPEND}
- packagekit? ( app-portage/packagekit )
+ packagekit? ( app-admin/packagekit-base )
sendto? ( !gnome-extra/nautilus-sendto )"
# For eautoreconf
# gnome-base/gnome-common
diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild
index 17c6313..801c6b8 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -46,7 +46,7 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
doc? ( >=dev-util/gtk-doc-1.4 )"
RDEPEND="${COMMON_DEPEND}
- packagekit? ( app-portage/packagekit )
+ packagekit? ( app-admin/packagekit-base )
sendto? ( !gnome-extra/nautilus-sendto )"
# For eautoreconf
# gnome-base/gnome-common
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0.ebuild
index 29c8ae7..0ddc8bb 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.0.0.ebuild
@@ -38,7 +38,7 @@ RDEPEND=">=dev-libs/glib-2.25.9:2
>=x11-libs/vte-0.25.1:2.90
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
- packagekit? ( app-portage/packagekit )
+ packagekit? ( app-admin/packagekit-base )
raw? ( media-gfx/exiv2 )
"
DEPEND="${RDEPEND}
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-2.32.0.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-2.32.0.ebuild
index b455309..73a8d3f 100644
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-2.32.0.ebuild
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-2.32.0.ebuild
@@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
IUSE="doc nls test udev"
RDEPEND="
- >=app-portage/packagekit-0.5.5
+ >=app-admin/packagekit-base-0.5.5[udev]
+ >=app-admin/packagekit-gtk-0.5.5
>=dev-libs/dbus-glib-0.73
>=dev-libs/glib-2.18.0:2
>=dev-libs/libunique-1:0
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.0.3.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.0.3.ebuild
index 66e2d02..04bc3cf 100644
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.0.3.ebuild
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.0.3.ebuild
@@ -22,7 +22,8 @@ RDEPEND="
>=x11-libs/libnotify-0.7.0
>=dev-libs/dbus-glib-0.73
- >=app-portage/packagekit-0.6.5[gtk]
+ >=app-admin/packagekit-base-0.6.5[udev]
+ >=app-admin/packagekit-gtk-0.6.5
>=gnome-base/gnome-menus-2.24.1
>=media-libs/libcanberra-0.10[gtk3]
>=sys-apps/dbus-1.1.2
diff --git a/status/portage-configs/package.keywords.gnome3 b/status/portage-configs/package.keywords.gnome3
index f62dd03..b32a024 100644
--- a/status/portage-configs/package.keywords.gnome3
+++ b/status/portage-configs/package.keywords.gnome3
@@ -9,12 +9,13 @@ gnome-base/gnome-core-libs
# Core
app-accessibility/orca
+app-admin/packagekit-base
+app-admin/packagekit-gtk
app-arch/file-roller
app-cdr/brasero
app-crypt/seahorse
app-crypt/seahorse-plugins
app-pda/libimobiledevice
-app-portage/packagekit
app-text/evince
app-text/poppler
dev-lang/orc
diff --git a/x11-libs/gtk+/gtk+-3.1.8.ebuild b/x11-libs/gtk+/gtk+-3.1.8.ebuild
index 6769611..1182825 100644
--- a/x11-libs/gtk+/gtk+-3.1.8.ebuild
+++ b/x11-libs/gtk+/gtk+-3.1.8.ebuild
@@ -79,7 +79,7 @@ DEPEND="${COMMON_DEPEND}
media-fonts/font-cursor-misc )"
RDEPEND="${COMMON_DEPEND}
!<gnome-base/gail-1000
- packagekit? ( app-portage/packagekit )"
+ packagekit? ( app-admin/packagekit-base )"
PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
strip_builddir() {
diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 6769611..1182825 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -79,7 +79,7 @@ DEPEND="${COMMON_DEPEND}
media-fonts/font-cursor-misc )"
RDEPEND="${COMMON_DEPEND}
!<gnome-base/gail-1000
- packagekit? ( app-portage/packagekit )"
+ packagekit? ( app-admin/packagekit-base )"
PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
strip_builddir() {
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-20 6:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-20 6:44 [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-settings-daemon/, app-portage/packagekit/, x11-libs/gtk+/, Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox