Version bump, also fixing bug #264780. Remove old.

Package-Manager: portage-2.2_rc35/cvs/Linux x86_64
author: Timo Gurr <tgurr@gentoo.org> 2009-08-04 21:59:54 +0000
committer: Timo Gurr <tgurr@gentoo.org> 2009-08-04 21:59:54 +0000
commit: 2e4051d02ccf0551f8bd2d9c69766b5a8a3bffe1 (patch)
tree: 6a4e543d3d7cab941f66d60e2bc0bd17790a9b4e /app-text
parent: Use CPPFLAGS. (diff)
download: historical-2e4051d02ccf0551f8bd2d9c69766b5a8a3bffe1.tar.gz
historical-2e4051d02ccf0551f8bd2d9c69766b5a8a3bffe1.tar.bz2
historical-2e4051d02ccf0551f8bd2d9c69766b5a8a3bffe1.zip
3 files changed, 45 insertions, 34 deletions
diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 9de31ef761b2..be195b599684 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.78 2009/05/26 06:05:25 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.79 2009/08/04 21:59:54 tgurr Exp $
+
+*ghostscript-gpl-8.70 (04 Aug 2009)
+
+  04 Aug 2009; Timo Gurr <tgurr@gentoo.org> -ghostscript-gpl-8.64-r2.ebuild,
+  +ghostscript-gpl-8.70.ebuild:
+  Version bump, also fixing bug #264780. Remove old.
 
   26 May 2009; Peter Volkov <pva@gentoo.org> ghostscript-gpl-8.64-r2.ebuild,
   ghostscript-gpl-8.64-r3.ebuild:
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index a624b6f9f5df..b0623d3a72f8 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,10 +1,12 @@
 DIST acro5-cmaps-2001.tar.gz 631653 RMD160 c723afc2207157a434988b46bcf0a458281c29a4 SHA1 fbc8715eae880f59e2251ae8fa99f79fbcfbd3e5 SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4
 DIST adobe-cmaps-200406.tar.gz 5001983 RMD160 284b943b3476f6f7e2bc49842fd027c6f7f57552 SHA1 b846292af4541d907dd9041e397c2f1d8c72a056 SHA256 0f397255506cda4b20e362ab5e3f6cdacba09e0a0cca7f4d93afd980977c5689
 DIST ghostscript-8.64.tar.bz2 16921504 RMD160 565134dcfe1e823b435c3761461c5eb394bd633c SHA1 4c2a6e04145428d35da73fbc4db9c66a75e336e0 SHA256 012f7fec58480c728580836fec6f865588d8a33fe8ada7ae73b1f971440d02bb
-DIST ghostscript-gpl-8.64-patchset-3.tar.bz2 10567 RMD160 1dbd9b8dec7b104b4d16515c77e83c84884c3ef7 SHA1 1d924e96d82a3bcd94c8cf52976c5ea3e195e340 SHA256 6afd79de0a15400a0b9070fed17593c512e230eaa6b97ced35e592b68a3ae4be
+DIST ghostscript-8.70.tar.bz2 17019673 RMD160 88f7d380d1075c57829aa7f34334542fd2bbd6ce SHA1 4e4132713258c680a4fbec577e6dfc82b980ec01 SHA256 c889f2a3a27a4dbd3519197ffc0170d66f398da6a8252b2ebe0548d250f4acc8
 DIST ghostscript-gpl-8.64-patchset-4.tar.bz2 12171 RMD160 5649eb8e2782c8cb147312917d3f8e4f283567d2 SHA1 36b229a1071116b05be3e17c04b521ded922919a SHA256 58f37993e52ec8182586effa1760e49369dfc8977895f2f0ef13d57263ef8954
+DIST ghostscript-gpl-8.70-patchset-1.tar.bz2 5158 RMD160 f0e38fc1b2812414f9cac2c9cc422b614c7aec5a SHA1 186ca0e65bcbb8d2e5c7a436b6a0a667a48a822c SHA256 88a6ce4668e3e78bf5e4900931c91e7dbc87e03bba52cb0f65efb10649186439
 DIST gsdjvu-1.3.tar.gz 204330 RMD160 a6d2326ba9098e801000b957ab5508e998e17be8 SHA1 67fcbd72ae229ff68a5d0cc482d4179e3957df61 SHA256 7702fd287cd881a8b1e7911f780c10f98e332b3a6cd93dd35b245d5816b09ca2
