media-gfx/printoxx: Version bump and general rewrite. Fixed building with LDFLAGS set, the installation procedure and usermanual display support.

svn path=/sunrise/; revision=10907

5 files changed, 79 insertions, 33 deletions

diff --git a/media-gfx/printoxx/ChangeLog b/media-gfx/printoxx/ChangeLog
index 99f2516b4..fae0f1b0b 100644
--- a/media-gfx/printoxx/ChangeLog
+++ b/media-gfx/printoxx/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for media-gfx/printoxx
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*printoxx-2.7 (04 Jul 2010)
+
+  04 Jul 2010; Michał Górny (sedzimir) <mgorny.3ehbo@mailnull.com>
+  -printoxx-2.0.1.ebuild, +printoxx-2.7.ebuild,
+  +files/printoxx-2.7-Makefile-ldflags-fix.diff:
+  Version bump and general rewrite. Fixed building with LDFLAGS set, the
+  installation procedure and usermanual display support.
+
   12 Jul 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   printoxx-2.0.1.ebuild:
   Add missing quotes
diff --git a/media-gfx/printoxx/Manifest b/media-gfx/printoxx/Manifest
index 15d67a396..3ccd09b3c 100644
--- a/media-gfx/printoxx/Manifest
+++ b/media-gfx/printoxx/Manifest
@@ -1,4 +1,5 @@
-DIST printoxx-2.0.1.tar.gz 501030 RMD160 ecc5be2fb6f11dead93bfa9ef921552a10c3506f SHA1 ca1a3568f0a2be68f6b12bd9488a7827e6bfacd9 SHA256 edc6e84a801fd0573c405e2ed18bb03db1b1cac628f150c223057bf71c986e0c
-EBUILD printoxx-2.0.1.ebuild 900 RMD160 7ab470fd7af069b08ee1b18a062f44a3dd319a5d SHA1 ca4afa0aeba608f2bb26c1a83b53abc22da3cdb5 SHA256 35eb69491920a4bd42c91593e9f473643703f4fdfa70f40233c330bb3189b8b9
-MISC ChangeLog 2589 RMD160 abf8667db87591c4c2e2817db7e6a7254718a50b SHA1 d1e0d600771e586762370f32433c9caa83583316 SHA256 183b25e32f05106cebae6e3fd8d4cd8439df2f0038a52f991d36b95a4d85217b
+AUX printoxx-2.7-Makefile-ldflags-fix.diff 820 RMD160 1a71b69a806aa92d0fefada0484c082447edc358 SHA1 dc1ff7bbd7b59f0e60f4f4228c3c04e4f1e282ec SHA256 3b8d91c2bc4c38c029f96d9da480f8449fd61b5d3b5377bb4290c4362b204819
+DIST printoxx-2.7.tar.gz 513585 RMD160 700d0dfee53a207280e46609033a92e6022ad5bf SHA1 893bf2c545ab5451628f1d19b698293cdf585049 SHA256 ad269cf32ad334673ae233119c838881f81929ceeef83a4bed1602f34a9c77f2
+EBUILD printoxx-2.7.ebuild 1416 RMD160 72a7418c6578d272ca8630b992ecee1baeef28de SHA1 2f5ddeb106f426c60e447b7cfc8cf7e74f1896e3 SHA256 e4bc0ac6cf722d7d84474598e01765c31cef37bc42f439d644b329111f592f15
+MISC ChangeLog 2915 RMD160 fd2af49042ae0e1b8637472e211512bcf6c8592f SHA1 b096ca3ef76e60ba2e1512b038d1694600387ffe SHA256 56ac05d36820ed9ff1389256e55b09333daca2879da94243bec09af247e47f99
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/media-gfx/printoxx/files/printoxx-2.7-Makefile-ldflags-fix.diff b/media-gfx/printoxx/files/printoxx-2.7-Makefile-ldflags-fix.diff
new file mode 100644
index 000000000..cddd06a16
--- /dev/null
+++ b/media-gfx/printoxx/files/printoxx-2.7-Makefile-ldflags-fix.diff
@@ -0,0 +1,21 @@
+diff -dupr printoxx-2.7.orig/Makefile printoxx-2.7/Makefile
+--- printoxx-2.7.orig/Makefile	2010-07-04 14:44:16.750000037 +0200
++++ printoxx-2.7/Makefile	2010-07-04 14:44:42.651000006 +0200
+@@ -10,7 +10,7 @@ LDFLAGS ?= -O3 -g -Wall -rdynamic
+ PREFIX ?= /usr/local
+ 
+ CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0`
+-LFLAGS = $(LDFLAGS) `pkg-config --libs gtk+-2.0 gthread-2.0`
++LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0`
+ 
+ BINDIR = $(PREFIX)/bin
+ DATADIR = $(PREFIX)/share/$(PROGRAM)
+@@ -20,7 +20,7 @@ DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
+ MANDIR = $(PREFIX)/share/man/man1
+ 
+ $(PROGRAM): $(PROGRAM).o zfuncs.o
+-	$(CXX) $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o
++	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o $(LIBS)
+ 
+ $(PROGRAM).o: $(SOURCE)
+ 	$(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE)		\
diff --git a/media-gfx/printoxx/printoxx-2.0.1.ebuild b/media-gfx/printoxx/printoxx-2.0.1.ebuild
deleted file mode 100644
index 6af525c70..000000000
--- a/media-gfx/printoxx/printoxx-2.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-#FIXME: This package doesn't need install userguide html docs implicitly
-# (for example i don't want them)
-DESCRIPTION="Program for printing one or more image files with a user-defined page layout"
-HOMEPAGE="http://kornelix.squarespace.com/printoxx"
-SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2.8"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake || die "build failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install || die "emake install failed"
-	make_desktop_entry ${PN} "Printoxx" /usr/share/${PN}/icons/${PN}.png "Application;Graphics;2DGraphics;"
-	rm "${D}"/usr/share/doc/${PN}/{COPYING,README} || die "Clean-up unnecessary docs failed"
-}
diff --git a/media-gfx/printoxx/printoxx-2.7.ebuild b/media-gfx/printoxx/printoxx-2.7.ebuild
new file mode 100644
index 000000000..7199a999a
--- /dev/null
+++ b/media-gfx/printoxx/printoxx-2.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Program for printing one or more image files with a user-defined page layout"
+HOMEPAGE="http://kornelix.squarespace.com/printoxx"
+SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=x11-libs/gtk+-2.8"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile-ldflags-fix.diff
+}
+
+src_compile() {
+	# provide real PREFIX here as it is used in zfuncs.cc
+	# provide HTML-dir for DOCDIR as it used only to display the userguide
+	emake CXX="$(tc-getCXX)" PREFIX=/usr DOCDIR=/usr/share/doc/${PF}/html || die
+}
+
+src_install() {
+	# emake install installs many junk-files (including the manpage) into DOCDIR
+	# emake menu creates .desktop entry with DESTDIR-paths inside
+	# emake manpage compresses the manpage
+	# and they fail together with parallel make
+	# - thus we call only install and pass a nice DOCDIR for easy removal
+
+	emake DESTDIR="${D}" PREFIX=/usr DOCDIR=/tmp/${P}-doc install || die
+
+	make_desktop_entry ${PN} "Printoxx" /usr/share/${PN}/icons/${PN}.png "Application;Graphics;2DGraphics;"
+	newman doc/${PN}.man ${PN}.1 || die
+
+	rm -rf "${D}"/tmp || die
+	dodoc doc/{CHANGES,TRANSLATIONS} || die
+	dohtml -r doc/*.html doc/images || die
+}