Version bump. Make startup-notification non-automagic, bug #278464. Clean up old revisions.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 93 insertions, 6 deletions

diff --git a/x11-libs/libwnck/ChangeLog b/x11-libs/libwnck/ChangeLog
index ba1b8a105620..ae833e6b9022 100644
--- a/x11-libs/libwnck/ChangeLog
+++ b/x11-libs/libwnck/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/libwnck
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.217 2009/07/19 20:50:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.218 2009/08/08 22:02:42 eva Exp $
+
+*libwnck-2.26.2-r1 (08 Aug 2009)
+
+  08 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -libwnck-2.26.1.ebuild, +libwnck-2.26.2-r1.ebuild,
+  +files/libwnck-2.26.2-automagic.patch:
+  Version bump. Make startup-notification non-automagic, bug #278464. Clean
+  up old revisions.
 
 *libwnck-2.26.2 (19 Jul 2009)
 
diff --git a/x11-libs/libwnck/files/libwnck-2.26.2-automagic.patch b/x11-libs/libwnck/files/libwnck-2.26.2-automagic.patch
new file mode 100644
index 000000000000..fa65c8c99241
--- /dev/null
+++ b/x11-libs/libwnck/files/libwnck-2.26.2-automagic.patch
@@ -0,0 +1,59 @@
+From e02c2e1e79a3687865266bdbd28318b263f9b381 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 8 Aug 2009 23:34:01 +0200
+Subject: [PATCH] Make startup-notification non-automagic
+
+See description at http://www.gentoo.org/proj/en/qa/automagic.xml
+
+This patch makes startup-notification properly switchable at configure
+time while retaining auto-detection capability.
+
+Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=278464
+---
+ configure.in |   30 +++++++++++++++++++++---------
+ 1 files changed, 21 insertions(+), 9 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 731ac3f..75fad2d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -82,15 +82,27 @@ AC_SUBST(wncklocaledir)
+ 
+ AC_PATH_PROG(PKG_CONFIG, pkg-config)
+ 
+-AC_MSG_CHECKING([if building with libstartup-notification])
+-STARTUP_NOTIFICATION_REQUIRED=0.4
+-if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_REQUIRED libstartup-notification-1.0; then
+-  AC_MSG_RESULT([yes])
+-  AC_DEFINE_UNQUOTED(HAVE_STARTUP_NOTIFICATION, 1, [Define if you have libstartup-notification])
+-  STARTUP_NOTIFICATION_PACKAGE=libstartup-notification-1.0
+-else
+-  AC_MSG_RESULT([no])
+-  STARTUP_NOTIFICATION_PACKAGE=
++AC_ARG_ENABLE(startup-notification,
++              [AC_HELP_STRING([--enable-startup-notification],
++                              [startup notification library @<:@default=auto@:>@])],,
++              [enable_startup_notification=auto])
++
++STARTUP_NOTIFICATION_PACKAGE=
++if test "$enable_startup_notification" != "no"; then
++   STARTUP_NOTIFICATION_REQUIRED=0.4
++   PKG_CHECK_MODULES(STARTUP_NOTIFICATION,
++      [libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_REQUIRED],
++      [have_sn=yes]
++      [have_sn=no])
++
++   if test "$have_sn" = "no" -a "$enable_start_notification" = "yes"; then
++      AC_MSG_ERROR([startup-notification support required but not found])
++   fi
++
++   if test "$have_sn" = "yes"; then
++      AC_DEFINE_UNQUOTED(HAVE_STARTUP_NOTIFICATION, 1, [Define if you have libstartup-notification])
++      STARTUP_NOTIFICATION_PACKAGE=libstartup-notification-1.0
++   fi
+ fi
+ AC_SUBST(STARTUP_NOTIFICATION_PACKAGE)
+ 
+-- 
+1.6.3.3
+
diff --git a/x11-libs/libwnck/libwnck-2.26.1.ebuild b/x11-libs/libwnck/libwnck-2.26.2-r1.ebuild
index f61b23968456..5b33574bfcd9 100644
--- a/x11-libs/libwnck/libwnck-2.26.1.ebuild
+++ b/x11-libs/libwnck/libwnck-2.26.2-r1.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.26.1.ebuild,v 1.1 2009/05/04 22:35:25 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.26.2-r1.ebuild,v 1.1 2009/08/08 22:02:42 eva Exp $
 
-inherit gnome2 eutils
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit autotools gnome2 eutils
 
 DESCRIPTION="A window navigation construction kit"
 HOMEPAGE="http://www.gnome.org/"
@@ -10,18 +13,35 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
+IUSE="doc startup-notification"
 
 RDEPEND=">=x11-libs/gtk+-2.11.3
 	>=dev-libs/glib-2.16.0
-	>=x11-libs/startup-notification-0.4
 	x11-libs/libX11
 	x11-libs/libXres
-	x11-libs/libXext"
+	x11-libs/libXext
+	startup-notification? ( >=x11-libs/startup-notification-0.4 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.40
+	dev-util/gtk-doc-am
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable startup-notification)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix automagic startup-notification, bug #278464
+	epatch "${FILESDIR}"/${P}-automagic.patch
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	AT_M4DIR="m4" eautoreconf
+}