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

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 62 insertions, 16 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/Manifest b/dev-libs/libindicate/Manifest
index 7fb10af920cc..e0e3eefa4e1a 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -1,5 +1,5 @@
-AUX libindicate-0.2.3-optional-gtk-support.patch 3133 RMD160 4448178bd490c9af3a8ad5e0c68001ce94378467 SHA1 cd50e03d8faff8f40b9e19ef5f450562782aec78 SHA256 9901820b47c9164724f4960a5a2fd1fd5001c6ff7efdffcbe11bc8336f8a04fd
+AUX libindicate-0.2.3-optional-gtk-support.patch 4380 RMD160 39c7d068d9af4efc8735244d0c0e9670f34e270a SHA1 e7e7b0c22391c134d31ffc7227c055f99cd1bfc4 SHA256 056fd4e778eb17e2f47e050d274c0fa3873acf7308720cc1b380aeb3514a926c
 DIST libindicate-0.2.3.tar.gz 426971 RMD160 9aa7a2ad95a232db23739d45497b0e5746cdf2a5 SHA1 46ff8ff837bac175c72f3ee66761d1f549a71547 SHA256 590dff54608b8c6eddf691f588f70f8b25da8f8f061da3696019da38abc356bf
-EBUILD libindicate-0.2.3.ebuild 1446 RMD160 2fb6973ca40162cc08bf140c2f8992d2786f0a44 SHA1 3c5fb88f87310148dbd8e467881144ff22522236 SHA256 c6b2a24aa1510a906c1a6fdb6c3559866eb474697cc58d1fd9d73ec14f7b116a
-MISC ChangeLog 454 RMD160 36d2e40e2f9efc069d7b592ec8e2d1ecea23612b SHA1 76a2c7478d379d6807e016b8530d1cf921c65cfc SHA256 506eacad155dbf84545889fb6da9bce37125899ae72bb226825e5f3c95e0d854
+EBUILD libindicate-0.2.3.ebuild 1468 RMD160 6c3f08c31bcc4f7af90cca3ee85d0da96e7bd2ba SHA1 33f0b714bf665d78897ee08dfb18a2e2f8039662 SHA256 ef8b55feb084373839027219566f05532d98475ce89e83589f46e43962c16620
+MISC ChangeLog 736 RMD160 95529d5903d7b0a3274fd450d6214c748ec115df SHA1 a79111871351b6d4da464f4eb1f39316fd4daa9f SHA256 0bc8e273650b38e6c76d66f88792a5d59c5846c5dc300dbe677e32e8d3ac6115
 MISC metadata.xml 258 RMD160 69b53b6c07c87d5673ee16de06750f3aceed35e8 SHA1 649b8b012b03f82fe418ff135f90f7e21bcc4263 SHA256 5603025b3bd04b6daa8f57cba6ad6eea690cf08beff6c011c38d35acafb3a2d9
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"
 }