as-needed patch thanks to Krzysztof Nowicki <krissn@op.pl> in bug 147731

Package-Manager: portage-2.1.2_rc2-r1

diff --git a/media-gfx/showimg/ChangeLog b/media-gfx/showimg/ChangeLog
index 459d305902d62e1ca9eed15dd70ba712b8e8fdde..8c4e53e3be32f8eec75624ad9daa49d947c352ae 100644 (file)
--- a/media-gfx/showimg/ChangeLog
+++ b/media-gfx/showimg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/showimg
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/ChangeLog,v 1.36 2006/09/05 18:34:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/ChangeLog,v 1.37 2006/11/20 20:47:19 genstef Exp $
+
+  20 Nov 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/showimg-0.9.5-as-needed.patch, showimg-0.9.5.ebuild:
+  as-needed patch thanks to Krzysztof Nowicki <krissn@op.pl> in bug 147731
 
   05 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> showimg-0.9.5.ebuild:
   Stable on sparc

diff --git a/media-gfx/showimg/Manifest b/media-gfx/showimg/Manifest
index f1ca220a3de9ed716bab9aaaa9b532e26cf120c5..7a7807919aef4c223aa6aca691062e30c2620819 100644 (file)
--- a/media-gfx/showimg/Manifest
+++ b/media-gfx/showimg/Manifest
@@ -1,20 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX showimg-0.9.5-as-needed.patch 1027 RMD160 06d412091020a7bb391c3df6f2356c525d1a54f5 SHA1 1585f168f6ddc7a7dece90ade5a11ed25d5dc26f SHA256 96a0caf6086ee675c87db6e22dc4e8a0c9cad9c41f5552573ac44c1a53abd341
+MD5 c62eea1eb3b3f8687707b528eabe39b2 files/showimg-0.9.5-as-needed.patch 1027
+RMD160 06d412091020a7bb391c3df6f2356c525d1a54f5 files/showimg-0.9.5-as-needed.patch 1027
+SHA256 96a0caf6086ee675c87db6e22dc4e8a0c9cad9c41f5552573ac44c1a53abd341 files/showimg-0.9.5-as-needed.patch 1027
 DIST showimg-0.9.4-1.tar.bz2 1574750 RMD160 e92de226e97256fe5cb2d4b1f899a084fd158d90 SHA256 241f92a7e4495336e4b54c6d335349f7df406ec3e6e341edb6e3a32dbfe67256
-DIST showimg-0.9.5.tar.bz2 4117897 RMD160 150dc74f400b72a22f6a117aa3acd8201a059a39 SHA256 d9c5e3174551272fffba1a530e83d2b2db60bb80e88af9dc2c060337e60bc105
+DIST showimg-0.9.5.tar.bz2 4117897 RMD160 150dc74f400b72a22f6a117aa3acd8201a059a39 SHA1 59d3a1f1a22761e0576d98e6cc6f430cc3822643 SHA256 d9c5e3174551272fffba1a530e83d2b2db60bb80e88af9dc2c060337e60bc105
 EBUILD showimg-0.9.4.1.ebuild 754 RMD160 9ede5719c91a0b355c0f4f65c5507fbe3a5ba64f SHA1 3d85b0c56530f19a9aa35a486e6678bea85790e8 SHA256 73f4d044f80d7bcb7ff36f2c3c9b500719e66d9dc5346af6ca2e29a39b327848
 MD5 3bfc3fc507e7483ab9d839c95624f668 showimg-0.9.4.1.ebuild 754
 RMD160 9ede5719c91a0b355c0f4f65c5507fbe3a5ba64f showimg-0.9.4.1.ebuild 754
 SHA256 73f4d044f80d7bcb7ff36f2c3c9b500719e66d9dc5346af6ca2e29a39b327848 showimg-0.9.4.1.ebuild 754
