Fix patch that failed to apply

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 120 insertions, 18 deletions

diff --git a/x11-libs/libnotify/ChangeLog b/x11-libs/libnotify/ChangeLog
index d626d9109f77..73a7077af6b1 100644
--- a/x11-libs/libnotify/ChangeLog
+++ b/x11-libs/libnotify/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libnotify
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/ChangeLog,v 1.70 2011/05/21 18:45:16 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/ChangeLog,v 1.71 2011/05/21 18:54:11 nirbheek Exp $
+
+  21 May 2011; Nirbheek Chauhan <nirbheek@gentoo.org> libnotify-0.7.3.ebuild,
+  +files/libnotify-0.7.3-gtk3-tests.patch:
+  Fix patch that failed to apply
 
 *libnotify-0.7.3 (21 May 2011)
 
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index 06a607fde2b0..b2410512f9a8 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -2,27 +2,28 @@
 Hash: SHA1
 
 AUX libnotify-0.7.1-gtk3-tests.patch 3002 RMD160 837d18ed7017814328ae1cdd2138671ef6ad6188 SHA1 3046d86237eb026ca8356ee589df50f5d315a1d0 SHA256 d9ee539a58a30ccd213b9857003c2ba04a0cf343763ed566ca0d769cbfc34664
+AUX libnotify-0.7.3-gtk3-tests.patch 2352 RMD160 428be6ac9b9874b1adea517e00f9d33dcdba2cc9 SHA1 9db6a4cf0dc5ff31a362e3f2eba9a17529e5a06b SHA256 2034ce5fb38b5332f5f14603619e6d97cb4b7a8396ab0c6404b5aeb9b8ae2929
 DIST introspection-20110205.m4.tar.bz2 1220 RMD160 c520adf7edf0e56012138208b45bed9df2a3e62f SHA1 092adcee1acce39e89069db0f3e8b4cb7ad89dea SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2
 DIST libnotify-0.7.2.tar.bz2 319892 RMD160 da7a6b78d465ee62b9d5cd161754ddb90f01f1df SHA1 d3feee5290dcc8f5476439f1f66f6dc38745607b SHA256 9b6a8459401e4af3da9cbc9e35a58d1a977273d3fe898d4a00a888f4191b85d6
 DIST libnotify-0.7.3.tar.bz2 305203 RMD160 4704c3fd82e0309daf7bdfe4b77a373c7d919640 SHA1 2cafbf257183e73bb656405aef7b05df2cb4181a SHA256 322541fdf276eb803686df81763a5186af041b2ee3e9cc5fa1dc86c550388c88
 EBUILD libnotify-0.7.2.ebuild 1714 RMD160 11346249b092900f2d973dbbeabaf0f28a924bde SHA1 64731950cd3c6d7daa450ae27a3b4aa2d207fbc9 SHA256 4fdaed747c18f3280608486ad8f69633cd26d0c2dcbc8351f3c1d0f917a97e6e
