fix digest, bug 131655, thanks Marko Djukic <djukic@gmail.com>

Package-Manager: portage-2.1_pre9-r5

3 files changed, 11 insertions, 172 deletions

diff --git a/app-text/ghostscript-gnu/Manifest b/app-text/ghostscript-gnu/Manifest
index d1b65457d4b8..524feba48223 100644
--- a/app-text/ghostscript-gnu/Manifest
+++ b/app-text/ghostscript-gnu/Manifest
@@ -7,42 +7,35 @@ RMD160 6283cc2cbc18927486afce71d4e8f1d77fb069ee files/ghostscript-fontconfig.pat
 SHA256 f9040bf7372682814c5c96ca3312cc57c2b9a278a5331013526d93dabecc7d58 files/ghostscript-fontconfig.patch 8038
 DIST acro5-cmaps-2001.tar.gz 631653 RMD160 c723afc2207157a434988b46bcf0a458281c29a4 SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4 size 631653
 DIST adobe-cmaps-200204.tar.gz 4360486 RMD160 14f436cb2869788f249c0eaf5dd6a31295c5ada7 SHA256 510f29086630db1a581ab77e46c3a6b9b4ee4bf8c7717c209e5125794a59480a size 4360486
-DIST cups-1.1.20-source.tar.bz2 363163 RMD160 036bf9725a6a0ec06008c83545c17d132d7f070f SHA256 48e576ab2319fd6ad2d21f2240a720ff2f9ee4825e2a6c30f6903f3c00555590 size 363163
+DIST cups-1.1.20-source.tar.bz2 3741510 RMD160 cd50b2f250f4514c946941900387b36b9c2b9491 SHA256 d3c84d0ae02d1784cd063cacf34ae142a361428f053cb589c0c22b2169c07f2b size 3741510
 DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e size 8705521
 DIST gnu-ghostscript-8.16.tar.gz 6633085 RMD160 05b1b15c21640b709658a2e0c07d6424705fd9ff SHA256 417922d35e66ee90cf93cf3e93fdf281ec6b92de4f7436c9c1a97c0cc35b94a8 size 6633085
 EBUILD ghostscript-gnu-8.16-r1.ebuild 3446 RMD160 6819292a1e4b5e57725236210ae2b3b9c7eb90ad SHA1 47611905c3b186cb456ff7d0e4c2aa8af5e42799 SHA256 2678cd5319d67cf62dc78372ee1c80a0cba1c90340535980fa263169248d8a83 size 3446
 MD5 13f59a20171648b59bbb201ae9e73fcc ghostscript-gnu-8.16-r1.ebuild 3446
 RMD160 6819292a1e4b5e57725236210ae2b3b9c7eb90ad ghostscript-gnu-8.16-r1.ebuild 3446
 SHA256 2678cd5319d67cf62dc78372ee1c80a0cba1c90340535980fa263169248d8a83 ghostscript-gnu-8.16-r1.ebuild 3446
-EBUILD ghostscript-gnu-8.16-r2.ebuild 4365 RMD160 91356d804322f7e782f4a03630b14942e17696f8 SHA1 51f1d69f412e19f5c510358a59ffb7a6fe9b6c60 SHA256 7a64f04e65034adfef5754aeb312dd36573810999a6fecef73f9f054efb8c611 size 4365
-MD5 ec2849a00d1d5c8c7f607db9c32f46f1 ghostscript-gnu-8.16-r2.ebuild 4365
-RMD160 91356d804322f7e782f4a03630b14942e17696f8 ghostscript-gnu-8.16-r2.ebuild 4365
-SHA256 7a64f04e65034adfef5754aeb312dd36573810999a6fecef73f9f054efb8c611 ghostscript-gnu-8.16-r2.ebuild 4365
 EBUILD ghostscript-gnu-8.16-r3.ebuild 4565 RMD160 e4c01087dda4f4518eb4aba608cfa034b19f5bbf SHA1 962b5b1c598209de334e1731fa635e883963b775 SHA256 81e962fb02ef19df8b35ec28313e9cce84de3526a296670adbed5a83fd41b8e1 size 4565
 MD5 4a321cb261cadfd41ba39c2ef26f8aad ghostscript-gnu-8.16-r3.ebuild 4565
 RMD160 e4c01087dda4f4518eb4aba608cfa034b19f5bbf ghostscript-gnu-8.16-r3.ebuild 4565
 SHA256 81e962fb02ef19df8b35ec28313e9cce84de3526a296670adbed5a83fd41b8e1 ghostscript-gnu-8.16-r3.ebuild 4565