-EBUILD showimg-0.9.5.ebuild 1179 RMD160 32b2d8704357cf32ad758e872c90c0c55767597b SHA1 ac071ea6ad067a34048710468ff84c6d3a3c57b7 SHA256 8c37538d32a392ae0a204344c1218e7a2c62703f65b4146434df5d00cd4d88a8
-MD5 53deb2f90050805ae0a3b9764ed1dd0f showimg-0.9.5.ebuild 1179
-RMD160 32b2d8704357cf32ad758e872c90c0c55767597b showimg-0.9.5.ebuild 1179
-SHA256 8c37538d32a392ae0a204344c1218e7a2c62703f65b4146434df5d00cd4d88a8 showimg-0.9.5.ebuild 1179
-MISC ChangeLog 3869 RMD160 7eee8e32e302d4faf604bdced34b8c59b2c100b3 SHA1 bb7bc809fe4e5076ab9888b7d6f6e6a69afcf717 SHA256 09938a3d715d4fe0bb5e7ba2ed836c819dbe39d3b81cdc716577f2f798a40f34
-MD5 53e2629a71b0eb916ec687e8c73c7a61 ChangeLog 3869
-RMD160 7eee8e32e302d4faf604bdced34b8c59b2c100b3 ChangeLog 3869
-SHA256 09938a3d715d4fe0bb5e7ba2ed836c819dbe39d3b81cdc716577f2f798a40f34 ChangeLog 3869
+EBUILD showimg-0.9.5.ebuild 1267 RMD160 8d84739d2bbbd3f00df7aeac988b829ad0adc129 SHA1 03cc2b01c40ecf75668627fc2aa0efb3af84d43c SHA256 2fbd9bb898fed1ededa28d1b26a1c0b4a3e74410cd0fba5d3426917ddfaa9c4b
+MD5 ad9ad1767b9b50bfb2c75f553dd143cf showimg-0.9.5.ebuild 1267
+RMD160 8d84739d2bbbd3f00df7aeac988b829ad0adc129 showimg-0.9.5.ebuild 1267
+SHA256 2fbd9bb898fed1ededa28d1b26a1c0b4a3e74410cd0fba5d3426917ddfaa9c4b showimg-0.9.5.ebuild 1267
+MISC ChangeLog 4059 RMD160 b02d45d87f8e48376b0d71f04c80588294398107 SHA1 4ed409f36df05e0b99c6567e675b0fc52c55f404 SHA256 6240882243340c9ca52acb84ea8cc0353d3e57ec6cbd553edf09a292038a11e3
+MD5 28894a025eb32773d00ea0b516481ee7 ChangeLog 4059
+RMD160 b02d45d87f8e48376b0d71f04c80588294398107 ChangeLog 4059
+SHA256 6240882243340c9ca52acb84ea8cc0353d3e57ec6cbd553edf09a292038a11e3 ChangeLog 4059
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -25,10 +26,3 @@ SHA256 668ed4b9bef9e7def6fce5d99062b5d5ce4aeed0f753df019688bd72cab67504 files/di
 MD5 ceb413c5b83a142c00fe58634cb2b96f files/digest-showimg-0.9.5 247
 RMD160 30891c052e415ba64ea41c07b360bf736642ead1 files/digest-showimg-0.9.5 247
 SHA256 bc8063bdf55ea7dacf53f85ed0a886eb7041fa9764a18839d8b8985e5e2f1ca0 files/digest-showimg-0.9.5 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFE/cNHKRy60XGEcJIRAoyBAJ4r9Bw3bux8/8hNHYecx/H5nImn5ACePrwp
-m6TJv+0JFHJRwLFZJP4ue8A=
-=gAJx
------END PGP SIGNATURE-----

diff --git a/media-gfx/showimg/files/showimg-0.9.5-as-needed.patch b/media-gfx/showimg/files/showimg-0.9.5-as-needed.patch
new file mode 100644 (file)
index 0000000..acea1cc
--- /dev/null
+++ b/media-gfx/showimg/files/showimg-0.9.5-as-needed.patch
@@ -0,0 +1,18 @@
+diff -Naur showimg-0.9.5.orig/showimg/kexi/kexidb/Makefile.am showimg-0.9.5/showimg/kexi/kexidb/Makefile.am
+--- showimg-0.9.5.orig/showimg/kexi/kexidb/Makefile.am 2006-01-07 09:47:47.000000000 +0100
++++ showimg-0.9.5/showimg/kexi/kexidb/Makefile.am      2006-09-14 10:39:19.000000000 +0200
+@@ -25,7 +25,7 @@
+ #  relationship.h parser/parser.h transaction.h \
+ #  kexidb_export.h
+ 
+-libshowimgkexidb_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO)
++libshowimgkexidb_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(showimg_top_srcdir)/kexi/kexiutils/libshowimgkexiutils.la
+ libshowimgkexidb_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ kde_servicetypes_DATA = showimg_kexidb_driver.desktop
+diff -Naur showimg-0.9.5.orig/showimg/kexi/Makefile.am showimg-0.9.5/showimg/kexi/Makefile.am
+--- showimg-0.9.5.orig/showimg/kexi/Makefile.am        2006-01-07 09:47:50.000000000 +0100
++++ showimg-0.9.5/showimg/kexi/Makefile.am     2006-09-14 10:50:49.000000000 +0200
+@@ -1 +1 @@
+-SUBDIRS= 3rdparty kexidb kexiutils
++SUBDIRS= 3rdparty kexiutils kexidb

diff --git a/media-gfx/showimg/showimg-0.9.5.ebuild b/media-gfx/showimg/showimg-0.9.5.ebuild
index 14ac84f86f0f4806f45e161b3d68c5d83f36d10a..079571de533057f8c876c3f25d74f6472b9d127c 100644 (file)
--- a/media-gfx/showimg/showimg-0.9.5.ebuild
+++ b/media-gfx/showimg/showimg-0.9.5.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/showimg/showimg-0.9.5.ebuild,v 1.6 2006/09/05 18:34:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/showimg-0.9.5.ebuild,v 1.7 2006/11/20 20:47:19 genstef Exp $
 
 inherit kde eutils
 
@@ -28,7 +28,14 @@ DEPEND="|| ( kde-base/libkonq kde-base/kdebase )
        media-libs/libexif"
 need-kde 3.4
 
-src_compile(){
+
+src_unpack() {
+       unpack "${A}"
+       cd "${S}"
+       epatch "${FILESDIR}/${P}-as-needed.patch"
+}
+
+src_compile() {
        local myconf="--with-showimgdb \
                $(use_enable exif kexif) \
                $(use_enable kipi libkipi) \