-EBUILD ghostscript-gpl-8.64-r2.ebuild 5412 RMD160 9da3eedafefafe49c06f3db2d7d489a3c0c8bba8 SHA1 88b39c67b30e0fc4960dec9fb29eef4e77e91788 SHA256 a3e34d77372e766c05c81b6f0e86d1e32cc11e6f3351cb98ce0a12916075a428
+DIST gsdjvu-1.4.tar.gz 208611 RMD160 ecbb2fded61a29c4f49f852f99d106a0ba0eb48d SHA1 2650c85481de3aef66a4f7970d14a7dd36a1bc96 SHA256 7b5992f5203d662a7e03ce57d4a1b7a97990b0d3e09eb46ef1b4cb66d8d8c57d
 EBUILD ghostscript-gpl-8.64-r3.ebuild 5567 RMD160 b60c7d8aacf28be202909a97578975e817962bed SHA1 d20fbb12defe85fafbf4bb22ae11ceb4ae21ddf1 SHA256 0f1e85db127407d2d7f223c268419b4c1404f4f2dc57afb3c0054326b2dd0e01
-MISC ChangeLog 15333 RMD160 c0de30afa3d03ed0b753cd742f8dc5f36369ac0c SHA1 a3cdd3e243119e230235f0f6e04e50bcd9e979a8 SHA256 63a2a3ff7e62029499e50706b2e328ccc465e779c9c3f802a6da1c1879f2e5d8
+EBUILD ghostscript-gpl-8.70.ebuild 5341 RMD160 65c73a533f44085f64e63a54f39921dae85210d8 SHA1 bd77cb6593e5bd8367388caa33a90049e32aefc5 SHA256 bdb4ee21012dffcc49ef0719d79cac2221ab712331093006d12f167367957ff6
+MISC ChangeLog 15535 RMD160 65f5e4bb0a506a16db8d4f28a798354e32f85511 SHA1 14f2c8b99cb424e926d3891079f686cb9cc36e34 SHA256 6154330d2cc33e46a428b5a300b5e16df46088d67327cdc4f6066ffa7d5db736
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.64-r2.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.70.ebuild
index 039ee4bd7b72..fd6a493527a3 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.64-r2.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.70.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.64-r2.ebuild,v 1.6 2009/05/26 06:05:25 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.70.ebuild,v 1.1 2009/08/04 21:59:54 tgurr Exp $
 
 inherit autotools eutils versionator flag-o-matic
 
@@ -8,17 +8,15 @@ DESCRIPTION="GPL Ghostscript - the most current Ghostscript, AFPL, relicensed."
 HOMEPAGE="http://ghostscript.com/"
 
 MY_P=${P/-gpl}
-GSDJVU_PV=1.3
+GSDJVU_PV=1.4
 PVM=$(get_version_component_range 1-2)
-SRC_URI="cjk? ( ftp://ftp.gyve.org/pub/gs-cjk/adobe-cmaps-200406.tar.gz
-		ftp://ftp.gyve.org/pub/gs-cjk/acro5-cmaps-2001.tar.gz )
-	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )
+SRC_URI="!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )
 	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-patchset-3.tar.bz2"
+	mirror://gentoo/${P}-patchset-1.tar.bz2"
 
-LICENSE="GPL-2 CPL-1.0"
+LICENSE="GPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="bindist cairo cjk cups djvu gtk jpeg2k X"
 
 COMMON_DEPEND="app-text/libpaper
@@ -39,24 +37,21 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig"
 
 RDEPEND="${COMMON_DEPEND}
