Version bump, remove old.

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

3 files changed, 36 insertions, 30 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index acc575bf1c6a..0f193a959d46 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/ghostscript-gpl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.108 2011/02/01 19:02:39 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.109 2011/02/23 22:12:07 tgurr Exp $
+
+*ghostscript-gpl-9.01 (23 Feb 2011)
+
+  23 Feb 2011; Timo Gurr <tgurr@gentoo.org> -ghostscript-gpl-9.00.ebuild,
+  +ghostscript-gpl-9.01.ebuild:
+  Version bump, remove old.
 
 *ghostscript-gpl-9.00-r1 (01 Feb 2011)
 
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index d4dd997a9852..496bebbfa09d 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,11 +1,12 @@
 DIST ghostscript-8.71.tar.xz 15698644 RMD160 7211f433997e1c4ba5a9dcf2e8b72337b76e60b4 SHA1 aa2df7ba23abdfe95d36acec7333eac51768c47d SHA256 f48f7370a00f24fce174b147074aca3f6bede82154dd2bf93d24430a62e4de73
 DIST ghostscript-9.00.tar.xz 17377160 RMD160 4dd9bf15ccc3e23e11fdebc1d23155e1b9d8993b SHA1 873fbeedecc472ec804943bc5ded131fa8342251 SHA256 2d3afcf30873c8bf8619beeeb6d4c3370fc2944fd1bd47423461b6778daa8248
+DIST ghostscript-9.01.tar.bz2 23612084 RMD160 37fb9fa9263ef069e0717f5f6b1cec06d1932350 SHA1 3e8c4b8c9dbcc0458e3be0758f00205929a6b3f4 SHA256 2418895088f12c18639f1876f13f5690be0d6ab6113d4d7f1f2f360d2e2deb7d
 DIST ghostscript-gpl-8.71-patchset-4.tar.bz2 12089 RMD160 67406d2fa03144981cadaee9570313a16b549715 SHA1 f80a8d5a4df18df3eb5183d71040ebcc713fca33 SHA256 4244d34114457ec281115c5a3a37b9b1ec2a091fff6f665896a21cf07d927a38
-DIST ghostscript-gpl-9.00-patchset-1.tar.bz2 6909 RMD160 ab61892898c7ef072eb8655934df22cce31ddfff SHA1 5ff5be00599d43972188ca02a7a9932a650ee681 SHA256 bd036a3e545485cc229397b896f2ca1b3f1c91d108b91fb612ebcd09f64569b7
 DIST ghostscript-gpl-9.00-patchset-2.tar.bz2 12996 RMD160 b3ef870d4e690a4cd6984066f9846d5ec19879ee SHA1 fe6c48949f29b6a5d6bab7b8b3e588373e195b3f SHA256 842f073369414981467bd6264a6f2f77ef4ef53864a2ddd2ee8872d966b0ff41
+DIST ghostscript-gpl-9.01-patchset-1.tar.bz2 7062 RMD160 bbb2ad160929a3202f3eb8ed84f1aa13d6fc9959 SHA1 816e0338acfc82b5e1d8dedc807c4cd392ed65cb SHA256 809c3fdac37c58b3145ee718f32c155314e18dc643cac776346cae9e048d1607
 DIST gsdjvu-1.4.tar.gz 208611 RMD160 ecbb2fded61a29c4f49f852f99d106a0ba0eb48d SHA1 2650c85481de3aef66a4f7970d14a7dd36a1bc96 SHA256 7b5992f5203d662a7e03ce57d4a1b7a97990b0d3e09eb46ef1b4cb66d8d8c57d
 EBUILD ghostscript-gpl-8.71-r6.ebuild 5879 RMD160 fc4dca5b02e79929e7c5fc3f9b219a2472ed63a1 SHA1 f425fd02f57c67807d44aca6fa5dd4e6a4154063 SHA256 06174a4527b148916e5926610e8c8dc6d6793f1e97cfd9c757f0ae3335005c95
 EBUILD ghostscript-gpl-9.00-r1.ebuild 5650 RMD160 b441545669c08bc2be6cd1e323570659a0e871f8 SHA1 3703891749b4fcf976d370d7ce1bca957e234862 SHA256 5aaffd93173770d8aaa0b68d7c2888569d78124fb629ecdb89ffff6e65570751
-EBUILD ghostscript-gpl-9.00.ebuild 6021 RMD160 b7ae3d85fd23787c3c25cd761239ce63c43b8360 SHA1 f719717afae68ff60fadd2022113a5170de2b2fa SHA256 661c4bdaf6aa1188daf9862912bbccb0c8fb05ac8632c2fd4804cce4662c281f
-MISC ChangeLog 19990 RMD160 a87ce0bb8a3c66b74223e4ba3be7776674e3d844 SHA1 76e652b23faddb66d8c0b0981950c9ba88afc671 SHA256 6d8183787a2082da7c57f7f1f242b922b5d804e9079a7b88aba874744dbace60
+EBUILD ghostscript-gpl-9.01.ebuild 5648 RMD160 ce59f67ae1cd81dca893bb87bd7627c3f238af8e SHA1 fd38a9dc516a94b8f66ed57007c89a3e34fc0dcf SHA256 0d6b5d5ade110774acca8e84047fd717c93c2082722394a839eadbfeeaa32648
+MISC ChangeLog 20162 RMD160 7bbfa774508f3a0fdb42bb6e060f19b4fbba414a SHA1 ebb1c24d1e60619a0db213c77f80ff795123d267 SHA256 16dffbe32974d3d374c343e5bc1fb638c077e1bf7d8432b6f90bc00565c17331
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.00.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.01.ebuild
index f54ffb15e339..c16edec93ec3 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.00.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.01.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.00.ebuild,v 1.2 2010/11/07 19:17:54 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.01.ebuild,v 1.1 2011/02/23 22:12:07 tgurr Exp $
 
 EAPI=3
 inherit autotools eutils versionator flag-o-matic
