Version bump, and patch to respect DESTDIR and to prevent prestripping of qiv binary. Thanks to Phillip Berndt for original ebuild and software itself.

(Portage version: 2.1.3_rc9)

6 files changed, 78 insertions, 25 deletions

diff --git a/media-gfx/pqiv/ChangeLog b/media-gfx/pqiv/ChangeLog
index 83b014515c5f..1f5dd97a8272 100644
--- a/media-gfx/pqiv/ChangeLog
+++ b/media-gfx/pqiv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/pqiv
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pqiv/ChangeLog,v 1.5 2007/06/19 13:59:33 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pqiv/ChangeLog,v 1.6 2007/07/27 11:53:09 drac Exp $
+
+*pqiv-0.4_rc1 (27 Jul 2007)
+
+  27 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  +files/pqiv-0.4_rc1-Makefile.patch, +pqiv-0.4_rc1.ebuild:
+  Version bump, and patch to respect DESTDIR and to prevent prestripping of
+  qiv binary. Thanks to Phillip Berndt for original ebuild and software
+  itself.
 
 *pqiv-0.2 (19 Jun 2007)
 
diff --git a/media-gfx/pqiv/files/digest-pqiv-0.2 b/media-gfx/pqiv/files/digest-pqiv-0.2
deleted file mode 100644
index 20ab7e1fd526..000000000000
--- a/media-gfx/pqiv/files/digest-pqiv-0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cc1248d518ff1e4dccfe7c9eda5fdabf pqiv-0.2.tbz 12113
-RMD160 5c3ba7602706bd1f78fda78dcaf0bd3e24914a9a pqiv-0.2.tbz 12113
-SHA256 e88e9e32108412f2748876fb8e92bbfac9481666d385ba7237c63c8b5b3c73a8 pqiv-0.2.tbz 12113
diff --git a/media-gfx/pqiv/files/digest-pqiv-0.4_rc1 b/media-gfx/pqiv/files/digest-pqiv-0.4_rc1
new file mode 100644
index 000000000000..bb6fe274dd16
--- /dev/null
+++ b/media-gfx/pqiv/files/digest-pqiv-0.4_rc1
@@ -0,0 +1,3 @@
+MD5 86afcd07f83a3362fe4cb8ff983a4198 pqiv-0.4_rc1.tbz 15333
+RMD160 d553d12e9b4f17c2cd9ca59d9e048c456a010e2b pqiv-0.4_rc1.tbz 15333
+SHA256 4424456ccf26d7d392f67208e49c4aab591cac2e987f2a99c6aa4fcc378c52c8 pqiv-0.4_rc1.tbz 15333
diff --git a/media-gfx/pqiv/files/pqiv-0.4_rc1-Makefile.patch b/media-gfx/pqiv/files/pqiv-0.4_rc1-Makefile.patch
new file mode 100644
index 000000000000..b63660f8d21e
--- /dev/null
+++ b/media-gfx/pqiv/files/pqiv-0.4_rc1-Makefile.patch
@@ -0,0 +1,33 @@
+diff -ur pqiv-0.4_rc1.orig/Makefile pqiv-0.4_rc1/Makefile
+--- pqiv-0.4_rc1.orig/Makefile	2007-07-26 15:32:14.000000000 +0300
++++ pqiv-0.4_rc1/Makefile	2007-07-27 14:47:03.000000000 +0300
+@@ -1,20 +1,20 @@
+-PREFIX=/
++PREFIX=/usr
+ 
+ pqiv:
+-	gcc $(CFLAGS) `pkg-config --libs --cflags gtk+-2.0 gthread-2.0 pango glib` -o qiv pqiv.c
++	$(CC) $(CFLAGS) `pkg-config --libs --cflags gtk+-2.0 gthread-2.0 pango glib` -o qiv pqiv.c
+ 
+ debug:
+-	gcc $(CGLAGS) -Wall -ggdb -DDEBUG `pkg-config --libs --cflags gtk+-2.0 gthread-2.0 pango glib` -o qiv pqiv.c
++	$(CC) $(CGLAGS) -Wall -ggdb -DDEBUG `pkg-config --libs --cflags gtk+-2.0 gthread-2.0 pango glib` -o qiv pqiv.c
+ 
+ install: pqiv
+-	install -Ds qiv $(PREFIX)/usr/bin/qiv
+-	install -D qiv.1 $(PREFIX)/usr/share/man/man1/pqiv.1
+-	link $(PREFIX)/usr/share/man/man1/pqiv.1 $(PREFIX)/usr/share/man/man1/qiv.1
++	install -D qiv $(DESTDIR)$(PREFIX)/bin/qiv
++	install -D qiv.1 $(DESTDIR)$(PREFIX)/share/man/man1/pqiv.1
++	link $(DESTDIR)$(PREFIX)/share/man/man1/pqiv.1 $(DESTDIR)$(PREFIX)/share/man/man1/qiv.1
+ 
+ uninstall:
+-	rm $(PREFIX)/usr/bin/qiv
+-	rm $(PREFIX)/usr/share/man/man1/qiv.1
+-	rm $(PREFIX)/usr/share/man/man1/pqiv.1
++	rm $(DESTDIR)$(PREFIX)/bin/qiv
++	rm $(DESTDIR)$(PREFIX)/share/man/man1/qiv.1
++	rm $(DESTDIR)$(PREFIX)/share/man/man1/pqiv.1
+ 
+ clean:
+ 	rm -f qiv
diff --git a/media-gfx/pqiv/pqiv-0.2.ebuild b/media-gfx/pqiv/pqiv-0.2.ebuild
deleted file mode 100644
index 8ab4c1d38380..000000000000
--- a/media-gfx/pqiv/pqiv-0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pqiv/pqiv-0.2.ebuild,v 1.1 2007/06/19 13:59:33 drac Exp $
-
-DESCRIPTION="PyGTK+ rewrite of Quick Image Viewer"
-HOMEPAGE="http://www.pberndt.com/Programme/Linux/pqiv"
-SRC_URI="http://www.pberndt.com/raw/Programme/Linux/${PN}/_download/${P}.tbz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pygtk"
-DEPEND=""
-
-src_install() {
-	newbin pqiv.py qiv
-	doman qiv.1
-	dodoc README
-}
diff --git a/media-gfx/pqiv/pqiv-0.4_rc1.ebuild b/media-gfx/pqiv/pqiv-0.4_rc1.ebuild
new file mode 100644
index 000000000000..9a30eec1e1b5
--- /dev/null
+++ b/media-gfx/pqiv/pqiv-0.4_rc1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pqiv/pqiv-0.4_rc1.ebuild,v 1.1 2007/07/27 11:53:09 drac Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Modern rewrite of Quick Image Viewer"
+HOMEPAGE="http://www.pberndt.com/Programme/Linux/pqiv"
+SRC_URI="http://www.pberndt.com/raw/Programme/Linux/${PN}/_download/${P}.tbz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.8"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc README
+}