Version bump. 0.5 for last of gtk+:2 only release and 0.7 for testing API breakages, bug #340501. Add knotify to PDEPEND, bug #323593.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

7 files changed, 239 insertions, 24 deletions

diff --git a/x11-libs/libnotify/ChangeLog b/x11-libs/libnotify/ChangeLog
index 1c35c1490313..4c9996f77597 100644
--- a/x11-libs/libnotify/ChangeLog
+++ b/x11-libs/libnotify/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/libnotify
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/ChangeLog,v 1.56 2010/12/03 22:57:11 wired Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/ChangeLog,v 1.57 2011/01/24 23:48:36 eva Exp $
+
+*libnotify-0.7.1 (24 Jan 2011)
+*libnotify-0.5.2 (24 Jan 2011)
+
+  24 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org> libnotify-0.4.5.ebuild,
+  +libnotify-0.5.2.ebuild, +libnotify-0.7.1.ebuild,
+  +files/libnotify-0.7.1-gtk3-tests.patch, metadata.xml:
+  Version bump. 0.5 for last of gtk+:2 only release and 0.7 for testing API
+  breakages, bug #340501. Add knotify to PDEPEND, bug #323593.
 
   03 Dec 2010; Alex Alexander <wired@gentoo.org> libnotify-0.4.5.ebuild:
   added x11-wm/awesome to PDEPEND, bug #342259
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index e503549f6f7e..691defac304b 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -1,24 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX libnotify-0.7.1-gtk3-tests.patch 3002 RMD160 837d18ed7017814328ae1cdd2138671ef6ad6188 SHA1 3046d86237eb026ca8356ee589df50f5d315a1d0 SHA256 d9ee539a58a30ccd213b9857003c2ba04a0cf343763ed566ca0d769cbfc34664
 DIST libnotify-0.4.5.tar.gz 364142 RMD160 6ddf4feb50504012c5f5fd205123d9f27cb12ef6 SHA1 e0a3be6249978ae2eb18bb77cdd22763271dc904 SHA256 0799db8ea1500b65a477421a8c930cc8c8b0bbc0596e55ea1601e2542f3fb0d9
