From 097ae5f8e230c2b17f2f84dc55594972ad1793d0 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Fri, 18 Nov 2011 22:17:13 +0000 Subject: [PATCH] old Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64 --- x11-libs/libnotify/ChangeLog | 6 +- x11-libs/libnotify/Manifest | 19 ++- .../files/libnotify-0.7.1-gtk3-tests.patch | 110 ------------------ x11-libs/libnotify/libnotify-0.7.2.ebuild | 66 ----------- 4 files changed, 13 insertions(+), 188 deletions(-) delete mode 100644 x11-libs/libnotify/files/libnotify-0.7.1-gtk3-tests.patch delete mode 100644 x11-libs/libnotify/libnotify-0.7.2.ebuild 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 + -files/libnotify-0.7.1-gtk3-tests.patch, -libnotify-0.7.2.ebuild: + old 18 Nov 2011; Samuli Suominen libnotify-0.7.4.ebuild: ppc/ppc64 stable wrt #386573 diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest index 6ebab3a11669..3ed3adbc1808 100644 --- a/x11-libs/libnotify/Manifest +++ b/x11-libs/libnotify/Manifest @@ -1,22 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX libnotify-0.7.1-gtk3-tests.patch 3002 RMD160 837d18ed7017814328ae1cdd2138671ef6ad6188 SHA1 3046d86237eb026ca8356ee589df50f5d315a1d0 SHA256 d9ee539a58a30ccd213b9857003c2ba04a0cf343763ed566ca0d769cbfc34664 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.4.tar.xz 272016 RMD160 a34aeb657055d5fe63e0c26ae67379067f964d2e SHA1 e5bb0d9f6999764ef090c66cd531b774e693a9cb SHA256 e3c58345112672c2cbb05a67512ff6c7028892df7a34746e2162fe76d9877019 -EBUILD libnotify-0.7.2.ebuild 1714 RMD160 11346249b092900f2d973dbbeabaf0f28a924bde SHA1 64731950cd3c6d7daa450ae27a3b4aa2d207fbc9 SHA256 4fdaed747c18f3280608486ad8f69633cd26d0c2dcbc8351f3c1d0f917a97e6e EBUILD libnotify-0.7.4.ebuild 1386 RMD160 9f792e6d9374a4d4495a07cf4ee92c8a0eefc1e7 SHA1 d835b2dab15d4851a131a454bb4c57efe68d8b10 SHA256 bf31185674947df96a7da3a6ff57c009e4cb7b8e608870a3efd146de5970c4e6 -MISC ChangeLog 10040 RMD160 11f8d2912d892a1c3b2761950b2f7c9434750c63 SHA1 da43e4c063cffcf84a7177fa748a7bba7d5107a8 SHA256 8f14959832221894d11622966858b09c701f754d258334c232f5730743f2ae69 +MISC ChangeLog 10169 RMD160 3c6e398b268bf32746d6e5d6d6d7457ea010a0cd SHA1 953659a70ea2e48cfd4de49c3629b2df45a17d23 SHA256 556435f86677628acc38caa2a06def984ff2bbaa7f0dcc135bb6c5096c5f1afa MISC metadata.xml 280 RMD160 eb9fb7d60a900109c8a342ae4892a768c18cb846 SHA1 d0c617964f30c9f28817bcf8871018cb0d797888 SHA256 4609b8a9d20b2360573b1da47869971dc0aa1849cf8eb056a7c1c96809ff9f85 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOxtjYAAoJEEdUh39IaPFN4IMIAJzJ5lrJqslMBri5l9S6n3gK -5dslBySKYqNDLUi4lp3n4e4xyXhqKDUujUdVnmMzn82/P5MFbb1QKHQA7HGwwDmb -3VYkHo4rQefzLRfUZkm04VHEl9WJUZIe/8Ij+j3LSzktPXyEMovTMAEcCv2C6jZn -ryrNcRXrGybuFyibkWmXeSYGefwVtlCPp/i43o68zo176ERRj4hWO6/zosZ6XaMN -iMV58npsm7N8geqUt8P7NUHyQ/ZQ/pkCy7/+YDQemA++npjJmpF4WCdy1lQvFgZz -dvTCV9+csnIAo2KSurm3sLGQAqQwqTwZAxbRFqMTyx3hVs6ylgWYdhH9wIJgDP4= -=PsfM +iQEcBAEBAgAGBQJOxtkJAAoJEEdUh39IaPFNqVkH/iPCyG2M7bLyHO+IkBDvC+++ +Sdde7Qlhpt0S2SYXxU129aTJ/l4kJ2zID+iAoq/yuMRSTzhsUEIPzJIKtVonnIre +mHxHd+bONFkwkjLNVr7RuL5v8OhleTEE5dpJPmW044aI8kqkNX9UflppzI8JBCwM +yiem/b9cMzqC8BWodR2BV5TDsWq5ZxknVY3DQj/vMfkpKQbC4SAOmxZe7iBVNKLl +VDG1ZP4l53qrGrb37EFNml/lW071RUNlKlg9fT+0oDxfWUA5DsrFp0bMhZc1wLL/ +4XooK7OOBT1K8kcR8zrFxRers380Zr1Sg/DjVPtHJ4dDSoywlXu7SF4uwlcg8M8= +=UAzt -----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 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 -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 -} -- 2.26.2