-EBUILD libnotify-0.7.3.ebuild 1722 RMD160 259ac2a4d388737e8080796b0470430f69367c72 SHA1 2f0ab24d56dc64401c03fb636e877d21ccc428b2 SHA256 df5ac19fd413bfd862f0646852510b096e610eafae0aa0ff1c946e961f22799c
-MISC ChangeLog 9193 RMD160 105e49d4aa28a8f9ad2512ebf830950cde0c2885 SHA1 17cbfd98e91e7f37dc94b3ff1f1a2a2dbc49ebf4 SHA256 ae31a2d2d1f350a1a8c33097787e3cd6e4d713b31adab1c271f9ce0897b8503a
+EBUILD libnotify-0.7.3.ebuild 1722 RMD160 c4f2c7ab9d92372fa76499662dbcbbc20dd3f79a SHA1 d062e75d96e1ddaea1e2f93e6b93393550527bf0 SHA256 d3a4742a44f1a315799b12e4427df47d25caa63adecc7a1ade36bf6e91da45f7
+MISC ChangeLog 9348 RMD160 71e51e57ec1efdf34a450094957f57689b78236a SHA1 deed112d1dbf1216fe7ba821f0ac9a40a0ea79ac SHA256 0da1d13de86c79e2b8e56e66b7592cf342ed492d8309df44c62bbc9e2a20d2e4
 MISC metadata.xml 280 RMD160 eb9fb7d60a900109c8a342ae4892a768c18cb846 SHA1 d0c617964f30c9f28817bcf8871018cb0d797888 SHA256 4609b8a9d20b2360573b1da47869971dc0aa1849cf8eb056a7c1c96809ff9f85
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJN2Ag8AAoJEO/kOhxWD91kom0QAI7Npcb+HfHE2xKOHL/66KFZ
-IS9eMJxlFF0Bo+cY7jNJvKf9lTr4OtP/MvAdtaf9XGa0wQoBFuOtFRSVa1BPkD7k
-T9+T40AjWZVM2W2lVhRtWyqyEjN8vfCe0mT6RU5+bNo/fGaYB6FacAiKH8gJhD+d
-YH+JIMV9YAzbV3cN1PxmTDav5LZXQ48saLkrSb/9JloJMpuSFD08lXQWG+MDsyOR
-QhpFcuLffy+k1drHNIy9Ly1gaXApYyLtAELoAyGD2nDpPPyOLcrxatGLJqopsE+n
-BJJtQppL7UWK7PL3tLYB4euBoF8L6njAwWyo1LKxHaKG6MqekXmDWTWhEK72KtAt
-Wqe4MJObhkULRmazOG7yTYYsNhOg3HokcNP1HOJQRAV/PffKG0lxVxU2HskaBSTx
-17sP196Fdxehn8E42AFjXg+f8cl3S0Lc3a2pnpA3oWHGTt4gKKDr/FA/gsmcBSpQ
-D+6xs4oIoEQXM9M3FbeNBNlciuE2kiRKfJ1o5HzGgboLAbSzractHr5FewJNJ8dM
-g3JAM2H3oULl1bl2/oUGSix/X61MGvT5IikAIhHD37oq6Yf+o5GtQXr9Q+2TG1nC
-QiKHi679jI9eKWWXhH/pOXyYCeRlRaYW7z7c1yNEqVdi0uSvIePGUZ5aZTQFjcry
-ONzFaRjmULBnCvJPToXj
-=SJR8
+iQIcBAEBAgAGBQJN2ApTAAoJEO/kOhxWD91kvvkP/RpGAfOeD/rc0dIesg1Ce7Ng
+9XBxzuK8lFVBPa3GiZW+B/LBnsJ6lvp5eczAZ0D6wkFOoxkzr3rCWVqEHCFI0YmP
+ZAcblVkDNlMwr70vC0rYLKWThDCF6GvjXNmjX3b/WWR/h/B8KCn4Wvf5uJFLC2vA
+W4X/IrzjaXoq2HnWl97S1qbw0akeUW4wtN9PYUt4Sfy0XCo23pRNDsUsZpyIdffn
+7ct7bck0w+1ZKTc5GN07A5azwfuUk/Q6zcLYOQf5i4nuxuUVzfEn0Im8Y67nsWor
+b8Gqw8IcDzSeQ8Sr6LVYSPo5L/NS1bbH6Ndzo8mOjLTTRCsz8qrwMWMmX0ZmmjK4
+ZxGL9cCGN/G0GSSC/t0tAXuaeQKQx4QAbF8aVZyTTpBpyBZZSsAUi/E0sz3LsVUS
+EwVUtQGO0PI+D+MSsgN0PbJIJ88volI2GURTCzJkIAX9HZ15+5sOPsx8M1rrwhRL
+LP2Slb+aWktb9iXl+QfknnyHowW74gpyOZ8La09IyroN4K5zWcvjURJ9LvBCrpdG
+h9cOvW96jkwoCfbBgnIojR+cWH6aNf/BRjECsShYqvfnVO57Y+BpFBJbXhPwQNAv
+n5afRaqGXTI5/cHahO9OmMexg+Wvc4fvEB/mC2qANYNs7XtRufLOdDbXghoCTrhX
+/lC20AINGrVoI9c6v88s
+=nN93
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libnotify/files/libnotify-0.7.3-gtk3-tests.patch b/x11-libs/libnotify/files/libnotify-0.7.3-gtk3-tests.patch
new file mode 100644
index 000000000000..2f547357c7cc
--- /dev/null
+++ b/x11-libs/libnotify/files/libnotify-0.7.3-gtk3-tests.patch
@@ -0,0 +1,97 @@
+Don't build gtk+:3 tests if not required
+
+patch originally by Gilles (eva)
+
+---
+--- configure.ac
++++ configure.ac
+@@ -93,9 +93,13 @@
+ AC_SUBST([pkg_modules])
+ PKG_CHECK_MODULES(PACKAGE, [$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])
+-
++])
++AM_CONDITIONAL([MORE_TESTS], [test $enable_tests = yes])
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+ AC_SUBST(GLIB_GENMARSHAL)
+ 
+--- tests/Makefile.am
++++ tests/Makefile.am
+@@ -2,18 +2,15 @@
+ 	-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 @@
+ 	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 @@
+ 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_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_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)
+ 
diff --git a/x11-libs/libnotify/libnotify-0.7.3.ebuild b/x11-libs/libnotify/libnotify-0.7.3.ebuild
index 9f8a35684d22..ce1c50d9023c 100644
--- a/x11-libs/libnotify/libnotify-0.7.3.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2011/05/21 18:45:16 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.7.3.ebuild,v 1.2 2011/05/21 18:54:11 nirbheek Exp $
 
 EAPI=3
 inherit autotools eutils gnome.org
@@ -37,7 +37,7 @@ src_unpack() {
 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
+	epatch "${FILESDIR}"/${PN}-0.7.3-gtk3-tests.patch
 
 	AT_M4DIR=${WORKDIR} eautoreconf
 }