revbump; add patch and ebuild prepared by maintainer with assist from package's author, all found in bug #529800, fixes said bug

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 101 insertions, 20 deletions

diff --git a/media-gfx/hp2xx/ChangeLog b/media-gfx/hp2xx/ChangeLog
index 846b39b00a60..edb447ac5def 100644
--- a/media-gfx/hp2xx/ChangeLog
+++ b/media-gfx/hp2xx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/hp2xx
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hp2xx/ChangeLog,v 1.3 2013/03/17 15:51:41 hwoarang Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hp2xx/ChangeLog,v 1.4 2015/03/29 13:37:30 idella4 Exp $
+
+*hp2xx-3.4.4-r1 (29 Mar 2015)
+
+  29 Mar 2015; Ian Delaney <idella4@gentoo.org>
+  +files/hp2xx-3.4.4-docbuild.patch, +hp2xx-3.4.4-r1.ebuild:
+  revbump; add patch and ebuild prepared by maintainer with assist from
+  package's author, all found in bug #529800, fixes said bug
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/media-gfx/hp2xx/Manifest b/media-gfx/hp2xx/Manifest
index 88e80d9b6705..de3781ad3b28 100644
--- a/media-gfx/hp2xx/Manifest
+++ b/media-gfx/hp2xx/Manifest
@@ -1,27 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX hp2xx-3.4.4-docbuild.patch 474 SHA256 a7abbdc8b1dc4b15734eadb64e256999e5e17e1488794a444ccef23c25402598 SHA512 48e103f3f6d71f31fa4734a500d173afa33564eebe56ded5edf42c30b6a6c52b22f7742293661328bf26111e4b7fa68c6f47fec7e9ab387d49551b49147ebc70 WHIRLPOOL 62addb152b6cdf349fecec17e6292c7aa5719bd1239ac76f5775569f108d00016349485e6f84fa93d81641d83c7847c202a95a02dd4ca6dcb3bfd80d547b706d
 AUX hp2xx-3.4.4-r1.patch 3824 SHA256 a4b4a81f113bde0436546f37b19ebb61e5c78f8eb45d148f61309bce217fb23d SHA512 49a98dc29f820bf43550bec589045e81eaaed991681625bce1a192fee967e28663f053503644663cdb0e57709ba67000dc7f6922054a4ec3969f1555a63df0a3 WHIRLPOOL 8a6229f211ea7ce13a4a841fb6ddaf1ca0d03d57d2b751c2f8f8e3ac1d13197826fba3037df7eea6f9a430dcbf0ba05cb0b8d1e73db3373422ad242360ec27b9
-DIST hp2xx-3.4.4.tar.gz 610330 SHA256 47b72fb386a189b52f07e31e424c038954c4e0ce405803841bed742bab488817
+DIST hp2xx-3.4.4.tar.gz 610330 SHA256 47b72fb386a189b52f07e31e424c038954c4e0ce405803841bed742bab488817 SHA512 ccfe4a23ca482471506e59d6d459ce3ed56d9d775613e3238bd82d11cf4ea0595bf57ff95b3bd22a674865ec7f07dc63c1bcf0deb2a430b7ae241734c7e57ccd WHIRLPOOL ee3415eadaef3065239859de414d78f6619feef9e70c80a53fc835b52a2acb476645d7040880d2ab480cd92b53f002f58da7a6774bc436a5bfe587acc6b38f00
+EBUILD hp2xx-3.4.4-r1.ebuild 1720 SHA256 e87fed815ea44ba308bd172771340a052194fa3fea5f31f413ac2ccd8288cff1 SHA512 df7fc0ffa3430d992bc6662314c8f6ca3dad3879b3b7be596eafe82bf6b18ea3d4683362eabc3c2fd11e6e6cf9e8358e10e70077e016844ff80861d7cd649a4c WHIRLPOOL d2cc11d429c804870d3c07f2baf1d153e4c55fc58bee4f7e93c6e6e7c48d5aae13fbbcb75f5879a85754aa05a84a213935e1c0b190f2e308e23faa06d63d8320
 EBUILD hp2xx-3.4.4.ebuild 960 SHA256 e222676f1b255e58182d337a9466b61424f435daed217c5e63b9bac12a1fbba4 SHA512 20182bb2f27dcf9127d5ebb98c496ef10ad71accda391fa30b71a4ea859f5e9b3cbf008e69ad15d205544ee5ae44488b4e32ae3b784013711a8d571ea8a2f33d WHIRLPOOL a4f04a7339dd2f88eb8c8c23a493c48f20ef6f8092495ab8a62f8742b6081c0d86388903c2a8e9a424b24ba0da20214e3613a3acd80e139782950cdc5397e054
