summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnome-extra/quick-lounge-applet/ChangeLog8
-rw-r--r--gnome-extra/quick-lounge-applet/Manifest15
-rw-r--r--gnome-extra/quick-lounge-applet/files/quick-lounge-applet-2.14.0-fix-make-3.82.patch19
-rw-r--r--gnome-extra/quick-lounge-applet/quick-lounge-applet-2.14.0.ebuild9
4 files changed, 45 insertions, 6 deletions
diff --git a/gnome-extra/quick-lounge-applet/ChangeLog b/gnome-extra/quick-lounge-applet/ChangeLog
index ce3e117b2144..f1c623d0cf90 100644
--- a/gnome-extra/quick-lounge-applet/ChangeLog
+++ b/gnome-extra/quick-lounge-applet/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for gnome-extra/quick-lounge-applet
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/quick-lounge-applet/ChangeLog,v 1.34 2010/01/04 16:32:46 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/quick-lounge-applet/ChangeLog,v 1.35 2010/09/02 12:53:37 pacho Exp $
+
+ 02 Sep 2010; Pacho Ramos <pacho@gentoo.org>
+ quick-lounge-applet-2.14.0.ebuild,
+ +files/quick-lounge-applet-2.14.0-fix-make-3.82.patch:
+ Make this gmake-3.82 compliant, bug #333643 (reported by Diego E.
+ 'Flameeyes' Pettenò and patch made by Jory A. Pratt).
04 Jan 2010; Mart Raudsepp <leio@gentoo.org>
-files/quick-lounge-applet-2.12.5-configure-fixes.patch,
diff --git a/gnome-extra/quick-lounge-applet/Manifest b/gnome-extra/quick-lounge-applet/Manifest
index 6d26b28d6327..3c69b06023b6 100644
--- a/gnome-extra/quick-lounge-applet/Manifest
+++ b/gnome-extra/quick-lounge-applet/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX quick-lounge-applet-2.14.0-fix-make-3.82.patch 681 RMD160 40fdd0569f4a123f88d485eb7b32da144978bf8e SHA1 4a58349a4330264136d993274baf3a6456afcbbe SHA256 df994e180c7d77a1edbfaac88747b5afe05cfdeeb5fef42985f58e1d73ed6db5
DIST quick-lounge-applet-2.14.0.tar.bz2 396628 RMD160 f0e987cc3d15423294d6106b012215e4c40cd67f SHA1 fe9b79ba9c14f4b79d5ddaf92ac55e00770f9f62 SHA256 44fa9f1a80316b8ccc4835bc3ad9b9ab6185ae2cc48c418a17926758e1bb67f8
-EBUILD quick-lounge-applet-2.14.0.ebuild 910 RMD160 ee9db365be038ee12c6a1f32dfa8f35868f22ba6 SHA1 6642b2628bb8d9f5261424128acb9c254fc8fd67 SHA256 026f2aec0f3e2c2b803948a1a2ce5c01fbe935d7498b1804e75d5f500289b994
-MISC ChangeLog 4977 RMD160 818d59706f63f2bc8458dbeea7d1c137f5867951 SHA1 2c75a96819e29e9853da6e5fbe2c7917a536b182 SHA256 2d972561c82b53ea97c5363e640399e560a953c04a6cb8668bc112be615a35f0
+EBUILD quick-lounge-applet-2.14.0.ebuild 1010 RMD160 920be4d7c445255aa6e0e900c37c148d06806b1b SHA1 5d2bb384f4a913e2cb411a0a53a31cb388d329ce SHA256 4164761016d6981aa298fbac48e2c6dcc01070bbd612842814f8eac936060152
+MISC ChangeLog 5244 RMD160 ae70ba8e4a8536d8dc7c5a0b32dcb907b5f4fc50 SHA1 970f86297c4ca29559aa736d96dce67c1eb88387 SHA256 02191225884003cf690a73e41f8aeebce19de620b9f7f1b5593d8868b08d6eaa
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkx/nlYACgkQCaWpQKGI+9Q8CACbBEw9ocziD0xYYOLhd34HD9qy
+ioQAn2bZVABu3aU55KQS2ep0mgIDg8dz
+=MGqt
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/quick-lounge-applet/files/quick-lounge-applet-2.14.0-fix-make-3.82.patch b/gnome-extra/quick-lounge-applet/files/quick-lounge-applet-2.14.0-fix-make-3.82.patch
new file mode 100644
index 000000000000..04d78390aad7
--- /dev/null
+++ b/gnome-extra/quick-lounge-applet/files/quick-lounge-applet-2.14.0-fix-make-3.82.patch
@@ -0,0 +1,19 @@
+--- data/Makefile.am-orig 2010-08-22 16:31:09.747598202 -0500
++++ data/Makefile.am 2010-08-22 16:31:49.017577389 -0500
+@@ -40,11 +40,11 @@
+ # don't do this if we are building in eg. rpm
+ install-data-local: $(schemas_DATA)
+ if GCONF_SCHEMAS_INSTALL
+- if test -z "$(DESTDIR)" ; then \
+- for p in $^ ; do \
+- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p >&1 > /dev/null; \
+- done \
+- fi
++ if test -z "$(DESTDIR)" ; then \
++ for p in $^ ; do \
++ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p >&1 > /dev/null; \
++ done \
++ fi
+ endif
+
+ EXTRA_DIST = \
diff --git a/gnome-extra/quick-lounge-applet/quick-lounge-applet-2.14.0.ebuild b/gnome-extra/quick-lounge-applet/quick-lounge-applet-2.14.0.ebuild
index f030d998e7f0..cc2fd0731ebf 100644
--- a/gnome-extra/quick-lounge-applet/quick-lounge-applet-2.14.0.ebuild
+++ b/gnome-extra/quick-lounge-applet/quick-lounge-applet-2.14.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/quick-lounge-applet/quick-lounge-applet-2.14.0.ebuild,v 1.5 2009/12/26 19:29:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/quick-lounge-applet/quick-lounge-applet-2.14.0.ebuild,v 1.6 2010/09/02 12:53:37 pacho Exp $
EAPI="2"
-inherit autotools gnome2
+inherit autotools gnome2 eutils
DESCRIPTION="Application launcher applet for GNOME"
HOMEPAGE="http://quick-lounge.sourceforge.net/"
@@ -30,6 +30,9 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS ChangeLog INSTALL NEWS README"
src_prepare() {
+ # Make this gmake-3.82 compliant, bug #333643
+ epatch "${FILESDIR}/${P}-fix-make-3.82.patch"
+
# Fix broken intltool used in tarball
intltoolize --force --copy --automake || die "intltoolize failed"
eautoreconf