Fix parallel make issues, bug #239777.

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

4 files changed, 37 insertions, 9 deletions

diff --git a/net-misc/blogtk/ChangeLog b/net-misc/blogtk/ChangeLog
index 77b0b1a9148f..3cf25136d623 100644
--- a/net-misc/blogtk/ChangeLog
+++ b/net-misc/blogtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/blogtk
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/blogtk/ChangeLog,v 1.15 2008/07/26 22:48:58 eva Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/blogtk/ChangeLog,v 1.16 2009/01/29 21:51:23 eva Exp $
+
+  29 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/blogtk-1.1-makefile.patch, blogtk-1.1.ebuild:
+  Fix parallel make issues, bug #239777.
 
   26 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org> ChangeLog:
   fix QA warnings. Fix various ebuild issues in 1.1. Add gettext and
diff --git a/net-misc/blogtk/Manifest b/net-misc/blogtk/Manifest
index fc3dc773c815..1ab21b538e35 100644
--- a/net-misc/blogtk/Manifest
+++ b/net-misc/blogtk/Manifest
@@ -3,16 +3,17 @@ Hash: SHA1
 
 AUX blogtk-1.0-destdir.patch 1029 RMD160 b27490b047b7c0a24b14098490cab90170ec8acf SHA1 689b3feb80e0aa357ea1da2790c1c998ec66db1a SHA256 d2ef0298f6cc0d5b0d33324486ee223cf40537492198fb9de5c8d5a3f568800e
 AUX blogtk-1.1-destdir.patch 1163 RMD160 c0a15007c0bb6d157e4d35aa92278e9ac60c3b32 SHA1 31da00d26de3840aabd0c12c61e88f84db76338f SHA256 2f605494fa69aec83df65df12a5379b45c701b5115ed6359cd3fc95d937eb6e1
+AUX blogtk-1.1-makefile.patch 817 RMD160 d0eaa25c22f5cc6021c46d14a0b2ff41cc700cce SHA1 b244ff04b93ebeb99234357e5c8adeda6308d6c6 SHA256 45abacdaffe3d896d6f981940b5ff542fad7e65be66f68f2af230e5a66245f48
 DIST BloGTK-1.1.tar.bz2 64325 RMD160 4ad92fc8f19106b89288d0a78431facb66316838 SHA1 f0736685f646b22a6302013ea384770bcab4cac7 SHA256 de12ee193f14e10f4d9a81804adb242316f42a27bc4c2bd11470b4b6c830eeab
 DIST blogtk_1.0.tar.bz2 52265 RMD160 fad7606d353adbbce0cf75692d7af77b49d158ad SHA1 0b7a7f3b02ccf0d0a109bc40a1d3ae9c86ed59f8 SHA256 350aaa54bba84953a084ed75f53fdf5769c24f2e6ba4945ca440ceab36448c5a
 EBUILD blogtk-1.0.ebuild 877 RMD160 49b34db4e0e5fe4048828fa877680ec22ece2959 SHA1 2261f5121f0380e9a384bf4410d04eabec2bee27 SHA256 7e6f033bcd382bd08280a81d2958f1459eafe878141e249b8e4ae47d1dcf5cbe