-MISC ChangeLog 641 SHA256 a031c65727ae42949a47f9af431a672968f142670d4fd1f78846f6bca41008a2 SHA512 5b3cb62d164059048e2620b7a76407f8b2ab0de0e3f2edb011f4c4f1c4f9bd9d79d60bf6f56cb3616579c791ad4287d7174e6c608bc86d31dcbf7ed26223d866 WHIRLPOOL 824ab19c690f02e95648463f1aac8a6eb95827bb2ef608667507fc84f7309446674f925e68ebdcf0a0b185c655f2ab640cf91b650bd4920b27e85fba2fe3e13a
+MISC ChangeLog 914 SHA256 1811824973ef014ca7f7921c5e66d51bc834086d86b08458a3d9959156cc5998 SHA512 fa089ba22a2d5ad16540cac8344fcd9facd1908bdce09631a1ff3a6887f7ff9dd39fc9f46a930cd381a5bd5498c1f1a252f52147bf03c7fe681847bb04f25be1 WHIRLPOOL 983ef86c0a6c3f83e12faaa514c33097b51bb51ecf37610634a03aaf7b5c28af718ddaf60fbb26c7565f9f1cb3af542508cc2f52b7c670c8518bc47e12565729
 MISC metadata.xml 299 SHA256 1991b1e40a333f551c8ec9cec6b8de45227b00871de1ab0ae1a7f16f3332f67b SHA512 91afda2dfa6405ef194ad4c9acd2191b34770aaa0e12f81a772db78a2c80eaee9ba9d5b84d305f7d00431ef608d152bce0a542c8342dc71a0f40e1a0975f601e WHIRLPOOL 17f1f18467d8d5d49146ebbd26a5ce657162f496d1f782396f181a95aac131b6ab34627b78843c718d2b45e3f209835c957a0744fc13372003a832990bc9ac4e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJRReaOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88PKMP/1SB9Nhzf0bAU72yoLZ3GehI