-MISC ChangeLog 3588 RMD160 aea9d05b8b6218d0b724c4328ea4a02453dc13d3 SHA1 141e06fd3f07e4cf6b034da883feeab91a0d8409 SHA256 dc99cb02724cf603aa88a5bd658584f08c7c2a5eca2f4ad406d02a64406cb6b2 size 3588
-MD5 3dbdc7435bebbfc3bba1019f8b04e0d0 ChangeLog 3588
-RMD160 aea9d05b8b6218d0b724c4328ea4a02453dc13d3 ChangeLog 3588
-SHA256 dc99cb02724cf603aa88a5bd658584f08c7c2a5eca2f4ad406d02a64406cb6b2 ChangeLog 3588
+MISC ChangeLog 3740 RMD160 ab140c31099986c822f418d3183f81d53c158e7e SHA1 d458b2d2180f5857c7d25ca6dc0252677029e574 SHA256 5c6be83249941ff9440ba5a52d2b9aa1f75d0f3fcc2819bfd8b91808f26beab7 size 3740
+MD5 7225f7e868f78931dfe6218f3bf16718 ChangeLog 3740
+RMD160 ab140c31099986c822f418d3183f81d53c158e7e ChangeLog 3740
+SHA256 5c6be83249941ff9440ba5a52d2b9aa1f75d0f3fcc2819bfd8b91808f26beab7 ChangeLog 3740
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 size 161
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
-MD5 7aa926c69e413ab9e454030a97dda3e4 files/digest-ghostscript-gnu-8.16-r1 1033
-RMD160 a34e8d37fac446be6b0fdf5575811a0ad24284e5 files/digest-ghostscript-gnu-8.16-r1 1033
-SHA256 19157f53096c4509075e04f5793aeecc9c5e486ea0c9a16eb700eea5e9950435 files/digest-ghostscript-gnu-8.16-r1 1033
-MD5 2786598cab8f512dba3e0dee0ad3b9d9 files/digest-ghostscript-gnu-8.16-r2 1036
-RMD160 c931dd938c0a0f29496d3e07b2a1ac4bb4442a9b files/digest-ghostscript-gnu-8.16-r2 1036
-SHA256 bbb57fe48e4249ab2bb7fdec84715265264af8b56b65f3afd208ca473a009532 files/digest-ghostscript-gnu-8.16-r2 1036
+MD5 cb0578fcb91d25ea9f25f507ff66984d files/digest-ghostscript-gnu-8.16-r1 1036
+RMD160 c8f9555ce939b65a8eead3f909e24d863edebc27 files/digest-ghostscript-gnu-8.16-r1 1036
+SHA256 f676e6a352510f4baac16dfd0d8917804f2cd6aee6581b4488f9484021108c99 files/digest-ghostscript-gnu-8.16-r1 1036
 MD5 2786598cab8f512dba3e0dee0ad3b9d9 files/digest-ghostscript-gnu-8.16-r3 1036
 RMD160 c931dd938c0a0f29496d3e07b2a1ac4bb4442a9b files/digest-ghostscript-gnu-8.16-r3 1036
 SHA256 bbb57fe48e4249ab2bb7fdec84715265264af8b56b65f3afd208ca473a009532 files/digest-ghostscript-gnu-8.16-r3 1036
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEUgotAiZjviIA2XgRAp2QAJ0d3415fCkVdG45J66ZILftMR+nDgCfVHdw
-1M3vONvRYIeRYEeqfZ8nDr4=
-=sqfk
+iD8DBQFEU2VeNJowsmZ/PzARAgLuAKC0UJdv/XR187FN8NUAH84+E5Uo6ACfW423
+UwqqPEbbbIMHHwPicAC1M18=
+=fRss
 -----END PGP SIGNATURE-----