-EBUILD blogtk-1.1.ebuild 1275 RMD160 5a2ff8d456cf93a57c33ca8a5805f80e50a15558 SHA1 93726a21c596b14fb195ad514a6b36697093353c SHA256 891fe9f6efb00d0895c5653cc4b260720c43c429ee7a141a3023ed79baa4666c
-MISC ChangeLog 2389 RMD160 8f5f83a202bf5adf155e7e694ecfe1cb55f6c4d3 SHA1 c39b1cfe81c7b8d94e0c7dc60fdede16da5752f3 SHA256 18ec118e3f5a2b6597d2e2bd80827485f22c4e91a888ae25dfcc41f063c85357
+EBUILD blogtk-1.1.ebuild 1359 RMD160 8a034a8a4712f14bd1bcfe8e82eae2ea0d087f6c SHA1 e8e3804a984a60bf25843eda64807bb5e3772c8d SHA256 90f8e54d68f5304eb9674027660a877d5166ab1cff222b7a350e44f1c85542e8
+MISC ChangeLog 2540 RMD160 97cf6eca8673ad469680980e0ce0e37d337ad0af SHA1 e748773ae875de99edd2df1934d5f53d9484b15d SHA256 387690686c5c907c3554440c938564d5ca2c05d696bf405a430d55dc4d441777
 MISC metadata.xml 220 RMD160 189ec4e34d1f0af3a68f1c5c8d62b6a43efa5d04 SHA1 2de8ad8c1f3b39c0d4da9cf7ff8d29cc326035f7 SHA256 77201144984d46bed7f03b0cfe632236c176d645cb04566c7954a6218b968f98
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiLqeMACgkQ1fmVwcYIWAbxLACg3RVxPW8F2raKb7UzAioYHl0/
-Iw0An2ruM2FsWmHfpW5vSCLi14MEof5T
-=nMUX
+iEYEARECAAYFAkmCMvAACgkQ1fmVwcYIWAa9eACdHFCFvahkPyX58vlWdkR/G3Fk
+jXcAoOQsfRg6lRY1Rj5uB1XluPUWxrrt
+=NhnR
 -----END PGP SIGNATURE-----
diff --git a/net-misc/blogtk/blogtk-1.1.ebuild b/net-misc/blogtk/blogtk-1.1.ebuild
index b3b4fa022892..38957ecddf92 100644
--- a/net-misc/blogtk/blogtk-1.1.ebuild
+++ b/net-misc/blogtk/blogtk-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/blogtk/blogtk-1.1.ebuild,v 1.6 2008/07/26 22:48:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/blogtk/blogtk-1.1.ebuild,v 1.7 2009/01/29 21:51:23 eva Exp $
 
 inherit eutils fdo-mime python
 
@@ -32,6 +32,9 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-destdir.patch"
 
+	# Fix parallel make issues, bug #239777
+	epatch "${FILESDIR}/${P}-makefile.patch"
+
 	# Respect multilib
 	sed -i "s:lib/blogtk:$(get_libdir)/blogtk:g" Makefile || die "sed failed"
 }
diff --git a/net-misc/blogtk/files/blogtk-1.1-makefile.patch b/net-misc/blogtk/files/blogtk-1.1-makefile.patch
new file mode 100644
index 000000000000..af873e58aa39
--- /dev/null
+++ b/net-misc/blogtk/files/blogtk-1.1-makefile.patch
@@ -0,0 +1,20 @@
+--- a/Makefile	2008-11-22 02:11:42.768480178 +0100
++++ b/Makefile	2008-11-22 02:12:12.664007668 +0100
+@@ -19,8 +19,8 @@
+ PYFILES := $(shell $(FIND) . -name "*.py" -print)
+ 
+ install: 
+-	mv src/BloGTK.py src/BloGTK.py.old
+-	sed -e "s|/usr/share|$(PREFIX)/share|g" src/BloGTK.py.old > src/BloGTK.py
++	mv src/BloGTK.py src/BloGTK.py.old; \
++	sed -e "s|/usr/share|$(PREFIX)/share|g" src/BloGTK.py.old > src/BloGTK.py; \
+ 	rm src/BloGTK.py.old
+ 	$(INSTALL) -m 755 -d $(BINDIR) $(LIBDIR) $(DATADIR) $(APPLICATIONSDIR)	$(ICONDIR) 
+ 	$(INSTALL) -m 755 src/* $(LIBDIR)
+@@ -28,5 +28,5 @@
+ 	$(INSTALL) -m 644 data/blogtk-icon.png $(ICONDIR)
+ 	$(INSTALL) -m 644 data/blogtk.desktop $(APPLICATIONSDIR)
+ 
+-	ln -sf $(LIBDIR)/BloGTK.py $(BINDIR)/BloGTK
++	ln -sf $(LIBDIR)/BloGTK.py $(BINDIR)/BloGTK; \
+ 	chmod +x $(LIBDIR)/BloGTK.py