Fix problems with parallel make. Fixes bug #72779.

diff --git a/kde-misc/komics/ChangeLog b/kde-misc/komics/ChangeLog
index 391c48007812bc8ade03acc4d2174e0d8f3fc941..b2fbe851143ef419b4335d7f8453668bce165340 100644 (file)
--- a/kde-misc/komics/ChangeLog
+++ b/kde-misc/komics/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/komics
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/komics/ChangeLog,v 1.3 2004/11/28 18:39:36 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/komics/ChangeLog,v 1.4 2004/11/29 16:08:57 motaboy Exp $
+
+  29 Nov 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/komics-1.4-Makefiles.patch, komics-1.4.ebuild:
+  Fix problems with parallel make. Fixes bug #72779.
 
 *komics-1.4 (28 Nov 2004)
 

diff --git a/kde-misc/komics/Manifest b/kde-misc/komics/Manifest
index f2432da54c8c7ed99faa135f5ddc450bd4467393..cb98a5ef9d35fb5fedd5f4ecf10d266bfacddd9f 100644 (file)
--- a/kde-misc/komics/Manifest
+++ b/kde-misc/komics/Manifest
@@ -1,8 +1,8 @@
 MD5 0138057efd42b6f6c6a235d234dd24dc komics-1.3.ebuild 798
 MD5 c3583226c903cbab71680e4b177b7733 komics-1.0.ebuild 588
 MD5 f0d3c357a17d62de63cd0a7fb4cbfef6 komics-1.2.ebuild 732
-MD5 b6966bd06960f72bf5ea6765b1a264fb komics-1.4.ebuild 675
-MD5 5980b21e7c47a1713a659747919a7309 ChangeLog 2330
+MD5 21274a9e08cf8d2f47ffd0ea1f84222c komics-1.4.ebuild 712
+MD5 6d3b130291fffd7650277dbc74702a3c ChangeLog 2489
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 78250fa508313c0d5d704b4398b04880 files/digest-komics-1.0 63
 MD5 1287f8b8cc536896a4a3db94d29d10c9 files/digest-komics-1.2 63
@@ -10,3 +10,4 @@ MD5 f21e02e1332ff99cf64e159ed0e7502c files/digest-komics-1.3 63
 MD5 fa8ba7139b31187b660ce22badd75289 files/digest-komics-1.4 63
 MD5 af3b9a959c22def6991fc0eeb5a2d955 files/komics-1.3-gcc34.patch 293
 MD5 27931c65c3407925b26fed69e1d68098 files/komics-1.4-gcc3.4.patch 366
+MD5 3cd58a3315a7690b2e36a622209a8199 files/komics-1.4-Makefiles.patch 1182

diff --git a/kde-misc/komics/files/komics-1.4-Makefiles.patch b/kde-misc/komics/files/komics-1.4-Makefiles.patch
new file mode 100644 (file)
index 0000000..f4737d2
--- /dev/null
+++ b/kde-misc/komics/files/komics-1.4-Makefiles.patch
@@ -0,0 +1,31 @@
+--- src/Makefile.am.orig       2004-11-29 10:27:33.000000000 +0000
++++ src/Makefile.am    2004-11-29 10:28:01.000000000 +0000
+@@ -25,7 +25,7 @@
+ bin_PROGRAMS = komics
+ komics_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ komics_SOURCES = main.cpp
+-komics_LDADD = $(top_builddir)/src/libkomics.la $(LIB_KDEUI) $(LIB_KIO)
++komics_LDADD = libkomics.la $(LIB_KDEUI) $(LIB_KIO)
+ 
+ #komics_bin_DATA = komics-bin.desktop
+ #komics_bindir = $(kde_datadir)/komics
+--- src/Makefile.in.orig       2004-11-29 10:27:45.000000000 +0000
++++ src/Makefile.in    2004-11-29 10:27:58.000000000 +0000
+@@ -273,7 +273,7 @@
+ bin_PROGRAMS = komics
+ komics_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ komics_SOURCES = main.cpp
+-komics_LDADD = $(top_builddir)/src/libkomics.la $(LIB_KDEUI) $(LIB_KIO)
++komics_LDADD = libkomics.la $(LIB_KDEUI) $(LIB_KIO)
+ 
+ #komics_bin_DATA = komics-bin.desktop
+ #komics_bindir = $(kde_datadir)/komics
+@@ -307,7 +307,7 @@
+ #>- komics_OBJECTS = $(am_komics_OBJECTS)
+ #>+ 1
+ komics_OBJECTS = main.$(OBJEXT)
+-komics_DEPENDENCIES = $(top_builddir)/src/libkomics.la
++komics_DEPENDENCIES = libkomics.la
+ 
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp

diff --git a/kde-misc/komics/komics-1.4.ebuild b/kde-misc/komics/komics-1.4.ebuild
index 7a768d84973398f25a45dc487a62995ec4e41ba9..9e4daf630214e3b467e81d8f228096c1445bd0f5 100644 (file)
--- a/kde-misc/komics/komics-1.4.ebuild
+++ b/kde-misc/komics/komics-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/komics/komics-1.4.ebuild,v 1.1 2004/11/28 18:39:36 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/komics/komics-1.4.ebuild,v 1.2 2004/11/29 16:08:57 motaboy Exp $
 
 inherit kde
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.orson.it/~domine/komics/${P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="arts"
+IUSE=""
 
 S=${WORKDIR}/komics
 
@@ -25,5 +25,6 @@ src_unpack() {
        kde_src_unpack
 
        epatch ${FILESDIR}/${P}-gcc3.4.patch
+       epatch ${FILESDIR}/${P}-Makefiles.patch
 }