diff --git a/app-text/ghostscript-gnu/files/digest-ghostscript-gnu-8.16-r2 b/app-text/ghostscript-gnu/files/digest-ghostscript-gnu-8.16-r2
deleted file mode 100644
index 844c0dae75ad..000000000000
--- a/app-text/ghostscript-gnu/files/digest-ghostscript-gnu-8.16-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
-RMD160 c723afc2207157a434988b46bcf0a458281c29a4 acro5-cmaps-2001.tar.gz 631653
-SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4 acro5-cmaps-2001.tar.gz 631653
-MD5 a3bf430a7e21cd82401258a2ec3b8afb adobe-cmaps-200204.tar.gz 4360486
-RMD160 14f436cb2869788f249c0eaf5dd6a31295c5ada7 adobe-cmaps-200204.tar.gz 4360486
-SHA256 510f29086630db1a581ab77e46c3a6b9b4ee4bf8c7717c209e5125794a59480a adobe-cmaps-200204.tar.gz 4360486
-MD5 4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 8705521
-RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 cups-1.1.23-source.tar.bz2 8705521
-SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e cups-1.1.23-source.tar.bz2 8705521
-MD5 c42dfaebc37fe81eab0b5676b124ab63 gnu-ghostscript-8.16.tar.gz 6633085
-RMD160 05b1b15c21640b709658a2e0c07d6424705fd9ff gnu-ghostscript-8.16.tar.gz 6633085
-SHA256 417922d35e66ee90cf93cf3e93fdf281ec6b92de4f7436c9c1a97c0cc35b94a8 gnu-ghostscript-8.16.tar.gz 6633085
diff --git a/app-text/ghostscript-gnu/ghostscript-gnu-8.16-r2.ebuild b/app-text/ghostscript-gnu/ghostscript-gnu-8.16-r2.ebuild
deleted file mode 100644
index b35ee10cc113..000000000000
--- a/app-text/ghostscript-gnu/ghostscript-gnu-8.16-r2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gnu/ghostscript-gnu-8.16-r2.ebuild,v 1.8 2006/04/23 23:35:58 weeve Exp $
-
-inherit eutils libtool
-
-DESCRIPTION="GNU Ghostscript"
-HOMEPAGE="http://www.gnu.org/software/ghostscript/"
-
-CUPS_PV=1.1.23
-MY_P=gnu-ghostscript-${PV}
-PVM=${PV%.[0-9]}
-SRC_URI="ftp://ftp.gnu.org/gnu/ghostscript/${MY_P}.tar.gz
-	cups? ( mirror://gentoo/cups-${CUPS_PV}-source.tar.bz2 )
-	cjk? ( http://www.matsusaka-u.ac.jp/mirror/gs-cjk/adobe-cmaps-200204.tar.gz
-		http://www.matsusaka-u.ac.jp/mirror/gs-cjk/acro5-cmaps-2001.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="X cups cjk emacs gtk"
-
-
-DEP=">=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.5
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/tiff-3.7
-	X? ( || ( x11-libs/libXt virtual/x11 ) )
-	gtk? ( >=x11-libs/gtk+-2.0 )
-	cups? ( >=net-print/cups-1.1.20 )
-	!app-text/ghostscript-afpl
-	!app-text/ghostscript-esp"
-
-RDEPEND="${DEP}
-	cjk? ( media-fonts/arphicfonts
-		media-fonts/kochi-substitute
-		media-fonts/baekmuk-fonts )
-	media-fonts/gnu-gs-fonts-std"
-
-DEPEND="${DEP}
-	gtk? ( dev-util/pkgconfig )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	# cups support
-	if use cups; then
-		unpack cups-${CUPS_PV}-source.tar.bz2
-		cp -r cups-${CUPS_PV}/pstoraster ${S}
-		cd ${S}/pstoraster
-		sed -e 's:@prefix@:/usr:' -e 's:@exec_prefix@:${prefix}:' \
-			-e 's:@bindir@:${exec_prefix}/bin:' -e 's:@GS@:gs:' \
-			pstopxl.in > pstopxl || die "pstopxlsed failed"
-		sed -i -e 's:OUTPUTFILE="%stdout" $profile $6$:\0 -:' \
-			-e 's:/usr/local:/usr:' pstoraster || die "pstorastersed failed"
-		sed -i -e "s:pstopcl6:pstopxl:" cups.mak || die "cupssed failed"
-		cd ..
-		epatch pstoraster/gs811-lib.patch
-	fi
-
-	# enable cfax device (bug #56704)
-	sed -i -e 's:DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev:DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev $(DD)cfax.dev:' ${S}/Makefile.in || die "sed failed"
-	cd ${S}
-
-	#epatch ${FILESDIR}/gs-${PV}destdir.patch
-	#epatch ${FILESDIR}/ghostscript-build.patch
-	#epatch ${FILESDIR}/ghostscript-scripts.patch
-	#epatch ${FILESDIR}/ghostscript-ps2epsi.patch
-	epatch ${FILESDIR}/../../ghostscript-esp/files/ghostscript-badc.patch
-	epatch ${FILESDIR}/../../ghostscript-esp/files/ghostscript-pagesize.patch
-	epatch ${FILESDIR}/../../ghostscript-esp/files/ghostscript-noopt.patch
-	epatch ${FILESDIR}/../../ghostscript-esp/files/ghostscript-use-external-freetype.patch
-	#epatch ${FILESDIR}/ghostscript-split-font-configuration.patch
-
-	# not submitted
-	epatch ${FILESDIR}/../../ghostscript-esp/files/ijs-dirinstall.diff
-	epatch ${FILESDIR}/../../ghostscript-esp/files/ghostscript-gtk2.patch
-	if ! use gtk; then
-		sed -i "s:\$(GSSOX)::" src/*.mak || die "gsx sed failed"
-		sed -i "s:.*\$(GSSOX_XENAME)$::" src/*.mak || die "gsxso sed failed"
-	fi
-
-	# search path fix
-	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
-		Makefile.in || die "sed failed"
-	sed -i -e 's:$(gsdir)/fonts:/usr/share/fonts/default/ghostscript/:' \
-		Makefile.in || die "sed failed"
-
-	#eautoreconf
-
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-	myconf="--with-ijs --with-jbig2dec"
-
-	econf $(use_with X x) \
-		${myconf} || die "econf failed"
-
-	if use cups; then
-		echo 'include pstoraster/cups.mak' >> Makefile
-		sed -i -e 's:DEVICE_DEVS17=:DEVICE_DEVS17=$(DD)cups.dev:' Makefile || die "sed failed"
-		sed -i -e 's:EXTRALIBS=\(.*\):EXTRALIBS=\1 -lcups -lcupsimage:' Makefile || die "sed failed"
-	fi
-	emake -j1 || die "make failed"
-	emake so -j1 || die "make failed"
-
-	cd ijs
-	libtoolize --copy --force
-	econf || die "econf failed"
-	emake -j1 || die "make failed"
-	cd ..
-}
-
-src_install() {
-	einstall D=/ install_prefix=${D} soinstall
-
-	rm -fr ${D}/usr/share/ghostscript/${PVM}/doc || die
-	dodoc doc/README
-	dohtml doc/*.html doc/*.htm
-
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp
-		doins doc/gsdoc.el
-	fi
-
-	if use cjk; then
-		dodir /usr/share/ghostscript/Resource
-		dodir /usr/share/ghostscript/Resource/Font
-		dodir /usr/share/ghostscript/Resource/CIDFont
-		cd ${D}/usr/share/ghostscript/Resource
-		unpack adobe-cmaps-200204.tar.gz
-		unpack acro5-cmaps-2001.tar.gz
-	fi
-
-	# install ijs
-	cd ${S}/ijs
-	make DESTDIR="${D}" install || die "ijs install failed"
-}