summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2008-11-30 18:15:41 +0000
committerMarkus Meier <maekke@gentoo.org>2008-11-30 18:15:41 +0000
commitb5116bffb3992f178034a5119f9fd17a46f48554 (patch)
tree3d945f7aebc997e5bfeecfd83e047f186722433f /media-gfx
parentCleanup. (diff)
downloadhistorical-b5116bffb3992f178034a5119f9fd17a46f48554.tar.gz
historical-b5116bffb3992f178034a5119f9fd17a46f48554.tar.bz2
historical-b5116bffb3992f178034a5119f9fd17a46f48554.zip
fix building with forced as-needed, bug #247735
Package-Manager: portage-2.1.6_rc2/cvs/Linux 2.6.28-rc6 i686
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/pqiv/ChangeLog6
-rw-r--r--media-gfx/pqiv/Manifest15
-rw-r--r--media-gfx/pqiv/files/pqiv-0.7.1-as-needed.patch14
-rw-r--r--media-gfx/pqiv/pqiv-0.7.1.ebuild10
4 files changed, 40 insertions, 5 deletions
diff --git a/media-gfx/pqiv/ChangeLog b/media-gfx/pqiv/ChangeLog
index 84fd4cf1a97f..26175f3c8f1d 100644
--- a/media-gfx/pqiv/ChangeLog
+++ b/media-gfx/pqiv/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/pqiv
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pqiv/ChangeLog,v 1.13 2008/06/12 17:55:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pqiv/ChangeLog,v 1.14 2008/11/30 18:15:40 maekke Exp $
+
+ 30 Nov 2008; Markus Meier <maekke@gentoo.org>
+ +files/pqiv-0.7.1-as-needed.patch, pqiv-0.7.1.ebuild:
+ fix building with forced as-needed, bug #247735
12 Jun 2008; Raúl Porcel <armin76@gentoo.org> pqiv-0.7.1.ebuild:
x86 stable
diff --git a/media-gfx/pqiv/Manifest b/media-gfx/pqiv/Manifest
index 765c05390aaa..99c86e8ab728 100644
--- a/media-gfx/pqiv/Manifest
+++ b/media-gfx/pqiv/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pqiv-0.7.1-as-needed.patch 638 RMD160 0097f9e815e5b0afa8e7bc93d5ef8cdc63422e19 SHA1 84a724ae0db3e4f4873386f873a9d73423ff14a9 SHA256 ec3f5dadfb5a8c3cae7f1466970046718e10c13bf60e71af766011a05bda6114
DIST pqiv-0.7.1.tbz 30527 RMD160 75645c69b215cde6809c72aef924214ba1ddfe5c SHA1 f5560b6a5865a271321e8f09bae73da4c8ccd2c6 SHA256 659c5d1d12c080dff5152325a2391e01a2c9a6ea225d1f755a98e8766f318eef
-EBUILD pqiv-0.7.1.ebuild 708 RMD160 48467a0b009f0edf597a49490eeaad745133ae2e SHA1 fe2cdb027a34d549af5c914727add1e0e21a2e68 SHA256 a9a2d0a3d28003e4afa3cb9879ee3375c61515bd7f2129a1c14b48a84d50c11a
-MISC ChangeLog 1900 RMD160 3c57bbb315f400ff0d2bfb04b9487d7290e0c379 SHA1 8c44fee77a0f6db34f4acc6a40d9c6971cc6023c SHA256 38fd32805d08279e12ba3ee167695caad5e7eb8b7038b5a8ff7f71d5f60ad428
+EBUILD pqiv-0.7.1.ebuild 799 RMD160 2ad2ba21c9b82de72687e2524f2c06981e5b8a12 SHA1 866467185dd4b4f05ca983b0a4d69227a14f6d61 SHA256 ed3d520945823779728b2f614aa4a9cb649f5d4ecc1202c959c1a9e066e3dc84
+MISC ChangeLog 2054 RMD160 cd52af8eb973d2be8e27ad8dae6659afa8616cdd SHA1 b8612c3dc351b2406e6e13f0a1bc3bf63fd035c0 SHA256 608066f5ac9147d66d6f1da1e3ae223e4e52cad8a052d9bf27b85d80050ac6d9
MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkky2IkACgkQkKaRLQcq0GIW0wCfeQD/pWqO5DRc3qmPiFESoQqk
+yqkAnA8HXlCpaV1X7SAfdaxveTx5rhLS
+=sMYQ
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/pqiv/files/pqiv-0.7.1-as-needed.patch b/media-gfx/pqiv/files/pqiv-0.7.1-as-needed.patch
new file mode 100644
index 000000000000..f40a1bb971d6
--- /dev/null
+++ b/media-gfx/pqiv/files/pqiv-0.7.1-as-needed.patch
@@ -0,0 +1,14 @@
+diff -ru pqiv-0.7.1.orig/Makefile pqiv-0.7.1/Makefile
+--- pqiv-0.7.1.orig/Makefile 2008-11-30 19:07:53.000000000 +0100
++++ pqiv-0.7.1/Makefile 2008-11-30 19:08:49.000000000 +0100
+@@ -13,7 +13,7 @@
+ # pqiv
+ all: pqiv manpage
+ pqiv:
+- $(CC) $(CFLAGS) `pkg-config --libs --cflags $(REQUIRED_PACKAGES)` -o qiv $(OPTIONFLAGS) pqiv.c
++ $(CC) $(CFLAGS) `pkg-config --cflags $(REQUIRED_PACKAGES)` $(OPTIONFLAGS) pqiv.c `pkg-config --libs $(REQUIRED_PACKAGES)` -o qiv
+ debug:
+ $(CC) $(CGLAGS) -Wall -ggdb -DDEBUG `pkg-config --libs --cflags $(REQUIRED_PACKAGES)` $(OPTIONFLAGS) -o qiv pqiv.c
+
+Only in pqiv-0.7.1: qiv
+Only in pqiv-0.7.1: qiv.1
diff --git a/media-gfx/pqiv/pqiv-0.7.1.ebuild b/media-gfx/pqiv/pqiv-0.7.1.ebuild
index 51cb295bf8b4..c8d16d52bb32 100644
--- a/media-gfx/pqiv/pqiv-0.7.1.ebuild
+++ b/media-gfx/pqiv/pqiv-0.7.1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pqiv/pqiv-0.7.1.ebuild,v 1.3 2008/06/12 17:55:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pqiv/pqiv-0.7.1.ebuild,v 1.4 2008/11/30 18:15:40 maekke Exp $
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
DESCRIPTION="Modern rewrite of Quick Image Viewer"
HOMEPAGE="http://www.pberndt.com/Programme/Linux/pqiv"
@@ -17,6 +17,12 @@ RDEPEND=">=x11-libs/gtk+-2.8"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-as-needed.patch
+}
+
src_compile() {
tc-export CC
emake || die "emake failed."