-EBUILD libnotify-0.4.5.ebuild 954 RMD160 6376c9fdbfc2fe4d4d2d922e07df387eb2f80250 SHA1 59804b65f58b9f66c7a3dba3a8429a41b6492b98 SHA256 3b1774613542f32970f9b90c64fab4470d0c622a3efbce7905bdd20c5bdde389
-MISC ChangeLog 7205 RMD160 ccd6584137647c691aa6dd73d7c714e69b6df1c0 SHA1 ac38ed20ea83a495f9d79cf64232adf9818cc3b9 SHA256 36fa3fe895222dd2b8d899b086b7d8546a1fa196e9f6f8f5cf7184734632ce6c
-MISC metadata.xml 165 RMD160 f8f7dd761c5475651b8e04512e4f3dd043c41984 SHA1 47939c027699c5810cd3f25b4698719e9bd183d2 SHA256 dc2ad50713441100082e32ba283e9dd807b8fc46f69a5b9221fb9b89064deb31
+DIST libnotify-0.5.2.tar.bz2 310439 RMD160 97c7d295683d6a093e46611d354fe8bfd799fb7d SHA1 bb088a318cfccb4261674065838860fa940fc04a SHA256 1f6f1a2d6a0e009997c7ed31f6197f9bf09e9b45fb9cd54acabceea951d99062
+DIST libnotify-0.7.1.tar.bz2 319816 RMD160 ce99f10ac62832d09b8dce74ba477fb62cfba215 SHA1 323d14a5d5375a9b658a57eec4e91a1a19d52c71 SHA256 84dc2a77defb25521d2f1cb7ac34b4d23b55254ba361442658430efb928536c8
+EBUILD libnotify-0.4.5.ebuild 971 RMD160 d1432835b5b2cdb1a120e2a469895b2f0ba6bd8f SHA1 98428d986a04e4997ff1970a171eee75477a9bb2 SHA256 f85a8e30f88e4f47077bb45225e68dc278019efea1f4cfff619938e5658ae73e
+EBUILD libnotify-0.5.2.ebuild 963 RMD160 a23ba26aa337e83fac252eca43461b95efc3716a SHA1 eee88b6e5c766108de0589f50cf3f7890855f3e7 SHA256 9694a1ba0ccc350a932af680b830c11a25e5e60f5ab03ab6978ab8f8e81243bd
+EBUILD libnotify-0.7.1.ebuild 1454 RMD160 e137f1a173c8ca292ce1c43a1bf37b9ac3f66a92 SHA1 f3b20e35e9f018c19f0fb388551f728f0fe40cea SHA256 4d7af67733c5800d476fa22f9582a333f9e369e161dbdc6a1665ec014eb94e6a
+MISC ChangeLog 7593 RMD160 0499837e2a50f8575c27816b09d976bd6519ac95 SHA1 03a1625b30bd68d6526641d5d6f5fbb7f4879423 SHA256 27d7d4fe5bfe097b2ee8b6ce2d5c6e8e2e5b83a4159278597401847970cdc15a
+MISC metadata.xml 280 RMD160 eb9fb7d60a900109c8a342ae4892a768c18cb846 SHA1 d0c617964f30c9f28817bcf8871018cb0d797888 SHA256 4609b8a9d20b2360573b1da47869971dc0aa1849cf8eb056a7c1c96809ff9f85
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJM+XXzAAoJEDZF8K7rm0r6gBkP/1WsS8haU+g9Bwe9b4k+BHKA
-sQLrCX0I0pMDNBJoCvjcNuTEREDIuRAfZT7iQF/yr3tZ3JA/ODHVZk8n6jzFdLfT
-Tdb3o0SdxjJKljXHs1cFPsvFtYub9PVUVweO3TFjTCDW5Fcgr1OBPJSz8xxp34K2
-+jyXvncb+ombdZO0G0dkKT/NYTsm6plXy51YM4wQ1zg4l56hc8z+dmY5M2CV1dxb
-EZ+yrF7eVqq3g6IBxCkV2eLGPzU/8Noap1SoT2/b//GaWVfhFfwP2IqSouEVhjoj
-2uP/a9x+RXyme+x4ECZEv9GrIKjjkCisXxE8r/q1N2yVJvu9iNVUSMkxsU2Cg2Tx
-pQcwK2rx8udMvHzY2B64kxCzfxyxlXNDDfd8aLUfpDdL7aeb2h9TmbHcPnh3m+GP
-ODi6lYb4Q/5DkIA3kNZqjh4mlxgX35Y3JrOB/UpYJiVMgbCHBPCzPvtqYf6xxlxy
-MmJNRlnpzcwIMPGObN9xi3mDXKtASHozfpXOonDGmcWn8skl67fSJ7K4EdAW6J8j
-cKl8peSAJmUfWgx7KGmN1nB67A+KWnGLCKwsHjJZ6jSRceI91+WJ/pNXaWCquXEx
-uptMbnDY96iW5JL5hKtRPFzlBP6F3Ioxc7BHoX55uMFaRBxGs55YQ56rLgKYoCU2
-C/wIwc22U3HxGWiK1Q9M
-=T/LU
+iEYEARECAAYFAk0+D9kACgkQ1fmVwcYIWAaqdwCgjlFoj45d9tMViOTl73o9DTJT
+xbEAoMqQkH8niZt+LCLt8XkxawZYSdq2
+=VaIa
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libnotify/files/libnotify-0.7.1-gtk3-tests.patch b/x11-libs/libnotify/files/libnotify-0.7.1-gtk3-tests.patch
new file mode 100644
index 000000000000..7d1230520366
--- /dev/null
+++ b/x11-libs/libnotify/files/libnotify-0.7.1-gtk3-tests.patch
@@ -0,0 +1,110 @@
+From 92983cacd36fa9b050f911bc4de09b8c4fb9f3b2 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Thu, 16 Dec 2010 00:01:13 +0100
+Subject: [PATCH] gentoo: do not build gtk+:3 tests if not required
+
+---
+ configure.ac      |    5 +++++
+ tests/Makefile.am |   30 +++++++++++++++++-------------
+ 2 files changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 71609ed..7767c5b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -97,10 +97,15 @@ AC_SUBST(PACKAGE_LIBS)
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(pkg_modules)
+ 
++AC_ARG_ENABLE([tests],
++	AS_HELP_STRING([--enable-tests], [Check for extra dependencies to build all tests]))
++AS_IF([test $enable_tests = yes], [
+ tests_modules="gtk+-3.0 >= $REQ_GTK_VERSION"
+ PKG_CHECK_MODULES(TESTS, [$tests_modules])
++])
+ AC_SUBST(TESTS_LIBS)
+ AC_SUBST(TESTS_CFLAGS)
++AM_CONDITIONAL([MORE_TESTS], [test $enable_tests = yes])
+ 
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+ AC_SUBST(GLIB_GENMARSHAL)
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 7acf9a3..2856a82 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -2,18 +2,15 @@ INCLUDES = \
+ 	-I$(top_srcdir) \
+ 	$(TESTS_CFLAGS)
+ 
+-noinst_PROGRAMS = \
++check_PROGRAMS = \
+ 	test-replace \
+-	test-replace-widget \
+ 	test-server-info \
+ 	test-default-action \
+ 	test-multi-actions \
+ 	test-action-icons \
+-	test-image \
+ 	test-basic \
+ 	test-error \
+ 	test-markup \
+-	test-persistence \
+ 	test-resident \
+ 	test-rtl \
+ 	test-size-changes \
+@@ -23,6 +20,22 @@ noinst_PROGRAMS = \
+ 	test-xy-actions \
+ 	test-xy-stress
+ 
++#if MORE_TESTS
++check_PROGRAMS += \
++	test-image \
++	test-replace-widget \
++	test-persistence
++
++test_replace_widget_SOURCES = test-replace-widget.c
++test_replace_widget_LDADD  = $(common_ldflags)
++
++test_image_SOURCES = test-image.c
++test_image_LDADD  = $(common_ldflags)
++
++test_persistence_SOURCES = test-persistence.c
++test_persistence_LDADD = $(common_ldflags)
++#endif
++
+ common_ldflags = \
+ 	$(top_builddir)/libnotify/libnotify.la \
+ 	$(TESTS_LIBS)
+@@ -30,9 +43,6 @@ common_ldflags = \
+ test_replace_SOURCES = test-replace.c
+ test_replace_LDADD  = $(common_ldflags)
+ 
+-test_replace_widget_SOURCES = test-replace-widget.c
+-test_replace_widget_LDADD  = $(common_ldflags)
+-
+ test_server_info_SOURCES = test-server-info.c
+ test_server_info_LDADD   = $(common_ldflags)
+ 
+@@ -48,9 +58,6 @@ test_multi_actions_LDADD  = $(common_ldflags)
+ test_action_icons_SOURCES = test-action-icons.c
+ test_action_icons_LDADD  = $(common_ldflags)
+ 
+-test_image_SOURCES = test-image.c
+-test_image_LDADD  = $(common_ldflags)
+-
+ test_basic_SOURCES = test-basic.c
+ test_basic_LDADD = $(common_ldflags)
+ 
+@@ -75,9 +82,6 @@ test_xy_stress_LDADD = $(common_ldflags)
+ test_rtl_SOURCES = test-rtl.c
+ test_rtl_LDADD = $(common_ldflags)
+ 
+-test_persistence_SOURCES = test-persistence.c
+-test_persistence_LDADD = $(common_ldflags)
+-
+ test_resident_SOURCES = test-resident.c
+ test_resident_LDADD = $(common_ldflags)
+ 
+-- 
+1.7.4.rc2
+
diff --git a/x11-libs/libnotify/libnotify-0.4.5.ebuild b/x11-libs/libnotify/libnotify-0.4.5.ebuild
index 12dc3061f5e4..030fbaf74ce0 100644
--- a/x11-libs/libnotify/libnotify-0.4.5.ebuild
+++ b/x11-libs/libnotify/libnotify-0.4.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.4.5.ebuild,v 1.16 2010/12/03 22:57:11 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.4.5.ebuild,v 1.17 2011/01/24 23:48:36 eva Exp $
 
 EAPI=2
 
