Fix some QA : do not ever use ../something/something.la, it is prone to breakage(parallel build). Add a missing || die to dodoc. Thanks to EvaSDK

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 59 insertions, 13 deletions

diff --git a/dev-libs/libindicate/ChangeLog b/dev-libs/libindicate/ChangeLog
index d52f7dd8dbef..038b1f917205 100644
--- a/dev-libs/libindicate/ChangeLog
+++ b/dev-libs/libindicate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libindicate
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/ChangeLog,v 1.1 2009/10/29 15:47:05 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/ChangeLog,v 1.2 2009/10/29 16:27:13 mrpouet Exp $
+
+  29 Oct 2009; Romain Perier <mrpouet@gentoo.org>
+  libindicate-0.2.3.ebuild,
+  files/libindicate-0.2.3-optional-gtk-support.patch:
+  Fix some QA : do not ever use ../something/something.la, it is prone to
+  breakage (parallel build). Add a missing die to dodoc. Thanks to EvaSDK.
 
 *libindicate-0.2.3 (29 Oct 2009)
 
diff --git a/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch b/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch
index 306e654ce7c5..11288f7238e4 100644
--- a/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch
+++ b/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch
@@ -1,12 +1,13 @@
 From: Romain Perier <mrpouet@gentoo.org>
-Date: Thu, 29 Oct 2009 16:21:56 +0100
-Subject: Make gtk support optional
+Date: Thu, 29 Oct 2009 17:19:31 +0100
+Subject: Make gtk support optional and fix some QA: do not ever use ../something/something.la, it is prone to breakage (parallel build)
 
 ---
- Makefile.am          |   13 +++++++----
- configure.ac         |   17 +++++++++++----
- examples/Makefile.am |   52 +++++++++++++++++++++++++------------------------
- 3 files changed, 47 insertions(+), 35 deletions(-)
+ Makefile.am                 |   13 +++++---
+ configure.ac                |   17 ++++++++---
+ examples/Makefile.am        |   62 ++++++++++++++++++++++--------------------
+ libindicate-gtk/Makefile.am |    2 +-
+ 4 files changed, 53 insertions(+), 41 deletions(-)
 
 --- a/Makefile.am
 +++ b/Makefile.am
@@ -93,8 +94,25 @@ Subject: Make gtk support optional
  listen_and_print_SOURCES = \
  	listen-and-print.c
  
-@@ -55,6 +34,29 @@ im_client_LDADD = \
- 	../libindicate-gtk/libindicate-gtk.la \
+@@ -37,8 +16,8 @@ listen_and_print_CFLAGS = \
+ 	$(LIBINDICATEGTK_CFLAGS)
+ 
+ listen_and_print_LDADD = \
+-	../libindicate/libindicate.la \
+-	../libindicate-gtk/libindicate-gtk.la \
++	$(top_srcdir)/libindicate/libindicate.la \
++	$(top_srcdir)/libindicate-gtk/libindicate-gtk.la \
+ 	$(LIBINDICATE_LIBS) \
+ 	$(LIBINDICATEGTK_LIBS)
+ 
+@@ -51,10 +30,33 @@ im_client_CFLAGS = \
+ 	$(LIBINDICATEGTK_CFLAGS)
+ 
+ im_client_LDADD = \
+-	../libindicate/libindicate.la \
+-	../libindicate-gtk/libindicate-gtk.la \
++	$(top_srcdir)/libindicate/libindicate.la \
++	$(top_srcdir)/libindicate-gtk/libindicate-gtk.la \
  	$(LIBINDICATE_LIBS) \
  	$(LIBINDICATEGTK_LIBS)
 +endif
@@ -107,7 +125,7 @@ Subject: Make gtk support optional
 +	$(LIBINDICATE_CFLAGS)
 +
 +indicate_and_crash_LDADD = \
-+	../libindicate/libindicate.la \
++	$(top_srcdir)/libindicate/libindicate.la \
 +	$(LIBINDICATE_LIBS)
 +
 +indicate_alot_SOURCES = \
@@ -118,9 +136,31 @@ Subject: Make gtk support optional
 +	$(LIBINDICATE_CFLAGS)
 +
 +indicate_alot_LDADD = \
-+	../libindicate/libindicate.la \
++	$(top_srcdir)/libindicate/libindicate.la \
 +	$(LIBINDICATE_LIBS)
  
  show_hide_server_SOURCES = \
  	show-hide-server.c
+@@ -64,7 +66,7 @@ show_hide_server_CFLAGS = \
+ 	$(LIBINDICATE_CFLAGS)
+ 
+ show_hide_server_LDADD = \
+-	../libindicate/libindicate.la \
++	$(top_srcdir)/libindicate/libindicate.la \
+ 	$(LIBINDICATE_LIBS)
+ 
+ examplesdir = $(docdir)/examples/
+--- a/libindicate-gtk/Makefile.am
++++ b/libindicate-gtk/Makefile.am
+@@ -32,7 +32,7 @@ libindicate_gtk_la_CFLAGS = \
+ 	$(LIBINDICATEGTK_CFLAGS)
+ 
+ libindicate_gtk_la_LIBADD = \
+-	../libindicate/libindicate.la \
++	$(top_srcdir)/libindicate/libindicate.la \
+ 	$(LIBINDICATEGTK_LIBS)
+ 
+ pkgconfig_DATA = indicate-gtk.pc
+-- 
+1.6.5.1
 
diff --git a/dev-libs/libindicate/libindicate-0.2.3.ebuild b/dev-libs/libindicate/libindicate-0.2.3.ebuild
index 2843de7d6adb..dfb6313412d9 100644
--- a/dev-libs/libindicate/libindicate-0.2.3.ebuild
+++ b/dev-libs/libindicate/libindicate-0.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.2.3.ebuild,v 1.1 2009/10/29 15:47:05 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.2.3.ebuild,v 1.2 2009/10/29 16:27:13 mrpouet Exp $
 
 EAPI=2
 
@@ -43,5 +43,5 @@ src_test() {
 }
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS
+	dodoc AUTHORS || die "dodoc failed"
 }