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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 99 insertions, 12 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/Manifest b/x11-libs/libwnck/Manifest
index 47d3cccf64af..0776661c08a9 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libwnck-2.26.2-automagic.patch 2148 RMD160 5705d787895196d4da79ec2999f805cbbb6da112 SHA1 36235c2506dd0a74aaebafd10889798c6fb926b2 SHA256 72c9de2cc8e9c83f3af6b399e21bf6a63fa2f1b7b3178deed2a7132bb8154b21
 DIST libwnck-2.20.3.tar.bz2 637507 RMD160 d7b198f5194ff442d2840cc05a73d23b3d819df2 SHA1 21a710e5ac221b73ce40616867ac2fba3a105647 SHA256 d5fc1d8b0202ad169052dcd50b283ed4fb30a4a7da9bbf0be462d2879535dd6a
 DIST libwnck-2.24.2.tar.bz2 693227 RMD160 47f8c3c7eaf3d0c4dccce32f8504022a228c582e SHA1 5293b1667bd1bc3f66eac2aa35f5ff0b34eed893 SHA256 35c12f983e64c88c37c261eb6b55b7c59a5ef4dbb04525162f0753ea8e9127f2
-DIST libwnck-2.26.1.tar.bz2 711253 RMD160 65672b78ec18ab7e3ac7726a9d261eb368cf4b50 SHA1 d1bda681b20a2a832de1cc57dda7524f97e8103f SHA256 53737b2bcc520d16d4a83517e2ec6ee52269cec2706a9b4cdb876615c525f430
 DIST libwnck-2.26.2.tar.bz2 684354 RMD160 5554e934419012400dfb293c7d906293028298cc SHA1 b941006e5edf2877f863c541d52485cd141f96da SHA256 fc38a8ef185828e6a9205f2489bd563d8f303655ba533ad6f640e2de8018983c
 EBUILD libwnck-2.20.3.ebuild 690 RMD160 138dadc4388a92d508e428bed1b4489c5d65608a SHA1 1e3f4427647353f57dec1e4b90be33692f9f70f2 SHA256 0b59c51b98b060151fed4ce02f81d1c489ceab264ac4ecbc84baa957b1c8fba9
 EBUILD libwnck-2.24.2.ebuild 773 RMD160 dfb092cfd5a53c00f3c514ac0b25e4d4ab5cbc33 SHA1 2f43be427334ae1ceb0ecccf3be6737d6e3e662d SHA256 48d9d9e5ed7c4942bc8696ef842e14ef8ff4ed0da6ba89863d8f6be903bd5f0f
-EBUILD libwnck-2.26.1.ebuild 767 RMD160 5c33588d23c04726a2773abbc898e59ec22eeb75 SHA1 edfaf2924dc7b448d8ebf5b6dbf712ef66f077a1 SHA256 0aabc9a36b7df631e4de5d50ee99932127ca10770a78e82aa0fe762b6f4bf4f6
+EBUILD libwnck-2.26.2-r1.ebuild 1197 RMD160 41a3bbada232e45f1fef223a203bbc4a421ae742 SHA1 fd0907dceebf496f47079b859142ca53101c7ccc SHA256 1fb1224911ae389b4d8c67406b6c8ee683a0fc651e7e1445feb81b9e45b3c4b2
 EBUILD libwnck-2.26.2.ebuild 785 RMD160 71aaabf2e4cae185f1da005c1cdab4668198c796 SHA1 8353ad2b7d59d172c6ec8f5fc79485d03cdfa77a SHA256 5a5f16da1a85293ffa566bbd46fd4c98459d8c46deeaf9cc8c1eb16e9cf2b9ea
-MISC ChangeLog 25750 RMD160 2ebd394c247cbaef27b57eb60982c03f31feb206 SHA1 3831353f40c9b9faad9a2545502ba3cf1c78c636 SHA256 231ca3ccb88b7c969fd903400a5a10ee58f9157a706aeff1e67069a15acb8cd0
+MISC ChangeLog 26029 RMD160 46d2be691c84fc72d2c36b0472484829597e3ce5 SHA1 ba8ae1dbbce0760d8343e37f0fb8d876989111b5 SHA256 ce259347aee4d9e11655a0d70d90433f5fb1ca41d529bba3b9baeb8d53df68ae
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpjhyMACgkQ1fmVwcYIWAZ1pwCgyoby/GRKCXwvkt1BsFXi7fuI
-jGwAn2AqWeLwoZgZ8iqRWN5X4BeHpSUL
-=2NbQ
+iEYEARECAAYFAkp99gcACgkQ1fmVwcYIWAZHuACcDI6Aj6i33oWx8SL0zH3f+Jwg
+n5oAoMeQss/S217uic3C8nKTFRXiMuC1
+=1/cZ
 -----END PGP SIGNATURE-----
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
+}