version bump

(Portage version: 2.2.0_alpha104_p26/cvs/Linux x86_64)

3 files changed, 40 insertions, 45 deletions

diff --git a/app-admin/packagekit-base/ChangeLog b/app-admin/packagekit-base/ChangeLog
index 868132cd370b..b7a2bb0b687c 100644
--- a/app-admin/packagekit-base/ChangeLog
+++ b/app-admin/packagekit-base/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/packagekit-base
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/ChangeLog,v 1.19 2012/05/09 15:21:35 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/ChangeLog,v 1.20 2012/05/19 11:21:34 lxnay Exp $
+
+*packagekit-base-0.6.22 (19 May 2012)
+
+  19 May 2012; Fabio Erculiani <lxnay@gentoo.org>
+  -packagekit-base-0.6.20.ebuild, +packagekit-base-0.6.22.ebuild,
+  +files/packagekit-base-0.6.22-npapi-sdk.patch,
+  -files/packagekit-base-0.6.x-npapi-sdk.patch:
+  version bump
 
   09 May 2012; Matt Turner <mattst88@gentoo.org> packagekit-base-0.6.20.ebuild:
   Added ~mips, bug 387959.
diff --git a/app-admin/packagekit-base/files/packagekit-base-0.6.x-npapi-sdk.patch b/app-admin/packagekit-base/files/packagekit-base-0.6.22-npapi-sdk.patch
index 47de0b3106b9..7b074d739ff4 100644
--- a/app-admin/packagekit-base/files/packagekit-base-0.6.x-npapi-sdk.patch
+++ b/app-admin/packagekit-base/files/packagekit-base-0.6.22-npapi-sdk.patch
@@ -1,87 +1,74 @@
-http://bugs.gentoo.org/383141
-
---- configure
-+++ configure
-@@ -20389,7 +20389,7 @@
+--- 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	\\
+-			  mozilla-plugin >= 8.0	\\
 +			  npapi-sdk		\\
  			  gio-unix-2.0		\\
- 			  nspr \\
+ 			  nspr >= 4.8		\\
  			  cairo			\\
-@@ -20397,7 +20397,7 @@
+@@ -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	\
+-			  mozilla-plugin >= 8.0	\
 +			  npapi-sdk		\
  			  gio-unix-2.0		\
- 			  nspr \
+ 			  nspr >= 4.8		\
  			  cairo			\
-@@ -20408,7 +20408,7 @@
+@@ -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	\
+-			  mozilla-plugin >= 8.0	\
 +			  npapi-sdk		\
  			  gio-unix-2.0		\
- 			  nspr \
+ 			  nspr >= 4.8		\
  			  cairo			\
-@@ -20426,7 +20426,7 @@
+@@ -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	\\
+-			  mozilla-plugin >= 8.0	\\
 +			  npapi-sdk		\\
  			  gio-unix-2.0		\\
- 			  nspr \\
+ 			  nspr >= 4.8		\\
  			  cairo			\\
-@@ -20434,7 +20434,7 @@
+@@ -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	\
-+			  npapi-sdk		\
+-			  mozilla-plugin >= 8.0	\
++			  npapi-sdk	\
  			  gio-unix-2.0		\
- 			  nspr \
+ 			  nspr >= 4.8		\
  			  cairo			\
-@@ -20445,7 +20445,7 @@
+@@ -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	\
+-			  mozilla-plugin >= 8.0	\
 +			  npapi-sdk		\
  			  gio-unix-2.0		\
- 			  nspr \
+ 			  nspr >= 4.8		\
  			  cairo			\
-@@ -20472,7 +20472,7 @@
+@@ -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	\
+-			  mozilla-plugin >= 8.0	\
 +			  npapi-sdk		\
  			  gio-unix-2.0		\
- 			  nspr \
+ 			  nspr >= 4.8		\
  			  cairo			\
-@@ -20481,7 +20481,7 @@
+@@ -20596,7 +20596,7 @@ fi
  			  dbus-glib-1" 2>&1`
          else
  	        PK_BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
--			  mozilla-plugin	\
-+			  npapi-sdk		\
- 			  gio-unix-2.0		\
- 			  nspr \
- 			  cairo			\
---- configure.ac
-+++ configure.ac
-@@ -355,7 +355,7 @@
- 	      enable_browser_plugin=$enableval,enable_browser_plugin=yes)
- if test x$enable_browser_plugin = xyes; then
- 	PKG_CHECK_MODULES(PK_BROWSER_PLUGIN,	\
--			  mozilla-plugin	\
+-			  mozilla-plugin >= 8.0	\
 +			  npapi-sdk		\
  			  gio-unix-2.0		\
- 			  nspr \
+ 			  nspr >= 4.8		\
  			  cairo			\
diff --git a/app-admin/packagekit-base/packagekit-base-0.6.20.ebuild b/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild
index 7b2dd9011eff..87702e81e96a 100644
--- a/app-admin/packagekit-base/packagekit-base-0.6.20.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild
@@ -1,13 +1,13 @@
 # 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.20.ebuild,v 1.8 2012/05/09 15:21:35 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild,v 1.1 2012/05/19 11:21:34 lxnay Exp $
 
 EAPI="3"
 
 # 0.6.x doesn't work with Python 3.x
 PYTHON_DEPEND="2"
 
-inherit eutils multilib python nsplugins bash-completion
+inherit eutils multilib python nsplugins bash-completion-r1
 
 MY_PN="PackageKit"
 MY_P=${MY_PN}-${PV}
@@ -71,7 +71,7 @@ RESTRICT="test" # tests are failing atm
 # failing tests
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.6.x-npapi-sdk.patch #383141
+	epatch "${FILESDIR}"/${PN}-0.6.22-npapi-sdk.patch #383141
 }
 
 src_configure() {
@@ -147,7 +147,7 @@ src_install() {
 	# Remove precompiled python modules, we handle byte compiling
 	rm -f "${D}/$(python_get_sitedir)"/${PN}*.py[co]
 
-	dobashcompletion "${S}/contrib/pk-completion.bash" ${PN}
+	newbashcomp "${S}/contrib/pk-completion.bash" ${PN}
 	# Remove bashcomp file installed by build-system
 	rm -f "${D}/bash_completion.d/pk-completion.bash"