old

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

3 files changed, 5 insertions, 177 deletions

diff --git a/x11-libs/libnotify/ChangeLog b/x11-libs/libnotify/ChangeLog
index f52828d6e8d8..63571b27a937 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.77 2011/11/18 22:16:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/ChangeLog,v 1.78 2011/11/18 22:17:12 ssuominen Exp $
+
+  18 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -files/libnotify-0.7.1-gtk3-tests.patch, -libnotify-0.7.2.ebuild:
+  old
 
   18 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> libnotify-0.7.4.ebuild:
   ppc/ppc64 stable wrt #386573
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
deleted file mode 100644
index 7d1230520366..000000000000
--- a/x11-libs/libnotify/files/libnotify-0.7.1-gtk3-tests.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-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.7.2.ebuild b/x11-libs/libnotify/libnotify-0.7.2.ebuild
deleted file mode 100644
index eb5898b2ee4f..000000000000
--- a/x11-libs/libnotify/libnotify-0.7.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.2.ebuild,v 1.9 2011/05/01 17:58:57 ssuominen Exp $
-
-EAPI=3
-inherit autotools eutils gnome.org
-
-DESCRIPTION="Notifications library"
-HOMEPAGE="http://www.galago-project.org/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-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
-	x11-libs/gdk-pixbuf: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="virtual/notification-daemon"
-
-src_unpack() {
-	# If gobject-introspection is installed, we don't need the extra .m4
-	if has_version "dev-libs/gobject-introspection"; then
-		unpack ${P}.tar.bz2
-	else
-		unpack ${A}
-	fi
-}
-
-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
-
-	AT_M4DIR=${WORKDIR} eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-dependency-tracking \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS || die
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libnotify.so.1
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libnotify.so.1
-}