Gentoo Archives: gentoo-commits

From: nirbheek@g.o
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: profiles/, x11-libs/libnotify/files/, x11-libs/libnotify/
Date: Fri, 04 Feb 2011 05:24:12
Message-Id: 7db9d157a202ba05ee7852eddf3775ca14633a79.nirbheek@gentoo
1 commit: 7db9d157a202ba05ee7852eddf3775ca14633a79
2 Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 4 04:24:25 2011 +0000
4 Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 4 04:25:14 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7db9d157a202ba05ee7852eddf3775ca14633a79
7
8 x11-libs/libnotify: remove old versions
9
10 * Remove package.mask, it's in portage now
11
12 ---
13 profiles/package.mask | 1 -
14 x11-libs/libnotify/Manifest | 5 -
15 .../files/libnotify-0.7.0-gtk3-tests.patch | 109 --------------------
16 x11-libs/libnotify/libnotify-0.4.5.ebuild | 35 ------
17 x11-libs/libnotify/libnotify-0.5.2.ebuild | 36 -------
18 5 files changed, 0 insertions(+), 186 deletions(-)
19
20 diff --git a/profiles/package.mask b/profiles/package.mask
21 index 607c797..7c7cd63 100644
22 --- a/profiles/package.mask
23 +++ b/profiles/package.mask
24 @@ -16,7 +16,6 @@
25 # Stuff that directly or indirectly needs libnotify-0.6
26 # (versions are approximate)
27 # DO NOT UNMASK unless you're fine with everything breaking
28 ->=x11-libs/libnotify-0.6
29 >=x11-misc/notification-daemon-0.5
30 >=app-crypt/seahorse-2.91
31 >=app-crypt/seahorse-plugins-2.91
32
33 diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
34 index 0854aa1..444e8ae 100644
35 --- a/x11-libs/libnotify/Manifest
36 +++ b/x11-libs/libnotify/Manifest
37 @@ -1,7 +1,2 @@
38 -AUX libnotify-0.7.0-gtk3-tests.patch 2964 RMD160 6cb2140ade47d02747d73b546049d6c80384e8cf SHA1 a86501e970acda853927fd26b3e0818c25fb4b23 SHA256 3ba602e6206327b9b20e7db54ffcab645fefe98c1cbd50cf4d7fa69ea70bfad1
39 -DIST libnotify-0.4.5.tar.gz 364142 RMD160 6ddf4feb50504012c5f5fd205123d9f27cb12ef6 SHA1 e0a3be6249978ae2eb18bb77cdd22763271dc904 SHA256 0799db8ea1500b65a477421a8c930cc8c8b0bbc0596e55ea1601e2542f3fb0d9
40 -DIST libnotify-0.5.2.tar.bz2 310439 RMD160 97c7d295683d6a093e46611d354fe8bfd799fb7d SHA1 bb088a318cfccb4261674065838860fa940fc04a SHA256 1f6f1a2d6a0e009997c7ed31f6197f9bf09e9b45fb9cd54acabceea951d99062
41 DIST libnotify-0.7.1.tar.bz2 319816 RMD160 ce99f10ac62832d09b8dce74ba477fb62cfba215 SHA1 323d14a5d5375a9b658a57eec4e91a1a19d52c71 SHA256 84dc2a77defb25521d2f1cb7ac34b4d23b55254ba361442658430efb928536c8
42 -EBUILD libnotify-0.4.5.ebuild 985 RMD160 01ad4f28cf96d453a2da6419eb9e8ea64fab9129 SHA1 906f303f081402156a39723b78e08bea5b91d117 SHA256 db02bc95b24e99fe50666b1f01a3d5f72e0debb5cbc7d6528476d94a5eefd478
43 -EBUILD libnotify-0.5.2.ebuild 952 RMD160 3f1bcb1a19c9d80eea99a9f78b310d3389a52a88 SHA1 469059c5f3f9eb9c53c7904cdfa31c27dbe7e6b0 SHA256 475491108bbe37f2b3d36fafcf60e2aa8b891af1254e41c7b47268de0dbdf172
44 EBUILD libnotify-0.7.1.ebuild 1184 RMD160 bef3a6d9fff4690776f70c8588341a7f290ae828 SHA1 f7157b9cf6fea40a3b63e48f9d8f2026af02e02e SHA256 bdbf4614111c7f44bd778b24b0d7fbfacd34033e454ccd65c8cc73df08a83126
45
46 diff --git a/x11-libs/libnotify/files/libnotify-0.7.0-gtk3-tests.patch b/x11-libs/libnotify/files/libnotify-0.7.0-gtk3-tests.patch
47 deleted file mode 100644
48 index 8e6deac..0000000
49 --- a/x11-libs/libnotify/files/libnotify-0.7.0-gtk3-tests.patch
50 +++ /dev/null
51 @@ -1,109 +0,0 @@
52 -From 3264bc7d2421f667aa7772476247c1a1fa06f61c Mon Sep 17 00:00:00 2001
53 -From: Gilles Dartiguelongue <eva@g.o>
54 -Date: Thu, 16 Dec 2010 00:01:13 +0100
55 -Subject: [PATCH] gentoo: do not build gtk+:3 tests if not required
56 -
57 ----
58 - configure.ac | 5 +++++
59 - tests/Makefile.am | 30 +++++++++++++++++-------------
60 - 2 files changed, 22 insertions(+), 13 deletions(-)
61 -
62 -diff --git a/configure.ac b/configure.ac
63 -index 31d068e..7c0ad06 100644
64 ---- a/configure.ac
65 -+++ b/configure.ac
66 -@@ -97,10 +97,15 @@ AC_SUBST(PACKAGE_LIBS)
67 - AC_SUBST(PACKAGE_CFLAGS)
68 - AC_SUBST(pkg_modules)
69 -
70 -+AC_ARG_ENABLE([tests],
71 -+ AS_HELP_STRING([--enable-tests], [Check for extra dependencies to build all tests]))
72 -+AS_IF([test $enable_tests = yes], [
73 - tests_modules="gtk+-3.0 >= $REQ_GTK_VERSION"
74 - PKG_CHECK_MODULES(TESTS, [$tests_modules])
75 -+])
76 - AC_SUBST(TESTS_LIBS)
77 - AC_SUBST(TESTS_CFLAGS)
78 -+AM_CONDITIONAL([MORE_TESTS], [test $enable_tests = yes])
79 -
80 - GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
81 - AC_SUBST(GLIB_GENMARSHAL)
82 -diff --git a/tests/Makefile.am b/tests/Makefile.am
83 -index 115cbd9..8fec9fb 100644
84 ---- a/tests/Makefile.am
85 -+++ b/tests/Makefile.am
86 -@@ -2,17 +2,14 @@ INCLUDES = \
87 - -I$(top_srcdir) \
88 - $(TESTS_CFLAGS)
89 -
90 --noinst_PROGRAMS = \
91 -+check_PROGRAMS = \
92 - test-replace \
93 -- test-replace-widget \
94 - test-server-info \
95 - test-default-action \
96 - test-multi-actions \
97 -- test-image \
98 - test-basic \
99 - test-error \
100 - test-markup \
101 -- test-persistence \
102 - test-rtl \
103 - test-size-changes \
104 - test-urgency \
105 -@@ -20,6 +17,22 @@ noinst_PROGRAMS = \
106 - test-xy-actions \
107 - test-xy-stress
108 -
109 -+#if MORE_TESTS
110 -+check_PROGRAMS += \
111 -+ test-image \
112 -+ test-replace-widget \
113 -+ test-persistence
114 -+
115 -+test_replace_widget_SOURCES = test-replace-widget.c
116 -+test_replace_widget_LDADD = $(common_ldflags)
117 -+
118 -+test_image_SOURCES = test-image.c
119 -+test_image_LDADD = $(common_ldflags)
120 -+
121 -+test_persistence_SOURCES = test-persistence.c
122 -+test_persistence_LDADD = $(common_ldflags)
123 -+#endif
124 -+
125 - common_ldflags = \
126 - $(top_builddir)/libnotify/libnotify.la \
127 - $(TESTS_LIBS)
128 -@@ -27,9 +40,6 @@ common_ldflags = \
129 - test_replace_SOURCES = test-replace.c
130 - test_replace_LDADD = $(common_ldflags)
131 -
132 --test_replace_widget_SOURCES = test-replace-widget.c
133 --test_replace_widget_LDADD = $(common_ldflags)
134 --
135 - test_server_info_SOURCES = test-server-info.c
136 - test_server_info_LDADD = $(common_ldflags)
137 -
138 -@@ -42,9 +52,6 @@ test_default_action_LDADD = $(common_ldflags)
139 - test_multi_actions_SOURCES = test-multi-actions.c
140 - test_multi_actions_LDADD = $(common_ldflags)
141 -
142 --test_image_SOURCES = test-image.c
143 --test_image_LDADD = $(common_ldflags)
144 --
145 - test_basic_SOURCES = test-basic.c
146 - test_basic_LDADD = $(common_ldflags)
147 -
148 -@@ -69,9 +76,6 @@ test_xy_stress_LDADD = $(common_ldflags)
149 - test_rtl_SOURCES = test-rtl.c
150 - test_rtl_LDADD = $(common_ldflags)
151 -
152 --test_persistence_SOURCES = test-persistence.c
153 --test_persistence_LDADD = $(common_ldflags)
154 --
155 - EXTRA_DIST = applet-critical.png
156 -
157 - -include $(top_srcdir)/git.mk
158 ---
159 -1.7.3.3
160 -
161
162 diff --git a/x11-libs/libnotify/libnotify-0.4.5.ebuild b/x11-libs/libnotify/libnotify-0.4.5.ebuild
163 deleted file mode 100644
164 index 6bc571a..0000000
165 --- a/x11-libs/libnotify/libnotify-0.4.5.ebuild
166 +++ /dev/null
167 @@ -1,35 +0,0 @@
168 -# Copyright 1999-2010 Gentoo Foundation
169 -# Distributed under the terms of the GNU General Public License v2
170 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.4.5.ebuild,v 1.14 2010/03/26 16:28:15 ssuominen Exp $
171 -
172 -EAPI=2
173 -
174 -DESCRIPTION="Notifications library"
175 -HOMEPAGE="http://www.galago-project.org/"
176 -SRC_URI="http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz"
177 -
178 -LICENSE="LGPL-2.1"
179 -SLOT="0"
180 -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
181 -IUSE=""
182 -
183 -RDEPEND=">=x11-libs/gtk+-2.6:2
184 - >=dev-libs/glib-2.6:2
185 - >=dev-libs/dbus-glib-0.76"
186 -DEPEND="${RDEPEND}
187 - dev-util/pkgconfig"
188 -PDEPEND="|| (
189 - x11-misc/notification-daemon
190 - xfce-extra/xfce4-notifyd
191 - x11-misc/notify-osd
192 - >=x11-wm/awesome-3.4.4 )"
193 -
194 -src_configure() {
195 - econf \
196 - --disable-dependency-tracking
197 -}
198 -
199 -src_install() {
200 - emake install DESTDIR="${D}" || die "emake install failed"
201 - dodoc AUTHORS ChangeLog NEWS
202 -}
203
204 diff --git a/x11-libs/libnotify/libnotify-0.5.2.ebuild b/x11-libs/libnotify/libnotify-0.5.2.ebuild
205 deleted file mode 100644
206 index e2db311..0000000
207 --- a/x11-libs/libnotify/libnotify-0.5.2.ebuild
208 +++ /dev/null
209 @@ -1,36 +0,0 @@
210 -# Copyright 1999-2010 Gentoo Foundation
211 -# Distributed under the terms of the GNU General Public License v2
212 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.4.5.ebuild,v 1.14 2010/03/26 16:28:15 ssuominen Exp $
213 -
214 -EAPI="3"
215 -
216 -inherit gnome.org
217 -
218 -DESCRIPTION="Notifications library"
219 -HOMEPAGE="http://www.galago-project.org/"
220 -
221 -LICENSE="LGPL-2.1"
222 -SLOT="0"
223 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
224 -IUSE=""
225 -
226 -RDEPEND=">=x11-libs/gtk+-2.6:2
227 - >=dev-libs/glib-2.6:2
228 - >=dev-libs/dbus-glib-0.76"
229 -DEPEND="${RDEPEND}
230 - dev-util/pkgconfig"
231 -PDEPEND="|| (
232 - x11-misc/notification-daemon
233 - xfce-extra/xfce4-notifyd
234 - >=x11-wm/awesome-3.4.4 )"
235 -
236 -src_configure() {
237 - econf \
238 - --disable-static \
239 - --disable-dependency-tracking
240 -}
241 -
242 -src_install() {
243 - emake install DESTDIR="${D}" || die "emake install failed"
244 - dodoc AUTHORS ChangeLog NEWS || die "dodoc failed"
245 -}