Add patch to fix building with --as-needed, thanks David Philippi for patch (bug #144382) and patience.

Package-Manager: portage-2.1.2_pre2-r2

4 files changed, 55 insertions, 10 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 5feebf9dcd71..8b3f260964ee 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.60 2006/09/20 12:12:32 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.61 2006/10/04 10:31:16 flameeyes Exp $
+
+  04 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/digikam-0.9.0_beta2-asneeded.patch, digikam-0.9.0_beta2.ebuild:
+  Add patch to fix building with --as-needed, thanks David Philippi for patch
+  (bug #144382) and patience.
 
 *digikam-0.9.0_beta2 (20 Sep 2006)
 
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 0de3f70664c0..71ab3ec63cec 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX digikam-0.9.0_beta1-memory-leak-fix.patch 2182 RMD160 0cb1ffed1a95f288dc1e3788d085c833d5c464ac SHA1 fc01e4f76aa5a8dceee6d45a67babfa824f5e257 SHA256 5bb5564e97d63f88106c5ee264527fb14967ae2c24d612f58a14d4b48a308b4e
 MD5 d98a7c321df884d1cd99976387989f64 files/digikam-0.9.0_beta1-memory-leak-fix.patch 2182
 RMD160 0cb1ffed1a95f288dc1e3788d085c833d5c464ac files/digikam-0.9.0_beta1-memory-leak-fix.patch 2182
@@ -6,6 +9,10 @@ AUX digikam-0.9.0_beta1-rate-pictures-fix.diff 6139 RMD160 56daeece324fd4117ab03
 MD5 a58c5d610507ee840224a84a03e45a1a files/digikam-0.9.0_beta1-rate-pictures-fix.diff 6139
 RMD160 56daeece324fd4117ab03fb8b421f639f43eddf5 files/digikam-0.9.0_beta1-rate-pictures-fix.diff 6139
 SHA256 33497a2f0b345b4bf4db0680efa2e5c3ffcf6d65a8fdc919b0ea6f8255a504c5 files/digikam-0.9.0_beta1-rate-pictures-fix.diff 6139
+AUX digikam-0.9.0_beta2-asneeded.patch 1271 RMD160 cb1bee28a3056604a84191f237926560defea747 SHA1 ccfd6ce7531b7a8449545c9bdd4ee82841bd1c75 SHA256 a9fc202af21cac08fce1cc0ac293f4f0082d33f0b668db5aa1e30c38e17a5529
+MD5 5bcd4f3c4eb99b5d2e7bdd8eb0decc4a files/digikam-0.9.0_beta2-asneeded.patch 1271
+RMD160 cb1bee28a3056604a84191f237926560defea747 files/digikam-0.9.0_beta2-asneeded.patch 1271
+SHA256 a9fc202af21cac08fce1cc0ac293f4f0082d33f0b668db5aa1e30c38e17a5529 files/digikam-0.9.0_beta2-asneeded.patch 1271
 DIST digikam-0.7.4.tar.bz2 2322119 RMD160 c69b2b90ec56cf5e3f536b017db2310e325927b8 SHA256 38139c41863064d7d388b1d927747392f43f2c97cb55700d7a8f697378cc8cc2
 DIST digikam-0.8.1.tar.bz2 3783559 RMD160 36e034cf1ddc783d7c8f9e28899862e1dce6ef0d SHA1 1bd89b9568c5b1edded6632edf73775ef9e798ff SHA256 4f0ad787fe8a4bf651cb1db7b896024fbb6abfd47527a64cb712b18e5ea4d87f
 DIST digikam-0.8.2.tar.bz2 4015299 RMD160 6dfc3626d606427e06327c2451010fc50f96df2e SHA1 6305b1c485a3fe82257907410b256966bb012406 SHA256 f6f18c2ad2587cc8477512abb648fed7c9da53ef63dc36e7925e995cf6a2e043
@@ -50,14 +57,14 @@ EBUILD digikam-0.9.0_beta1.ebuild 2592 RMD160 63bf5f1f2d0db655ffdcc910f1c60e9a91
 MD5 f3ce4ba17cf00ae52c47c9a4d7b49693 digikam-0.9.0_beta1.ebuild 2592
 RMD160 63bf5f1f2d0db655ffdcc910f1c60e9a918efe2e digikam-0.9.0_beta1.ebuild 2592
 SHA256 8f711d20ebb17e21949babb5e53e902b9d4b4bd6c558d1fe91b6f36037bcc53e digikam-0.9.0_beta1.ebuild 2592
-EBUILD digikam-0.9.0_beta2.ebuild 2587 RMD160 3ff6602416dc321e549e39d0bb6bda86e1c73a66 SHA1 6c768bef263b9bf11dc72b4da3e123dd8f546124 SHA256 a6c62c39357cbc59742a6cca8913560bf113050e38b30ff3d362ae323236b75d
-MD5 eb2c0c4d26263660f7a1c75fdc51a140 digikam-0.9.0_beta2.ebuild 2587
-RMD160 3ff6602416dc321e549e39d0bb6bda86e1c73a66 digikam-0.9.0_beta2.ebuild 2587
-SHA256 a6c62c39357cbc59742a6cca8913560bf113050e38b30ff3d362ae323236b75d digikam-0.9.0_beta2.ebuild 2587
-MISC ChangeLog 9497 RMD160 366525c05d52c278f766e70e42dbba54ed2d6132 SHA1 00cc70588557ea03915e7a24da7d7680faec3116 SHA256 6d1100858996a46ce4290d7063573a6499a9c94099f2c2eba04c6428a06724e6
-MD5 30d14ad6a9ce91bd1e2c3b1abe7228b4 ChangeLog 9497
-RMD160 366525c05d52c278f766e70e42dbba54ed2d6132 ChangeLog 9497
-SHA256 6d1100858996a46ce4290d7063573a6499a9c94099f2c2eba04c6428a06724e6 ChangeLog 9497
+EBUILD digikam-0.9.0_beta2.ebuild 2628 RMD160 043951359e46ec3b649db6d465f54a61b31cd908 SHA1 3d01552e4a990190e91442061241b559aaa9276a SHA256 2c5c896d88ec70d7b536bb61c8e17f57f02df13811e892d30c7e071dd5cff6d1
+MD5 073623ff7022b815108482db71a5468c digikam-0.9.0_beta2.ebuild 2628
+RMD160 043951359e46ec3b649db6d465f54a61b31cd908 digikam-0.9.0_beta2.ebuild 2628
+SHA256 2c5c896d88ec70d7b536bb61c8e17f57f02df13811e892d30c7e071dd5cff6d1 digikam-0.9.0_beta2.ebuild 2628
+MISC ChangeLog 9730 RMD160 42d65e941afecd085af67279336afbce2ff607b8 SHA1 264f9830292d140e7f3efaf8b983c25af52fea52 SHA256 6453dba2c66fd9f6a0e6b34448fea0f2af22d3616dd2acc71e1e8219ef2f82c2
+MD5 12cad1b6b71a335077fb56191253a340 ChangeLog 9730
+RMD160 42d65e941afecd085af67279336afbce2ff607b8 ChangeLog 9730
+SHA256 6453dba2c66fd9f6a0e6b34448fea0f2af22d3616dd2acc71e1e8219ef2f82c2 ChangeLog 9730
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -86,3 +93,10 @@ SHA256 7c7101a2d176bc6c351a54c566960338fc91b9922342ff0df35c9544d6da6b9c files/di
 MD5 9d9ecdd6caf8f933f324dcb420303721 files/digest-digikam-0.9.0_beta2 2942
 RMD160 41c71a371f9421b876b3018e35b314edd95e36e4 files/digest-digikam-0.9.0_beta2 2942
 SHA256 ddc1d0681ca3a9dcec30a629e1fd018f6e8135f224b2a2b9b30a891d1ea562b6 files/digest-digikam-0.9.0_beta2 2942
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFI418AiZjviIA2XgRAgbEAKDcsDTrg4ifiBp7gNcFSDaDlSLo8gCfRdmT
+HAjczqqRv6GwSuPkUWpgUFM=
+=OQmL
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-0.9.0_beta2.ebuild b/media-gfx/digikam/digikam-0.9.0_beta2.ebuild
index 771088cdaf1d..b059a89a61f6 100644
--- a/media-gfx/digikam/digikam-0.9.0_beta2.ebuild
+++ b/media-gfx/digikam/digikam-0.9.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.0_beta2.ebuild,v 1.1 2006/09/20 12:12:32 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.0_beta2.ebuild,v 1.2 2006/10/04 10:31:16 flameeyes Exp $
 
 inherit kde
 
@@ -55,6 +55,8 @@ SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2
 	doc? ( linguas_en? ( mirror://gentoo/${P_DOC}-gentoo.tar.bz2 )
 		!linguas_en? ( ${SRC_URI} ) )"
 
+PATCHES="${FILESDIR}/${P}-asneeded.patch"
+
 pkg_setup(){
 	slot_rebuild "media-libs/libkipi" && die
 	kde_pkg_setup
diff --git a/media-gfx/digikam/files/digikam-0.9.0_beta2-asneeded.patch b/media-gfx/digikam/files/digikam-0.9.0_beta2-asneeded.patch
new file mode 100644
index 000000000000..a876503db3e9
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-0.9.0_beta2-asneeded.patch
@@ -0,0 +1,24 @@
+--- digikam-0.9.0-beta2/digikam/showfoto/Makefile.am.orig	2006-09-30 19:23:15.000000000 +0200
++++ digikam-0.9.0-beta2/digikam/showfoto/Makefile.am	2006-09-30 19:21:53.000000000 +0200
+@@ -22,9 +22,7 @@
+ 
+ showfoto_SOURCES = main.cpp showfoto.cpp 
+ 
+-showfoto_LDADD   = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KUTILS) \
+-		   $(LIB_KFILE) $(LIB_KPARTS) $(LIBJPEG) $(LIB_EXIV2) \
+-		   $(top_builddir)/digikam/showfoto/setup/libsetup.la \
++showfoto_LDADD   = $(top_builddir)/digikam/showfoto/setup/libsetup.la \
+ 		   $(top_builddir)/digikam/libs/widgets/libwidgets.la \
+ 		   $(top_builddir)/digikam/libs/dialogs/libdialog.la \
+ 		   $(top_builddir)/digikam/libs/imageproperties/libimagepropertiesshowfoto.la \
+@@ -33,7 +31,9 @@
+ 		   $(top_builddir)/digikam/utilities/imageeditor/editor/libdimgeditor.la \
+ 		   $(top_builddir)/digikam/utilities/imageeditor/editor/libshowfoto.la \
+ 		   $(top_builddir)/digikam/utilities/splashscreen/libsplashscreen.la \
+-		   $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la
++		   $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la \
++		   $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KUTILS) \
++		   $(LIB_KFILE) $(LIB_KPARTS) $(LIBJPEG) $(LIB_EXIV2) 
+ 
+ showfoto_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+