Non-maintainer commit. Switch to tarball provided by Debian; the original one contained files md*.ps that are not distributable. The fixmacps command that was using them is therefore no longer available. Fixes bug 440938.

Package-Manager: portage-2.1.11.37/cvs/Linux x86_64
Manifest-Sign-Key: 0xE7BE08CA7DC6EA25

4 files changed, 99 insertions, 2 deletions

diff --git a/app-text/psutils/ChangeLog b/app-text/psutils/ChangeLog
index f5b8d58222da..1d12a6a7c0fa 100644
--- a/app-text/psutils/ChangeLog
+++ b/app-text/psutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/psutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/psutils/ChangeLog,v 1.26 2012/05/09 16:30:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/psutils/ChangeLog,v 1.27 2012/12/12 08:16:41 ulm Exp $
+
+*psutils-1.17-r2 (12 Dec 2012)
+
+  12 Dec 2012; Ulrich Müller <ulm@gentoo.org> +psutils-1.17-r2.ebuild,
+  +files/psutils-1.17-no-fixmacps.patch:
+  Non-maintainer commit. Switch to tarball provided by Debian; the original
+  one contained files md*.ps that are not distributable. The fixmacps command
+  that was using them is therefore no longer available. Fixes bug 440938.
 
   09 May 2012; Alexis Ballier <aballier@gentoo.org> psutils-1.17-r1.ebuild:
   keyword ~amd64-fbsd
diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
index d722570ede74..3527e29edafb 100644
--- a/app-text/psutils/Manifest
+++ b/app-text/psutils/Manifest
@@ -1,6 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX psutils-1.17-ldflags.patch 1417 SHA256 6f4389d8c2695302f6bf820b53790117fe60b2d6e7b76c95b0197b0c848dd602 SHA512 179b1551516a8acc9f4f9859b4bbe06a6d6e2ba0ddfe20c147a143e6795d61d9cb4f55107866d7a891f0be0dbebaf11d836f4c129205da44ba561a133d69ab08 WHIRLPOOL 2e932444970e58da7252a7ddb31841f00a6e89aa75885b571f81521c6422052184366a42aebe933627a7a6419d58a9ba738c52409addcc4f77443abda6afed11
+AUX psutils-1.17-no-fixmacps.patch 1176 SHA256 44926da1032a087d6dbfb7d66ae051eaf3f21dd493323ed09b2e67bd49e76b06 SHA512 707ebb4594b341044e27cd3fb35402b4d3144eb52f9baffcc633dbde69b53717da148b6c03074411cb95dcf50b48ba87df4ad6c2ec3b24f37b0951c40012efdc WHIRLPOOL 6c7c179de1fb4d1a4f8c64c4bcfb35fec9c3771b4f8a159161f3dff9b3935bd72bfa8e18c8380d7c7a517519fce768b37dc90ac37aca5381627bbefccf3407cf
 DIST psutils-1.17.tar.gz 62039 SHA256 3853eb79584ba8fbe27a815425b65a9f7f15b258e0d43a05a856bdb75d588ae4 SHA512 91feff88c885173ab1c4ba6b5ffd0d9e90bfa6105479b074065584fc2a87e78fbe71e4bc90d2e7079d86b467caf092b6744b0ea4234880ba78cad8dd7820de77 WHIRLPOOL 65422c05953bd4f0000c1b097f7f3651766ad36b70f5bfe06dd23ecc8d1f1c478434fb8c4d99d2fc271fa098173a8feb4b8582e681e20de61e48feaa49d18c2f
+DIST psutils_1.17.dfsg.orig.tar.gz 40296 SHA256 53e24aff04895b47fb2178dc9df3acb78d91c33c2d6bd524c49e9641479c4f6c SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3 WHIRLPOOL a621251c2956f40eeacbae77a68287a808446655b15d9c17b5d51d3f1946ddb427ae12a6172d49f5c82f31afb3b54fcf00f12aeb258e0cd08b7c9a60df1524f6
 EBUILD psutils-1.17-r1.ebuild 1053 SHA256 e2991bed259993b5a27a18d9bc2aceafcfffbcc2937082ee2de4478091b42b18 SHA512 787b2786e8e421fb43aad967be456c873bea658edf358344f08435e1d54b93bc95309f91031856bf69325f5446048d2dc7f0b1664671c47a3214d592c6d1b3c4 WHIRLPOOL 996b64082d33572403ae0f31c41212c91382e661c24ccca371d1f38e8fcafb356ed65e64ae817004c8efced6968f61799397e41063cc3877af2db958675306fb