@@ -18,9 +18,12 @@ RDEPEND=">=x11-libs/gtk+-2.6:2
 	>=dev-libs/dbus-glib-0.76"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
-PDEPEND="|| ( x11-misc/notification-daemon
+PDEPEND="|| (
+	x11-misc/notification-daemon
 	xfce-extra/xfce4-notifyd
-	>=x11-wm/awesome-3.4.4 )"
+	>=x11-wm/awesome-3.4.4
+	kde-base/knotify
+)"
 
 src_configure() {
 	econf \
diff --git a/x11-libs/libnotify/libnotify-0.5.2.ebuild b/x11-libs/libnotify/libnotify-0.5.2.ebuild
new file mode 100644
index 000000000000..187d2fe41eab
--- /dev/null
+++ b/x11-libs/libnotify/libnotify-0.5.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.5.2.ebuild,v 1.1 2011/01/24 23:48:36 eva Exp $
+
+EAPI="3"
+
+inherit gnome.org
+
+DESCRIPTION="Notifications library"
+HOMEPAGE="http://www.galago-project.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.6:2
+	>=dev-libs/glib-2.6:2
+	>=dev-libs/dbus-glib-0.76"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+PDEPEND="|| (
+	x11-misc/notification-daemon
+	xfce-extra/xfce4-notifyd
+	>=x11-wm/awesome-3.4.4
+	kde-base/knotify
+)"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS || die "dodoc failed"
+}
diff --git a/x11-libs/libnotify/libnotify-0.7.1.ebuild b/x11-libs/libnotify/libnotify-0.7.1.ebuild
new file mode 100644
index 000000000000..07e9f9450a9d
--- /dev/null
+++ b/x11-libs/libnotify/libnotify-0.7.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.7.1.ebuild,v 1.1 2011/01/24 23:48:35 eva Exp $
+
+EAPI="3"
+
+inherit autotools eutils gnome.org
+
+DESCRIPTION="Notifications library"
+HOMEPAGE="http://www.galago-project.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc +introspection test"
+
+RDEPEND=">=dev-libs/glib-2.26:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.14 )
+	test? ( >=x11-libs/gtk+-2.90:3 )"
+PDEPEND="|| (
+	x11-misc/notification-daemon
+	xfce-extra/xfce4-notifyd
+	>=x11-wm/awesome-3.4.4
+	kde-base/knotify
+)"
+
+src_prepare() {
+	# Add configure switch for gtk+:3 based tests
+	# and make tests build only when needed
+	epatch "${FILESDIR}/${PN}-0.7.1-gtk3-tests.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-dependency-tracking \
+		$(use_enable test tests)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS || die "dodoc failed"
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libnotify.so.1
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libnotify.so.1
+}
diff --git a/x11-libs/libnotify/metadata.xml b/x11-libs/libnotify/metadata.xml
index 854288052d19..0b2305e0efdc 100644
--- a/x11-libs/libnotify/metadata.xml
+++ b/x11-libs/libnotify/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>freedesktop</herd>
+	<use>
+		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+	</use>
 </pkgmetadata>