version bump to 0.8.15, drop old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key ADC916E5)

7 files changed, 171 insertions, 261 deletions

diff --git a/app-admin/packagekit-base/ChangeLog b/app-admin/packagekit-base/ChangeLog
index a6a4d55814ec..526cf53e9376 100644
--- a/app-admin/packagekit-base/ChangeLog
+++ b/app-admin/packagekit-base/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/packagekit-base
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/ChangeLog,v 1.31 2013/07/21 10:41:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/ChangeLog,v 1.32 2013/12/18 05:12:15 lxnay Exp $
+
+*packagekit-base-0.8.15 (18 Dec 2013)
+
+  18 Dec 2013; Fabio Erculiani <lxnay@gentoo.org>
+  -packagekit-base-0.6.22.ebuild, +packagekit-base-0.8.15.ebuild,
+  +files/0001-entropy-PackageKitEntropyClient.output-API-update.patch,
+  -files/packagekit-base-0.6.22-npapi-sdk.patch,
+  +files/packagekit-base-0.8.x-npapi-sdk.patch, metadata.xml:
+  version bump to 0.8.15, drop old
 
   21 Jul 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   connman is a global USE flag now
diff --git a/app-admin/packagekit-base/files/0001-entropy-PackageKitEntropyClient.output-API-update.patch b/app-admin/packagekit-base/files/0001-entropy-PackageKitEntropyClient.output-API-update.patch
new file mode 100644
index 000000000000..e24faeec9a50
--- /dev/null
+++ b/app-admin/packagekit-base/files/0001-entropy-PackageKitEntropyClient.output-API-update.patch
@@ -0,0 +1,26 @@
+From ee2dfacb275e8145c7ae1ba8da86779054adf902 Mon Sep 17 00:00:00 2001
+From: Fabio Erculiani <lxnay@sabayon.org>
+Date: Fri, 6 Dec 2013 07:40:15 +0100
+Subject: [PATCH] entropy: PackageKitEntropyClient.output API update
+
+---
+ backends/entropy/entropyBackend.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/backends/entropy/entropyBackend.py b/backends/entropy/entropyBackend.py
+index 57b6c59..bec8ef6 100755
+--- a/backends/entropy/entropyBackend.py
++++ b/backends/entropy/entropyBackend.py
+@@ -776,7 +776,8 @@ class PackageKitEntropyClient(Client):
+     def init_singleton(self):
+         Client.init_singleton(self, url_fetcher = PkUrlFetcher)
+ 
+-    def output(self, text, header = "", footer = "", back = False,
++    @classmethod
++    def output(cls, text, header = "", footer = "", back = False,
+         importance = 0, level = "info", count = None, percent = False):
+         """
+         Reimplemented from entropy.output.TextInterface.
+-- 
+1.8.4.4
+
diff --git a/app-admin/packagekit-base/files/packagekit-base-0.6.22-npapi-sdk.patch b/app-admin/packagekit-base/files/packagekit-base-0.6.22-npapi-sdk.patch
deleted file mode 100644
index 7b074d739ff4..000000000000
--- a/app-admin/packagekit-base/files/packagekit-base-0.6.22-npapi-sdk.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- PackageKit-0.6.22.orig/configure
-+++ PackageKit-0.6.22/configure
-@@ -20504,7 +20504,7 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS";
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
--			  mozilla-plugin >= 8.0	\\
-+			  npapi-sdk		\\
- 			  gio-unix-2.0		\\
- 			  nspr >= 4.8		\\
- 			  cairo			\\
-@@ -20512,7 +20512,7 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS";
- 			  gtk+-2.0 >= 2.14.0	\\
- 			  dbus-glib-1\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "\
--			  mozilla-plugin >= 8.0	\
-+			  npapi-sdk		\
- 			  gio-unix-2.0		\
- 			  nspr >= 4.8		\
- 			  cairo			\
-@@ -20523,7 +20523,7 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS";
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_PK_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "\
--			  mozilla-plugin >= 8.0	\
-+			  npapi-sdk		\
- 			  gio-unix-2.0		\
- 			  nspr >= 4.8		\
- 			  cairo			\
-@@ -20541,7 +20541,7 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; th
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
--			  mozilla-plugin >= 8.0	\\
-+			  npapi-sdk		\\
- 			  gio-unix-2.0		\\
- 			  nspr >= 4.8		\\
- 			  cairo			\\
-@@ -20549,7 +20549,7 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; th
- 			  gtk+-2.0 >= 2.14.0	\\
- 			  dbus-glib-1\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "\
--			  mozilla-plugin >= 8.0	\
-+			  npapi-sdk	\
- 			  gio-unix-2.0		\
- 			  nspr >= 4.8		\
- 			  cairo			\
-@@ -20560,7 +20560,7 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; th
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_PK_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "\
--			  mozilla-plugin >= 8.0	\
-+			  npapi-sdk		\
- 			  gio-unix-2.0		\
- 			  nspr >= 4.8		\
- 			  cairo			\
-@@ -20587,7 +20587,7 @@ else
- fi
-         if test $_pkg_short_errors_supported = yes; then
- 	        PK_BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
--			  mozilla-plugin >= 8.0	\
-+			  npapi-sdk		\
- 			  gio-unix-2.0		\
- 			  nspr >= 4.8		\
- 			  cairo			\
-@@ -20596,7 +20596,7 @@ fi
- 			  dbus-glib-1" 2>&1`
-         else
- 	        PK_BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
--			  mozilla-plugin >= 8.0	\
-+			  npapi-sdk		\
- 			  gio-unix-2.0		\
- 			  nspr >= 4.8		\
- 			  cairo			\
diff --git a/app-admin/packagekit-base/files/packagekit-base-0.8.x-npapi-sdk.patch b/app-admin/packagekit-base/files/packagekit-base-0.8.x-npapi-sdk.patch
new file mode 100644
index 000000000000..59b3ab109648
--- /dev/null
+++ b/app-admin/packagekit-base/files/packagekit-base-0.8.x-npapi-sdk.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 3e8d301..7ba7f4b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -361,7 +361,7 @@ AC_ARG_ENABLE(browser_plugin, AS_HELP_STRING([--enable-browser-plugin],[Build br
+ 	      enable_browser_plugin=$enableval,enable_browser_plugin=yes)
+ if test x$enable_browser_plugin = xyes; then
+ 	PKG_CHECK_MODULES(PK_BROWSER_PLUGIN,	\
+-			  mozilla-plugin >= 8.0	\
++			  npapi-sdk		\
+ 			  gio-unix-2.0		\
+ 			  nspr >= 4.8		\
+ 			  cairo			\
diff --git a/app-admin/packagekit-base/metadata.xml b/app-admin/packagekit-base/metadata.xml
index fe2a73664415..a63ea63df605 100644
--- a/app-admin/packagekit-base/metadata.xml
+++ b/app-admin/packagekit-base/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Fabio Erculiani</name>
 	</maintainer>
 	<use>
+		<flag name="command-not-found">Enable packagekit support on shell "command not found"</flag>
 		<flag name="cron">Install cron script for auto-update</flag>
 		<flag name="entropy">
 			Enable Entropy backend
diff --git a/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild b/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild
deleted file mode 100644
index eee8c9ae5cbf..000000000000
--- a/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2012 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.22.ebuild,v 1.5 2012/12/31 18:23:37 ago Exp $
-
-EAPI="3"
-
-# 0.6.x doesn't work with Python 3.x
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python nsplugins bash-completion-r1
-
-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 ~arm ~ia64 ~mips ~ppc ~ppc64 ~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? ( virtual/udev[gudev] )
-	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-misc/npapi-sdk-0.27.1 )
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35.0
-	virtual/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_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
-# >=npapi-sdk-0.27.1 has slightly changed API, once it is unmasked in tree
-# drop the npapi-api-change patch below and relax the dependency constraints
-
-# UPSTREAM:
-# documentation/website with --enable-doc-install
-# failing tests
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.6.22-npapi-sdk.patch #383141
-	epatch "${FILESDIR}"/${PN}-0.7.x-npapi-api-change.patch #416711
-}
-
-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 connman) \
-		$(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
-		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
-		mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
-			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
-	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]
-
-	newbashcomp "${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-admin/packagekit-base/packagekit-base-0.8.15.ebuild b/app-admin/packagekit-base/packagekit-base-0.8.15.ebuild
new file mode 100644
index 000000000000..cf148290dcfb
--- /dev/null
+++ b/app-admin/packagekit-base/packagekit-base-0.8.15.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2013 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.8.15.ebuild,v 1.1 2013/12/18 05:12:15 lxnay Exp $
+
+EAPI="5"
+
+# PackageKit supports 3.2+, but entropy and portage backends are untested
+# Future note: use --enable-python3
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils autotools multilib python-single-r1 nsplugins bash-completion-r1
+
+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="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="connman cron command-not-found doc +introspection networkmanager nsplugin entropy static-libs systemd udev"
+
+CDEPEND="connman? ( net-misc/connman )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.9[${PYTHON_USEDEP}] )
+	networkmanager? ( >=net-misc/networkmanager-0.6.4 )
+	nsplugin? (
+		>=dev-libs/nspr-4.8
+		x11-libs/cairo
+		>=x11-libs/gtk+-2.14.0:2
+		x11-libs/pango
+	)
+	udev? ( virtual/udev[gudev] )
+	dev-db/sqlite:3
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.32.0:2[${PYTHON_USEDEP}]
+	>=sys-auth/polkit-0.98
+	>=sys-apps/dbus-1.3.0
+	${PYTHON_DEPS}"
+DEPEND="${CDEPEND}
+	doc? ( dev-util/gtk-doc[${PYTHON_USEDEP}] )
+	nsplugin? ( >=net-misc/npapi-sdk-0.27 )
+	systemd? ( >=sys-apps/systemd-204 )
+	dev-libs/libxslt[${PYTHON_USEDEP}]
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+RDEPEND="${CDEPEND}
+	entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] )
+	>=app-portage/layman-1.2.3[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.2[${PYTHON_USEDEP}]"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.8.x-npapi-sdk.patch #383141
+
+	# Upstreamed patches
+	epatch "${FILESDIR}/0001-entropy-PackageKitEntropyClient.output-API-update.patch"
+
+	epatch_user
+
+	# npapi-sdk patch and epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(test -n "${LINGUAS}" && echo -n "--enable-nls" || echo -n "--disable-nls") \
+		--enable-introspection=$(use introspection && echo -n "yes" || echo -n "no") \
+		--localstatedir=/var \
+		--enable-bash-completion \
+		--disable-dependency-tracking \
+		--enable-option-checking \
+		--enable-libtool-lock \
+		--disable-local \
+		--with-default-backend=$(use entropy && echo -n "entropy" || echo -n "portage") \
+		$(use_enable doc gtk-doc) \
+		$(use_enable command-not-found) \
+		--disable-debuginfo-install \
+		--disable-gstreamer-plugin \
+		--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 static-libs static) \
+		$(use_enable systemd) \
+		$(use_enable systemd systemd-updates) \
+		$(use_enable connman)
+}
+
+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
+		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
+		mv "${D}/usr/$(get_libdir)/mozilla/plugins"/* \
+			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/" || die
+	fi
+
+	if ! use static-libs; then
+		prune_libtool_files --all
+	fi
+}