+EBUILD psutils-1.17-r2.ebuild 1163 SHA256 a9640089dc200708cce78797f0dd80d8438f86c63a5584ea61fed637bfa658f8 SHA512 f12030aa78aa89fb114ace796551a0ebba3d7da56773858c82e4e6067f75adc2a5952f96a567127432fd79a40f84e7c95699aacab3ab5f53e6791fa56712cd0b WHIRLPOOL 12b81b35fe1cafbf241ead66475674d41dccdbdffab841c655120f920026871a37cc50b87dd137ba169c69bbfd66bded0a9ba04aaaaab97023683665d848e806
 EBUILD psutils-1.17.ebuild 871 SHA256 a1dcc87c9fab2bad20fd9cdf95587521fddec5b1911ab9dfb08303837392b459 SHA512 2226e3d9167ec63b328b124a12fd65fb9d737668a0c8117a97d4d1cf0d2b985c0890722e7e8fc6e91416576699f8ac07327bff6a5acfabef6de6820921ec7009 WHIRLPOOL b5404083cd3e62f2ec27004e488be7f595d435d3222639dec2cb980355bb683992435f51535826b76aa543eeaa80b80ee16127a5ead7ed0649f8f222ac50ed19
-MISC ChangeLog 2935 SHA256 017b5c1fd5ee75d3222e0f63936a7fe26cf0bc71ef1fb4ffa8d679021d6ad6bf SHA512 b31b888dd8f264f7245eb97870a45a260e3abea85150cee5583f753d806c5196db99e9cd86693dde26622ed6c0ff22bea1127415056ca4d062af4168f4f13e32 WHIRLPOOL ae8ebe046ca0ca298651d18cd422a438c9635374373422dbfe063b5317339560256d49b34c5849b32c7c18eefb2c90317f86013e2840d86c21e7c741bf9b70ea
+MISC ChangeLog 3304 SHA256 69b071901e49178d7094adb11c801ec8d43ad8274b26b71c7bfb13df0a2de48f SHA512 3e5f8da2194481a2f1339d1afb0f9530507d6e6c04c6ccf6f3a9d67ff9be2772beb17c59119968ba741148315267592b7b5047095226c2d1a59b540092ca1fdf WHIRLPOOL 13ec378e1ee80a218289793e8ab5523a9a3a221942e838008771870371fabc25a89deeab313369a89c79bb4fc1f9c058d4f3012d5cd92e1549aeeaf8bab2eecd
 MISC metadata.xml 156 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6 SHA512 cecee760dd314c182191a282255f2415e479a8cc6cab9cb664e5b82d52b700a3444aa0d33b30a721a756e432819decc8c92588c769ea6fd33dabe9adc16d75c0 WHIRLPOOL 88a15092b616df72dd0ae91d89c80d852ad49ab9fee8a9688f3a1be59c365cc3dc77e90be68b5c4ec9cc1dc9885e06e723abc96830df4d0628df8c97f8b2a332
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQyD3OAAoJEDxpGckxwJCBcgIQAILeVie/SEr5mkJ6tDVOUuK6
+hWMaB5CFzf2S6Y13kWwtsN15k4pbHGBzR1I3Iue1UJXuekj5S1e6q3PMAdODV+jP
+7TQu98tg3mA3r6583A+McFGI1xvnfAAar/IFMU0RsrPfCwx12u+JGHUm+wWD/t+B
+jeWo3LNDPRu1YClh6FJjT90yoUjBcu7lU9OMpn82BNm97IhqD++W4lPz5BWPS36J
+6JXNZAt3abZP/W2q912VAknoJqrQ8kKzSCvVjw9g2OD+K6KOlctoLyKyLml2jV6E
+IYvE57hbm0TjXZ/6eO91gEJTrH75R2t+sgIM0Gbr1avmT60sErHMenRKSizyXj7B
+DPfSVdCeatYciYaQxaGX/7pkHJJbjXAoOmkC4L051t/inwGv4RVaZehyivGu5z0u
+j/WKIdmUPlSiAFYxl6F+S0k0GxWTVrpzVSqrLQOsdMemHTUQRDnC2fckZSO0835h
+TnY33ctyNzk0arnpB9IXnXJ4LzwXLu2Bgp1MitxYpQ/2nmFoCilL/zxco9rbggeZ
+gQ+suNXlDJJCiHvoQIGmE1OQCZp085cQtw6cD23SNHo4dpW5cf5RjRKSktEnAMLs
+Ca3MRbiAyCre4KogJW52vZ7EHTywtvXZbErbgq/Ko4E4j7dM3KS5gqdzAfUU88gO
+bHvKBD7bXWr0zCukWjiM
+=fSZb
+-----END PGP SIGNATURE-----
diff --git a/app-text/psutils/files/psutils-1.17-no-fixmacps.patch b/app-text/psutils/files/psutils-1.17-no-fixmacps.patch
new file mode 100644
index 000000000000..16a3c13484a2
--- /dev/null
+++ b/app-text/psutils/files/psutils-1.17-no-fixmacps.patch
@@ -0,0 +1,26 @@
+Files md68_0.ps md71_0.ps have unknown copyright and license and are
+therefore not included in the "DFSG" tarball. Suppress these files
+(and the fixmacps program that references them) in Makefile.
+https://bugs.gentoo.org/show_bug.cgi?id=440938
+
+--- psutils-1.17.orig/Makefile.unix
++++ psutils/Makefile.unix
+@@ -44,15 +44,15 @@
+ BIN = psbook psselect pstops epsffit psnup \
+ 	psresize
+ SHELLSCRIPTS = getafm showchar
+-PERLSCRIPTS = fixfmps fixmacps fixpsditps fixpspps \
++PERLSCRIPTS = fixfmps fixpsditps fixpspps \
+ 	fixtpps fixwfwps fixwpps fixscribeps fixwwps \
+ 	fixdlsrps extractres includeres psmerge
+ MANPAGES = psbook.$(MANEXT) psselect.$(MANEXT) pstops.$(MANEXT) epsffit.$(MANEXT) psnup.$(MANEXT) \
+ 	psresize.$(MANEXT) psmerge.$(MANEXT) fixscribeps.$(MANEXT) getafm.$(MANEXT) \
+-	fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixmacps.$(MANEXT) fixpsditps.$(MANEXT) \
++	fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixpsditps.$(MANEXT) \
+ 	fixpspps.$(MANEXT) fixtpps.$(MANEXT) fixwfwps.$(MANEXT) fixwpps.$(MANEXT) \
+ 	fixwwps.$(MANEXT) extractres.$(MANEXT) includeres.$(MANEXT)
+-INCLUDES = md68_0.ps md71_0.ps
++INCLUDES =
+ 
+ all: $(BIN) $(PERLSCRIPTS) $(MANPAGES) $(SHELLSCRIPTS)
+ 
diff --git a/app-text/psutils/psutils-1.17-r2.ebuild b/app-text/psutils/psutils-1.17-r2.ebuild
new file mode 100644
index 000000000000..28727e249a47
--- /dev/null
+++ b/app-text/psutils/psutils-1.17-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/psutils/psutils-1.17-r2.ebuild,v 1.1 2012/12/12 08:16:41 ulm Exp $
+
+EAPI=3
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="PostScript Utilities"
+HOMEPAGE="http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/"
+SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
+
+LICENSE="psutils"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}/${P}.orig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+	epatch "${FILESDIR}/${P}-no-fixmacps.patch"
+	sed \
+		-e "s:/usr/local:\$(DESTDIR)${EPREFIX}/usr:" \
+		"${S}/Makefile.unix" > "${S}/Makefile"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install () {
+	dodir /usr/{bin,share/man}
+	emake DESTDIR="${D}" install || die
+	dodoc README
+}