-	cjk? ( media-fonts/arphicfonts
-		media-fonts/kochi-substitute
-		media-fonts/baekmuk-fonts )
+	linguas_ja? ( media-fonts/kochi-substitute )
+	linguas_ko? ( media-fonts/baekmuk-fonts )
+	linguas_zh_CN? ( media-fonts/arphicfonts )
+	linguas_zh_TW? ( media-fonts/arphicfonts )
 	media-fonts/gnu-gs-fonts-std"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A/adobe-cmaps-200406.tar.gz acro5-cmaps-2001.tar.gz}
-	if use cjk ; then
-		cat "${WORKDIR}/patches/ghostscript-esp-8.15.2-cidfmap.cjk" >> "${S}/lib/cidfmap"
-		cat "${WORKDIR}/patches/ghostscript-esp-8.15.2-FAPIcidfmap.cjk" >> "${S}/lib/FAPIcidfmap"
-		cd "${S}/Resource"
-		unpack adobe-cmaps-200406.tar.gz
-		unpack acro5-cmaps-2001.tar.gz
-		cd "${WORKDIR}"
-	fi
+LANGS="ja ko zh_CN zh_TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
 
+src_unpack() {
+	unpack ${A}
 	cd "${S}"
 
 	# remove internal copies of expat, jasper, jpeg, libpng and zlib
@@ -70,19 +65,14 @@ src_unpack() {
 
 	# Fedora patches
 	# http://cvs.fedora.redhat.com/viewcvs/devel/ghostscript/
-	epatch "${WORKDIR}/patches/${PN}-8.64-fPIC.patch"
 	epatch "${WORKDIR}/patches/${PN}-8.61-multilib.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.64-noopt.patch"
 	epatch "${WORKDIR}/patches/${PN}-8.64-scripts.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.64-noopt.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.64-fPIC.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.70-runlibfileifexists.patch"
 	epatch "${WORKDIR}/patches/${PN}-8.64-system-jasper.patch"
 	epatch "${WORKDIR}/patches/${PN}-8.64-pksmraw.patch"
-
-	# Fixes which are already applied in ghostscript trunk
-	epatch "${WORKDIR}/patches/${PN}-8.64-bitcmyk-regression-r9452.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.64-respect-ldflags-r9461.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.64-respect-ldflags-r9476.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.64-respect-gsc-ldflags.patch" #209803
-	epatch "${WORKDIR}/patches/${PN}-8.64-CVE-2009-0583.patch" #261087
+	epatch "${WORKDIR}/patches/${PN}-8.70-jbig2dec-nullderef.patch"
 
 	if use bindist && use djvu ; then
 		ewarn "You have bindist in your USE, djvu support will NOT be compiled!"
@@ -166,4 +156,17 @@ src_install() {
 
 	cd "${S}/ijs"
 	emake DESTDIR="${D}" install || die "emake ijs install failed"
+
+	# Rename an original cidfmap to cidfmap.GS
+	mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS}
+
+	# Install our own cidfmap to allow the separated cidfmap
+	insinto "/usr/share/ghostscript/${PVM}/Resource/Init"
+	doins "${WORKDIR}/fontmaps/CIDFnmap" || die "doins CIDFnmap failed"
+	doins "${WORKDIR}/fontmaps/cidfmap" || die "doins cidfmap failed"
+	for X in ${LANGS} ; do
+		if use linguas_${X} ; then
+			doins "${WORKDIR}/fontmaps/cidfmap.${X}" || die "doins cidfmap.${X} failed"
+		fi
+	done
 }
author	Timo Gurr <tgurr@gentoo.org>	2009-08-04 21:59:54 +0000
committer	Timo Gurr <tgurr@gentoo.org>	2009-08-04 21:59:54 +0000
commit	2e4051d02ccf0551f8bd2d9c69766b5a8a3bffe1 (patch)
tree	6a4e543d3d7cab941f66d60e2bc0bd17790a9b4e /app-text
parent	Use CPPFLAGS. (diff)
download	historical-2e4051d02ccf0551f8bd2d9c69766b5a8a3bffe1.tar.gz historical-2e4051d02ccf0551f8bd2d9c69766b5a8a3bffe1.tar.bz2 historical-2e4051d02ccf0551f8bd2d9c69766b5a8a3bffe1.zip