Version bump. Remove old and vulnerable versions. Upstream doesn't mirror new versions on sourceforge anymore.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 5270BA51)

7 files changed, 22 insertions, 1136 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 1f6b3409649f..4aea0c287a8e 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/ghostscript-gpl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.172 2014/02/20 14:21:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.173 2014/03/26 17:31:52 tgurr Exp $
+
+*ghostscript-gpl-9.14 (26 Mar 2014)
+
+  26 Mar 2014; Timo Gurr <tgurr@gentoo.org> -ghostscript-gpl-9.04-r4.ebuild,
+  -ghostscript-gpl-9.05-r1.ebuild, -ghostscript-gpl-9.05-r2.ebuild,
+  -ghostscript-gpl-9.06.ebuild, -ghostscript-gpl-9.07.ebuild,
+  -ghostscript-gpl-9.10.ebuild, +ghostscript-gpl-9.14.ebuild:
+  Version bump. Remove old and vulnerable versions. Upstream doesn't mirror new
+  versions on sourceforge anymore.
 
   20 Feb 2014; Agostino Sarubbo <ago@gentoo.org> ghostscript-gpl-9.10-r2.ebuild:
   Stable for sparc, wrt bug #437654
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r4.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r4.ebuild
deleted file mode 100644
index dd629e2ed1c8..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r4.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2013 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.04-r4.ebuild,v 1.10 2013/10/22 15:42:47 dilfridge Exp $
-
-EAPI=3
-
-inherit autotools eutils multilib versionator flag-o-matic
-
-DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
-HOMEPAGE="http://ghostscript.com/"
-
-MY_P=${P/-gpl}
-GSDJVU_PV=1.5
-PVM=$(get_version_component_range 1-2)
-SRC_URI="
-	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-patchset-3.tar.bz2
-	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
-
-LICENSE="GPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist cups dbus djvu gtk idn jpeg2k static-libs X"
-
-COMMON_DEPEND="
-	app-text/libpaper
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.2:2
-	media-libs/lcms:0
-	media-libs/libpng:0
-	media-libs/tiff:0
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:0
-	!bindist? ( djvu? ( app-text/djvu ) )
-	cups? ( >=net-print/cups-1.3.8 )
-	dbus? ( sys-apps/dbus )
-	gtk? ( x11-libs/gtk+:2 )
-	idn? ( net-dns/libidn )
-	jpeg2k? ( media-libs/jasper )
-	X? ( x11-libs/libXt x11-libs/libXext )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/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 )
-	linguas_zh_CN? ( media-fonts/arphicfonts )
-	linguas_zh_TW? ( media-fonts/arphicfonts )
-	!!media-fonts/gnu-gs-fonts-std
-	!!media-fonts/gnu-gs-fonts-other
-"
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="ja ko zh_CN zh_TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
-	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."
-	fi
-}
-
-src_prepare() {
-	# remove internal copies of various libraries
-	rm -rf "${S}"/expat
-	rm -rf "${S}"/freetype
-	rm -rf "${S}"/jasper
-	rm -rf "${S}"/jpeg
-	rm -rf "${S}"/lcms{,2}
-	rm -rf "${S}"/libpng
-	rm -rf "${S}"/tiff
-	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
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
-	EPATCH_SOURCE="${WORKDIR}/patches/"
-	epatch
-
-	if ! use bindist && use djvu ; then
-		unpack gsdjvu-${GSDJVU_PV}.tar.gz
-		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
-		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/base"
-		epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.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" || \
-			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}/base/contrib.mak"
-
-		# install ps2utf8.ps, bug #197818
-		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' "${S}/base/unixinst.mak" \
-			|| die "sed failed"
-	fi
-
-	if ! use gtk ; then
-		sed -i "s:\$(GSSOX)::" base/*.mak || die "gsx sed failed"
-		sed -i "s:.*\$(GSSOX_XENAME)$::" base/*.mak || die "gsxso sed failed"
-	fi
-
-	# search path fix
-	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
-		-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:" \
-		-e 's:-L$(BINDIR):$(LDFLAGS) &:g' \
-		base/Makefile.in base/*.mak || die "sed failed"
-
-	cd "${S}"
-	eautoreconf
-
-	cd "${S}/jbig2dec"
-	eautoreconf
-
-	cd "${S}/ijs"
-	eautoreconf
-}
-
-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 \
-		--enable-dynamic \
-		--enable-freetype \
-		--enable-fontconfig \
-		--disable-compile-inits \
-		--with-drivers=ALL \
-		--with-fontpath="$FONTPATH" \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper \
-		--with-system-libtiff \
-		--without-luratech \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable gtk) \
-		$(use_with cups install-cups) \
-		$(use_with cups pdftoraster) \
-		$(use_with idn libidn) \
-		$(use_with jpeg2k jasper) \
-		$(use_with X x)
-
-	if ! use bindist && use djvu ; then
-		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile
-	fi
-
-	cd "${S}/ijs"
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake -j1 so all || die "emake failed"
-
-	cd "${S}/ijs"
-	emake || die "ijs emake failed"
-}
-
-src_install() {
-	# -j1 -> see bug #356303
-	emake -j1 DESTDIR="${D}" install-so install || die "emake install failed"
-
-	# some printer drivers still require pstoraster, bug #383831
-	use cups && dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
-
-	if ! use bindist && use djvu ; then
-		dobin gsdjvu || die "dobin gsdjvu install failed"
-	fi
-
-	# remove gsc in favor of gambit, bug #253064
-	rm -rf "${D}/usr/bin/gsc"
-
-	rm -rf "${D}/usr/share/doc/${PF}/html/"{README,PUBLIC}
-	dodoc doc/GS9_Color_Management.pdf || die "dodoc install failed"
-
-	cd "${S}/ijs"
-	emake DESTDIR="${D}" install || die "emake ijs install failed"
-
-	# rename the original cidfmap to cidfmap.GS
-	mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
-
-	# install our own cidfmap to handle CJK fonts
-	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
-
-	use static-libs || find "${D}" -name '*.la' -delete
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.05-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.05-r1.ebuild
deleted file mode 100644
index d80a2d2111d4..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.05-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2013 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.05-r1.ebuild,v 1.12 2013/10/22 15:42:47 dilfridge Exp $
-
-EAPI=3
-
-inherit autotools eutils multilib versionator flag-o-matic
-
-DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
-HOMEPAGE="http://ghostscript.com/"
-
-MY_P=${P/-gpl}
-GSDJVU_PV=1.5
-PVM=$(get_version_component_range 1-2)
-SRC_URI="
-	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-patchset-1.tar.bz2
-	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
-
-LICENSE="GPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist cups dbus djvu gtk idn jpeg2k static-libs X"
-
-COMMON_DEPEND="
-	app-text/libpaper
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.2:2
-	media-libs/jbig2dec
-	media-libs/lcms:2
-	media-libs/libpng:0
-	media-libs/tiff:0
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:0
-	!bindist? ( djvu? ( app-text/djvu ) )
-	cups? ( >=net-print/cups-1.3.8 )
-	dbus? ( sys-apps/dbus )
-	gtk? ( x11-libs/gtk+:2 )
-	idn? ( net-dns/libidn )
-	jpeg2k? ( media-libs/jasper )
-	X? ( x11-libs/libXt x11-libs/libXext )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/poppler-data-0.4.5-r1
-	>=media-fonts/urw-fonts-2.4.9
-	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
-	!!media-fonts/gnu-gs-fonts-other
-"
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="ja ko zh_CN zh_TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
-	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."
-	fi
-}
-
-src_prepare() {
-	# remove internal copies of various libraries
-	rm -rf "${S}"/expat
-	rm -rf "${S}"/freetype
-	rm -rf "${S}"/jasper
-	rm -rf "${S}"/jbig2dec
-	rm -rf "${S}"/jpeg
-	rm -rf "${S}"/lcms{,2}
-	rm -rf "${S}"/libpng
-	rm -rf "${S}"/openjpeg
-	rm -rf "${S}"/tiff
-	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
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
-	EPATCH_SOURCE="${WORKDIR}/patches/"
-	epatch
-
-	if ! use bindist && use djvu ; then
-		unpack gsdjvu-${GSDJVU_PV}.tar.gz
-		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
-		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/base"
-		epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch"
-		epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.5-${PN}-9.05.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" || \
-			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}/base/contrib.mak"
-
-		# install ps2utf8.ps, bug #197818
-		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' "${S}/base/unixinst.mak" \
-			|| die "sed failed"
-	fi
-
-	if ! use gtk ; then
-		sed -i "s:\$(GSSOX)::" base/*.mak || die "gsx sed failed"
-		sed -i "s:.*\$(GSSOX_XENAME)$::" base/*.mak || die "gsxso sed failed"
-	fi
-
-	# search path fix
-	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
-		-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:" \
-		-e 's:-L$(BINDIR):$(LDFLAGS) &:g' \
-		base/Makefile.in base/*.mak || die "sed failed"
-
-	cd "${S}"
-	eautoreconf
-
-	cd "${S}/ijs"
-	eautoreconf
-}
-
-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 \
-		--enable-dynamic \
-		--enable-freetype \
-		--enable-fontconfig \
-		--disable-compile-inits \
-		--disable-openjpeg \
-		--with-drivers=ALL \
-		--with-fontpath="$FONTPATH" \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper \
-		--with-system-libtiff \
-		--without-luratech \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable gtk) \
-		$(use_with cups install-cups) \
-		$(use_with cups pdftoraster) \
-		$(use_with idn libidn) \
-		$(use_with jpeg2k jasper) \
-		$(use_with X x)
-
-	if ! use bindist && use djvu ; then
-		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile
-	fi
-
-	cd "${S}/ijs"
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake -j1 so all || die "emake failed"
-
-	cd "${S}/ijs"
-	emake || die "ijs emake failed"
-}
-
-src_install() {
-	# workaround: -j1 -> see bug #356303
-	emake -j1 DESTDIR="${D}" install-so install || die "emake install failed"
-
-	# workaround: some printer drivers still require pstoraster, bug #383831
-	use cups && dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
-	# workaround: do the same for pstopxl as of gs 9.05
-	use cups && dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
-
-	if ! use bindist && use djvu ; then
-		dobin gsdjvu || die "dobin gsdjvu install failed"
-	fi
-
-	# remove gsc in favor of gambit, bug #253064
-	rm -rf "${D}/usr/bin/gsc"
-
-	rm -rf "${D}/usr/share/doc/${PF}/html/"{README,PUBLIC}
-	dodoc doc/GS9_Color_Management.pdf || die "dodoc install failed"
-
-	cd "${S}/ijs"
-	emake DESTDIR="${D}" install || die "emake ijs install failed"
-
-	# rename the original cidfmap to cidfmap.GS
-	mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
-
-	# install our own cidfmap to handle CJK fonts
-	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
-
-	# install the CMaps from poppler-data properly, bug 409361
-	dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
-
-	use static-libs || find "${D}" -name '*.la' -delete
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.05-r2.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.05-r2.ebuild
deleted file mode 100644
index a0f67d4fb689..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.05-r2.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2013 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.05-r2.ebuild,v 1.4 2013/08/27 14:58:36 kensington Exp $
-
-EAPI=3
-
-inherit autotools eutils multilib versionator flag-o-matic
-
-DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
-HOMEPAGE="http://ghostscript.com/"
-
-MY_P=${P/-gpl}
-GSDJVU_PV=1.5
-PVM=$(get_version_component_range 1-2)
-SRC_URI="
-	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-patchset-2.tar.bz2
-	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
-
-LICENSE="GPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist cups dbus djvu gtk idn jpeg2k linguas_de static-libs X"
-
-COMMON_DEPEND="
-	app-text/libpaper
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.2:2
-	media-libs/jbig2dec
-	media-libs/lcms:2
-	media-libs/libpng:0
-	media-libs/tiff:0
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:0
-	!bindist? ( djvu? ( app-text/djvu ) )
-	cups? ( >=net-print/cups-1.3.8 )
-	dbus? ( sys-apps/dbus )
-	gtk? ( x11-libs/gtk+:2 )
-	idn? ( net-dns/libidn )
-	jpeg2k? ( media-libs/jasper )
-	X? ( x11-libs/libXt x11-libs/libXext )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/poppler-data-0.4.5-r1
-	>=media-fonts/urw-fonts-2.4.9
-	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
-	!!media-fonts/gnu-gs-fonts-other
-"
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="ja ko zh_CN zh_TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
-	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."
-	fi
-}
-
-src_prepare() {
-	# remove internal copies of various libraries
-	rm -rf "${S}"/expat
-	rm -rf "${S}"/freetype
-	rm -rf "${S}"/jasper
-	rm -rf "${S}"/jbig2dec
-	rm -rf "${S}"/jpeg
-	rm -rf "${S}"/lcms{,2}
-	rm -rf "${S}"/libpng
-	rm -rf "${S}"/openjpeg
-	rm -rf "${S}"/tiff
-	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
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
-	EPATCH_SOURCE="${WORKDIR}/patches/"
-	epatch
-
-	if ! use bindist && use djvu ; then
-		unpack gsdjvu-${GSDJVU_PV}.tar.gz
-		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
-		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/base"
-		epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch"
-		epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.5-${PN}-9.05.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" || \
-			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}/base/contrib.mak"
-
-		# install ps2utf8.ps, bug #197818
-		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' "${S}/base/unixinst.mak" \
-			|| die "sed failed"
-	fi
-
-	if ! use gtk ; then
-		sed -i "s:\$(GSSOX)::" base/*.mak || die "gsx sed failed"
-		sed -i "s:.*\$(GSSOX_XENAME)$::" base/*.mak || die "gsxso sed failed"
-	fi
-
-	# search path fix
-	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
-		-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:" \
-		-e 's:-L$(BINDIR):$(LDFLAGS) &:g' \
-		base/Makefile.in base/*.mak || die "sed failed"
-
-	cd "${S}"
-	eautoreconf
-
-	cd "${S}/ijs"
-	eautoreconf
-}
-
-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 \
-		--enable-dynamic \
-		--enable-freetype \
-		--enable-fontconfig \
-		--disable-compile-inits \
-		--disable-openjpeg \
-		--with-drivers=ALL \
-		--with-fontpath="$FONTPATH" \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper \
-		--with-system-libtiff \
-		--without-luratech \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable gtk) \
-		$(use_with cups install-cups) \
-		$(use_with cups pdftoraster) \
-		$(use_with idn libidn) \
-		$(use_with jpeg2k jasper) \
-		$(use_with X x)
-
-	if ! use bindist && use djvu ; then
-		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile
-	fi
-
-	cd "${S}/ijs"
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake -j1 so all || die "emake failed"
-
-	cd "${S}/ijs"
-	emake || die "ijs emake failed"
-}
-
-src_install() {
-	# workaround: -j1 -> see bug #356303
-	emake -j1 DESTDIR="${D}" install-so install || die "emake install failed"
-
-	# workaround: some printer drivers still require pstoraster, bug #383831
-	use cups && dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
-	# workaround: do the same for pstopxl as of gs 9.05
-	use cups && dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
-
-	if ! use bindist && use djvu ; then
-		dobin gsdjvu || die "dobin gsdjvu install failed"
-	fi
-
-	# remove gsc in favor of gambit, bug #253064
-	rm -rf "${D}/usr/bin/gsc"
-
-	rm -rf "${D}/usr/share/doc/${PF}/html/"{README,PUBLIC}
-	dodoc doc/GS9_Color_Management.pdf || die "dodoc install failed"
-
-	cd "${S}/ijs"
-	emake DESTDIR="${D}" install || die "emake ijs install failed"
-
-	# rename the original cidfmap to cidfmap.GS
-	mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
-
-	# install our own cidfmap to handle CJK fonts
-	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
-
-	# install the CMaps from poppler-data properly, bug 409361
-	dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
-
-	use static-libs || find "${D}" -name '*.la' -delete
-
-	use linguas_de || rm -r "${D}"/usr/share/man/de
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.06.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.06.ebuild
deleted file mode 100644
index eff007ba8900..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.06.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2013 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.06.ebuild,v 1.5 2013/08/27 14:58:36 kensington Exp $
-
-EAPI=4
-
-inherit autotools eutils multilib versionator flag-o-matic
-
-DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
-HOMEPAGE="http://ghostscript.com/"
-
-MY_P=${P/-gpl}
-GSDJVU_PV=1.5
-PVM=$(get_version_component_range 1-2)
-SRC_URI="
-	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-patchset-1.tar.bz2
-	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
-
-LICENSE="GPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist cups dbus djvu gtk idn jpeg2k linguas_de static-libs X"
-
-COMMON_DEPEND="
-	app-text/libpaper
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.2:2
-	media-libs/jbig2dec
-	media-libs/lcms:2
-	media-libs/libpng:0
-	media-libs/tiff:0
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:0
-	!bindist? ( djvu? ( app-text/djvu ) )
-	cups? ( >=net-print/cups-1.3.8 )
-	dbus? ( sys-apps/dbus )
-	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
-	idn? ( net-dns/libidn )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0 )
-	X? ( x11-libs/libXt x11-libs/libXext )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/poppler-data-0.4.5-r1
-	>=media-fonts/urw-fonts-2.4.9
-	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
-	!!media-fonts/gnu-gs-fonts-other
-"
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="ja ko zh_CN zh_TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
-	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."
-	fi
-}
-
-src_prepare() {
-	# remove internal copies of various libraries
-	rm -rf "${S}"/expat
-	rm -rf "${S}"/freetype
-	rm -rf "${S}"/jasper
-	rm -rf "${S}"/jbig2dec
-	rm -rf "${S}"/jpeg
-	rm -rf "${S}"/lcms{,2}
-	rm -rf "${S}"/libpng
-	rm -rf "${S}"/openjpeg
-	rm -rf "${S}"/tiff
-	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
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
-	EPATCH_SOURCE="${WORKDIR}/patches/"
-	epatch
-
-	if ! use bindist && use djvu ; then
-		unpack gsdjvu-${GSDJVU_PV}.tar.gz
-		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
-		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/base"
-		epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch"
-		epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.5-${PN}-9.05.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" || \
-			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}/base/contrib.mak"
-
-		# install ps2utf8.ps, bug #197818
-		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' "${S}/base/unixinst.mak" \
-			|| die "sed failed"
-	fi
-
-	if ! use gtk ; then
-		sed -i "s:\$(GSSOX)::" base/*.mak || die "gsx sed failed"
-		sed -i "s:.*\$(GSSOX_XENAME)$::" base/*.mak || die "gsxso sed failed"
-	fi
-
-	# search path fix
-	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
-		-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:" \
-		-e 's:-L$(BINDIR):$(LDFLAGS) &:g' \
-		base/Makefile.in base/*.mak || die "sed failed"
-
-	# bug 467100
-	sed -i -e '/AM_PROG_CC_STDC/d' ijs/configure.ac || die "sed failed"
-
-	cd "${S}"
-	eautoreconf
-
-	cd "${S}/ijs"
-	eautoreconf
-}
-
-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 \
-		--enable-dynamic \
-		--enable-freetype \
-		--enable-fontconfig \
-		--disable-compile-inits \
-		--with-drivers=ALL \
-		--with-fontpath="$FONTPATH" \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper \
-		--with-system-libtiff \
-		--without-jasper \
-		--without-lcms \
-		--without-luratech \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable gtk) \
-		$(use_enable jpeg2k openjpeg ) \
-		$(use_with cups install-cups) \
-		$(use_with cups pdftoraster) \
-		$(use_with idn libidn) \
-		$(use_with X x)
-
-	if ! use bindist && use djvu ; then
-		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile
-	fi
-
-	cd "${S}/ijs"
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	# workaround: -j1 -> see bug #234378
-	emake -j1 so all
-
-	cd "${S}/ijs"
-	emake
-}
-
-src_install() {
-	# workaround: -j1 -> see bug #356303
-	emake -j1 DESTDIR="${D}" install-so install
-
-	# workaround: some printer drivers still require pstoraster, bug #383831
-	use cups && dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
-	# workaround: do the same for pstopxl as of gs 9.05
-	use cups && dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
-
-	if ! use bindist && use djvu ; then
-		dobin gsdjvu
-	fi
-
-	# remove gsc in favor of gambit, bug #253064
-	rm -rf "${D}/usr/bin/gsc"
-
-	rm -rf "${D}/usr/share/doc/${PF}/html/"{README,PUBLIC}
-	dodoc doc/GS9_Color_Management.pdf
-
-	cd "${S}/ijs"
-	emake DESTDIR="${D}" install
-
-	# rename the original cidfmap to cidfmap.GS
-	mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
-
-	# install our own cidfmap to handle CJK fonts
-	insinto "/usr/share/ghostscript/${PVM}/Resource/Init"
-	doins "${WORKDIR}/fontmaps/CIDFnmap"
-	doins "${WORKDIR}/fontmaps/cidfmap"
-	for X in ${LANGS} ; do
-		if use linguas_${X} ; then
-			doins "${WORKDIR}/fontmaps/cidfmap.${X}"
-		fi
-	done
-
-	# install the CMaps from poppler-data properly, bug 409361
-	dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
-
-	use static-libs || find "${D}" -name '*.la' -delete
-
-	use linguas_de || rm -r "${D}"/usr/share/man/de
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.07.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.07.ebuild
deleted file mode 100644
index cf7365282368..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.07.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2013 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.07.ebuild,v 1.3 2013/08/27 14:58:36 kensington Exp $
-
-EAPI=5
-
-inherit autotools eutils multilib versionator flag-o-matic
-
-DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
-HOMEPAGE="http://ghostscript.com/"
-
-MY_P=${P/-gpl}
-GSDJVU_PV=1.6
-PVM=$(get_version_component_range 1-2)
-SRC_URI="
-	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-patchset-1.tar.bz2
-	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
-
-LICENSE="AGPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist cups dbus djvu gtk idn jpeg2k linguas_de static-libs X"
-
-COMMON_DEPEND="
-	app-text/libpaper
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.2:2=
-	media-libs/jbig2dec
-	>=media-libs/lcms-2.4-r1:2
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	>=sys-libs/zlib-1.2.3:=
-	virtual/jpeg:0
-	!bindist? ( djvu? ( app-text/djvu ) )
-	cups? ( >=net-print/cups-1.3.8 )
-	dbus? ( sys-apps/dbus )
-	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
-	idn? ( net-dns/libidn )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0 )
-	X? ( x11-libs/libXt x11-libs/libXext )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/poppler-data-0.4.5-r1
-	>=media-fonts/urw-fonts-2.4.9
-	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
-	!!media-fonts/gnu-gs-fonts-other
-"
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="ja ko zh_CN zh_TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
-	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."
-	fi
-}
-
-src_prepare() {
-	# remove internal copies of various libraries
-	rm -rf "${S}"/expat
-	rm -rf "${S}"/freetype
-	rm -rf "${S}"/jbig2dec
-	rm -rf "${S}"/jpeg
-	rm -rf "${S}"/lcms{,2}
-	rm -rf "${S}"/libpng
-	rm -rf "${S}"/openjpeg
-	rm -rf "${S}"/tiff
-	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
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
-	EPATCH_SOURCE="${WORKDIR}/patches/"
-	epatch
-
-	if ! use bindist && use djvu ; then
-		unpack gsdjvu-${GSDJVU_PV}.tar.gz
-		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
-		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/base"
-		epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.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" || \
-			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}/base/contrib.mak"
-
-		# install ps2utf8.ps, bug #197818
-		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' "${S}/base/unixinst.mak" \
-			|| die "sed failed"
-	fi
-
-	if ! use gtk ; then
-		sed -i "s:\$(GSSOX)::" base/*.mak || die "gsx sed failed"
-		sed -i "s:.*\$(GSSOX_XENAME)$::" base/*.mak || die "gsxso sed failed"
-	fi
-
-	# search path fix
-	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
-		-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:" \
-		-e 's:-L$(BINDIR):$(LDFLAGS) &:g' \
-		base/Makefile.in base/*.mak || die "sed failed"
-
-	# bug 467100
-	sed -i -e '/AM_PROG_CC_STDC/d' ijs/configure.ac || die "sed failed"
-
-	cd "${S}"
-	eautoreconf
-
-	cd "${S}/ijs"
-	eautoreconf
-}
-
-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 \
-		--enable-dynamic \
-		--enable-freetype \
-		--enable-fontconfig \
-		--disable-compile-inits \
-		--with-drivers=ALL \
-		--with-fontpath="$FONTPATH" \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper \
-		--with-system-libtiff \
-		--without-lcms \
-		--without-luratech \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable gtk) \
-		$(use_enable jpeg2k openjpeg ) \
-		$(use_with cups install-cups) \
-		$(use_with cups pdftoraster) \
-		$(use_with idn libidn) \
-		$(use_with X x)
-
-	if ! use bindist && use djvu ; then
-		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile \
-			|| die "sed failed"
-	fi
-
-	cd "${S}/ijs"
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	# workaround: -j1 -> see bug #234378
-	emake -j1 so all
-
-	cd "${S}/ijs"
-	emake
-}
-
-src_install() {
-	# workaround: -j1 -> see bug #356303
-	emake -j1 DESTDIR="${D}" install-so install
-
-	# workaround: some printer drivers still require pstoraster, bug #383831
-	use cups && dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
-	# workaround: do the same for pstopxl as of gs 9.05
-	use cups && dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
-
-	if ! use bindist && use djvu ; then
-		dobin gsdjvu
-	fi
-
-	# remove gsc in favor of gambit, bug #253064
-	rm -rf "${D}/usr/bin/gsc"
-
-	# pdfopt binary has been removed, also remove the man pages
-	rm -rf "${D}"/usr/share/man/{de/,}man1/pdfopt.1.bz2
-
-	rm -rf "${D}/usr/share/doc/${PF}/html/"{README,PUBLIC}
-	dodoc doc/GS9_Color_Management.pdf
-
-	cd "${S}/ijs"
-	emake DESTDIR="${D}" install
-
-	# rename the original cidfmap to cidfmap.GS
-	mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
-
-	# install our own cidfmap to handle CJK fonts
-	insinto "/usr/share/ghostscript/${PVM}/Resource/Init"
-	doins "${WORKDIR}/fontmaps/CIDFnmap"
-	doins "${WORKDIR}/fontmaps/cidfmap"
-	for X in ${LANGS} ; do
-		if use linguas_${X} ; then
-			doins "${WORKDIR}/fontmaps/cidfmap.${X}"
-		fi
-	done
-
-	# install the CMaps from poppler-data properly, bug 409361
-	dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
-
-	use static-libs || find "${D}" -name '*.la' -delete
-
-	use linguas_de || rm -r "${D}"/usr/share/man/de
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.10.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.14.ebuild
index 4150f153e187..92f1092947ea 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.10.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.10.ebuild,v 1.1 2013/09/06 00:53:53 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.14.ebuild,v 1.1 2014/03/26 17:31:52 tgurr Exp $
 
 EAPI=5
 
@@ -13,8 +13,8 @@ MY_P=${P/-gpl}
 GSDJVU_PV=1.6
 PVM=$(get_version_component_range 1-2)
 SRC_URI="
-	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
-	mirror://gentoo/${PN}-9.09-patchset-1.tar.bz2
+	http://downloads.ghostscript.com/public/${MY_P}.tar.bz2
+	mirror://gentoo/${PN}-9.12-patchset-1.tar.bz2
 	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
 
 LICENSE="AGPL-3 CPL-1.0"
@@ -76,7 +76,7 @@ src_prepare() {
 	rm -rf "${S}"/expat
 	rm -rf "${S}"/freetype
 	rm -rf "${S}"/jbig2dec
-	rm -rf "${S}"/jpeg
+	rm -rf "${S}"/jpeg{,xr}
 	rm -rf "${S}"/lcms{,2}
 	rm -rf "${S}"/libpng
 	rm -rf "${S}"/tiff
@@ -87,7 +87,7 @@ src_prepare() {
 	rm -rf "${S}"/Resource/CMap
 
 	# apply various patches, many borrowed from Fedora
-	# http://pkgs.fedoraproject.org/gitweb/?p=ghostscript.git
+	# http://pkgs.fedoraproject.org/cgit/ghostscript.git
 	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
 	EPATCH_SOURCE="${WORKDIR}/patches/"
 	epatch
@@ -114,11 +114,12 @@ src_prepare() {
 	fi
 
 	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
 	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
 		-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:" \
-		-e 's:-L$(BINDIR):$(LDFLAGS) &:g' \
+		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
 		"${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
 
 	cd "${S}"
@@ -191,8 +192,9 @@ src_install() {
 		dobin gsdjvu
 	fi
 
-	# remove gsc in favor of gambit, bug #253064
-	rm -rf "${D}/usr/bin/gsc"
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${D}/usr/bin/gsc" "${D}/usr/bin/gs" || die
 
 	cd "${S}/ijs"
 	emake DESTDIR="${D}" install
@@ -210,7 +212,7 @@ src_install() {
 		fi
 	done
 
-	# install the CMaps from poppler-data properly, bug 409361
+	# install the CMaps from poppler-data properly, bug #409361
 	dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
 
 	use static-libs || find "${D}" -name '*.la' -delete