@@ -12,7 +12,7 @@ MY_P=${P/-gpl}
 GSDJVU_PV=1.4
 PVM=$(get_version_component_range 1-2)
 SRC_URI="!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )
-	mirror://sourceforge/ghostscript/${MY_P}.tar.xz
+	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
 	mirror://gentoo/${P}-patchset-1.tar.bz2"
 
 LICENSE="GPL-3 CPL-1.0"
@@ -39,6 +39,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig"
 
 RDEPEND="${COMMON_DEPEND}
+	>=app-text/poppler-data-0.4.4
 	>=media-fonts/urw-fonts-2.4.9
 	linguas_ja? ( media-fonts/kochi-substitute )
 	linguas_ko? ( media-fonts/baekmuk-fonts )
@@ -53,22 +54,6 @@ for X in ${LANGS} ; do
 done
 
 pkg_setup() {
-	local p="/usr/share/fonts/default/ghostscript"
-	# die if path exists and is not a symbolic link so that
-	# installation of symbolic link doesn't fail, bug 311923
-	if [[ -e ${p} && ! -L ${p} ]]; then
-		eerror "The path ${p} exists and is not a"
-		eerror "symlink. It must be removed for ${CATEGORY}/${PN} to be installed."
-		eerror "Use the following command to check to which packages it belongs:"
-		eerror "  emerge gentoolkit ; equery belongs ${p}"
-		eerror
-		eerror "And remove packages listed. If it doesn't belong to any package, remove"
-		eerror "it manually and then re-emerge ${CATEGORY}/${PN}."
-		eerror "See bug #311923 for more details."
-		eerror
-		die "Path ${p} is not a symlink"
-	fi
-
 	if use bindist && use djvu; then
 		ewarn "You have bindist in your USE, djvu support will NOT be compiled!"
 		ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
@@ -85,6 +70,8 @@ src_prepare() {
 	rm -rf "${S}/zlib"
 	# remove internal urw-fonts
 	rm -rf "${S}/Resource/Font"
+	# remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -rf "${S}/Resource/CMap"
 
 	# apply various patches, many borrowed from Fedora
 	# http://pkgs.fedoraproject.org/gitweb/?p=ghostscript.git
@@ -96,9 +83,8 @@ src_prepare() {
 		unpack gsdjvu-${GSDJVU_PV}.tar.gz
 		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
 		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/base"
-		epatch "${WORKDIR}/patches-gsdjvu/${PN}-8.64-gsdjvu-1.3.patch"
-		epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.4-ghostscript-gpl-9.00-compatibility.patch"
-		epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.4-parallel-buildfix.patch"
+		epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch"
+		epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.4-${PN}-9.00-upstream-buildfixes.patch"
 		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}/lib"
 		cp "${S}/base/contrib.mak" "${S}/base/contrib.mak.gsdjvu"
 		grep -q djvusep "${S}/base/contrib.mak" || \
@@ -116,7 +102,6 @@ src_prepare() {
 
 	# search path fix
 	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
-		-e 's:$(gsdir)/fonts:/usr/share/fonts/default/ghostscript/:' \
 		-e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \
 		-e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
 		-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
@@ -133,6 +118,20 @@ src_prepare() {
 }
 
 src_configure() {
+	local FONTPATH
+	for path in \
+		/usr/share/fonts/urw-fonts \
+		/usr/share/fonts/Type1 \
+		/usr/share/fonts \
+		/usr/share/poppler/cMap/Adobe-CNS1 \
+		/usr/share/poppler/cMap/Adobe-GB1 \
+		/usr/share/poppler/cMap/Adobe-Japan1 \
+		/usr/share/poppler/cMap/Adobe-Japan2 \
+		/usr/share/poppler/cMap/Adobe-Korea1
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}$path"
+	done
+
 	econf \
 		$(use_enable cups) \
 		$(use_enable gtk) \
@@ -145,9 +144,11 @@ src_configure() {
 		--enable-freetype \
 		--enable-fontconfig \
 		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
 		--with-ijs \
 		--with-jbig2dec \
-		--with-libpaper
+		--with-libpaper \
+		--with-system-libtiff
 
 	if ! use bindist && use djvu ; then
 		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile
@@ -192,6 +193,4 @@ src_install() {
 			doins "${WORKDIR}/fontmaps/cidfmap.${X}" || die "doins cidfmap.${X} failed"
 		fi
 	done
-
-	dosym /usr/share/fonts/urw-fonts /usr/share/fonts/default/ghostscript || die
 }