-z506dnmuEL0RlCQ9qqAOwWTFHPMqxuRbN0OSlhoUv2j8RjxM7o3sRoZ13MyVOLFb
-fC2r/eC5Mg1NFx3aKM+4H05t3a2qeZMlWNbk2v0GGQPZWysY2X0HuMkH3ip8ja3H
-1Ss01giwTELoOU7hGzCsoakaPn2/gMSO5c3UF9EqvpCuZkkYzwN1fukcGtMt93gz
-W8+EPd274QBUNY1wIeLGKOInHJnXUfJPYX/TzcQXlyVMjhqC1zjoLymswCpMAPOd
-oW/NrFzQwilyFsufvfpFgeKsKMDV4Utpr3e/MEq2k//vt9mBa7qFwxhrq81cMRhl
-ib9+lZ8iGShz8aCafl947GMBqmg9xQIMr8Bfj7WZ6iTxcBiqwMZHgHVj9bnuEiRh
-m0TEUeyjzB1ih60ovQjvEyBC4DFxJ2e2t5H0TAQf3P3lrjw9AclleSh8IL/cr8Og
-nXJKbGxxDZdXHX89lq567N95PQGEFVKBa3RhazG52FADvmzwduH+pjt6QWfl7iRh
-taDVfRYrosFqDSNEQn9A6EZBIG5xkhYGWAlbTKStcuf2gbRjhzelQjjC2MsyOHjb
-iq4DsPok7qpG9SyiwZcsCS3Yr10UR7EQloRXiERJvaX2Y0APi9C11ErAQp3fjlot
-LmTHojC55N2hq9wyPOXN
-=1Ex4
+iEYEAREIAAYFAlUYACsACgkQso7CE7gHKw2GgACgrnWr2XmE1ncU8TUQHIAGI0yk
+9RAAnisPramuGBrKpkuwkYgQBVCUM25s
+=YGTG
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/hp2xx/files/hp2xx-3.4.4-docbuild.patch b/media-gfx/hp2xx/files/hp2xx-3.4.4-docbuild.patch
new file mode 100644
index 000000000000..4245eea61254
--- /dev/null
+++ b/media-gfx/hp2xx/files/hp2xx-3.4.4-docbuild.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/attachment.cgi?id=399898
+Only first hunk preserved.
+diff -ruN hp2xx-3.4.4-r0/doc/hp2xxinf.tex hp2xx-3.4.4-r3/doc/hp2xxinf.tex
+--- hp2xx-3.4.4-r0/doc/hp2xxinf.tex	2003-06-21 17:41:16.000000000 +0200
++++ hp2xx-3.4.4-r3/doc/hp2xxinf.tex	2015-03-27 20:36:32.000000000 +0100
+@@ -92,7 +92,7 @@
+ @page
+ @tex
+ {\parskip=0pt
+-\hfill mk\@daveg.com\par
++\hfill mk@@daveg.com\par
+ \hfill {\it Using HP2XX}, \manvers\par
+ \hfill \TeX{}info \texinfoversion\par
+ }
diff --git a/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild b/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild
new file mode 100644
index 000000000000..be2df68d524f
--- /dev/null
+++ b/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild,v 1.1 2015/03/29 13:37:30 idella4 Exp $
+
+EAPI=4
+
+inherit eutils base
+
+DESCRIPTION="Versatile tool to convert Hewlett-Packard's HP-GL plotter language into other graphics formats"
+HOMEPAGE="http://www.gnu.org/software/hp2xx/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="X jpeg png tiff"
+
+RDEPEND="
+	png? ( media-libs/libpng sys-libs/zlib )
+	tiff? ( media-libs/tiff )
+	jpeg? ( virtual/jpeg )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	sys-apps/texinfo"
+
+PATCHES=(  "${FILESDIR}"/${P}-r1.patch
+	"${FILESDIR}"/${P}-docbuild.patch )
+
+src_prepare() {
+	base_src_prepare
+	cp -v makes/generic.mak sources/Makefile || die
+}
+
+src_compile() {
+	cd "${S}/sources" || die
+	export PREVIEWER="no_prev"
+	export EX_SRC=
+	export EX_OBJ=
+	export EX_DEFS=-DUNIX
+	export ALL_LIBS=-lm
+	use X && \
+		PREVIEWER="to_x11" \
+		EX_DEFS="-DHAS_UNIX_X11" \
+		ALL_LIBS="${ALL_LIBS} -lX11"
+	use jpeg && \
+		EX_SRC="${EX_SRC} to_jpg.c" \
+		EX_OBJ="${EX_OBJ} to_jpg.o" \
+		EX_DEFS="${EX_DEFS} -DJPG" \
+		ALL_LIBS="${ALL_LIBS} -ljpeg"
+	use png && \
+		EX_SRC="${EX_SRC} png.c to_png.c" \
+		EX_OBJ="${EX_OBJ} png.o to_png.o" \
+		EX_DEFS="${EX_DEFS} -DPNG" \
+		ALL_LIBS="${ALL_LIBS} -lpng"
+	use tiff && \
+		EX_SRC="${EX_SRC} to_tif.c" \
+		EX_OBJ="${EX_OBJ} to_tif.o" \
+		EX_DEFS="${EX_DEFS} -DTIF" \
+		ALL_LIBS="${ALL_LIBS} -ltiff"
+	emake all
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/info /usr/share/man/man1
+
+	make prefix="${D}/usr" \
+		mandir="${D}/usr/share/man" \
+		infodir="${D}/usr/share/info" \
+		install || die
+}