Merge updates from master

4 files changed, 0 insertions, 331 deletions

diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index ed3214f47051..9196b1f72cd9 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,5 +1,2 @@
-DIST ghostscript-9.15.tar.bz2 28826065 SHA256 e65daf25059e2f3dabd3535df3d936a42ca4933d36473a03095e39adcdd5315c SHA512 5c800615bb813f827c218145eb3238773e01f0941efca51abf4233ac6fdb96154b362c65a9567dc6b22794cb2caff69a58eb436c7f9c8e5370a4a64087e50c7e WHIRLPOOL 9e434278560af8fcc92119309eaaf80d615571d971b06d6e26f40317224bd7af49f2115eda4c914ed9c0bd4755439c91929fa3884eca5beb968c73377eab5f28
 DIST ghostscript-9.20.tar.xz 26387028 SHA256 3c0f3dc5df6f784850fa4ce7dcc3d6c56ef543af1fbaedd1d9f8d9f8b66de0ab SHA512 3e636f9746303f0d0fbcdfed22e8da4cc2cfd87c2afde38ffef67acb6a9fc2416aaca691d64355294e70f699bcf4acf33b09d3493dc24bc3c368387f066357fd WHIRLPOOL 0c58d8a860093ae856339839aa5012f5e47d87891fc16890cf7730979cb6506c1b686a6c1ca5dfbdcaafc614d989fec09b665d9eacc784f0dc31bca50d341f7f
-DIST ghostscript-gpl-9.12-patchset-1.tar.bz2 4940 SHA256 5c0e99a192a6d0e142c4c5f38a2d80ceeeb4a8e2265264d31360b06f3d94e0b5 SHA512 e3daf758c75ecb6a38dbece91b0f44ae06985920080b376384a9b3ad2ad35295530c144832158af2933d5fc49782c1fc6733efc60106193499c615a502f5e656 WHIRLPOOL e9436e1681e95a4b578a9de577d9b487ad119893c141baf840cd5dae0b89f5eedbde6d2f1225fb97c425a6dc3f3fb7f1ea6a02ab02b799438c3002fb933575c6
 DIST ghostscript-gpl-9.20-patchset-2.tar.xz 16696 SHA256 10172b0e1c2bf85933d568bb59f3aa7c1faf7b56b8cf3ab54dfa41e032c3490d SHA512 c62acfaae388d9ecd0d00b3b63e1e42fdc917eaf568ac65833490656d6f7261a7b8df3ba44ed50373007f48b4dd3ca9a3c528ae126307d58635200521e32ba4d WHIRLPOOL 3bf59a324f8f35764cad687da158c404f884ed639505ee5a3ca79ef90bba36b8f4e6919a40aae99947b75697d743340aa88b6a5ba1d7c0e12d17b124385347d3
-DIST gsdjvu-1.6.tar.gz 207122 SHA256 6236b14b79345eda87cce9ba22387e166e7614cca2ca86b1c6f0d611c26005df SHA512 57f3866f1f863fa31f066b45ee679cfbdf2c6a9bec922f24fa9f50dd3ea52f192b4c9889b0c9657e96ca9e3528d3fea7dcc53b4d1ea87dd49d138ce9c9684884 WHIRLPOOL 66e5222412d9da2d616ba0a3f73548d031b3e6726eff7bc60bea703b02ce4d22e100adad1faf3fabaac379b4ef8324324eabb8b5320f74ebafe929b577dd6c8d
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
deleted file mode 100644
index f078bd48ccc4..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils multilib versionator flag-o-matic toolchain-funcs
-
-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="
-	http://downloads.ghostscript.com/public/${MY_P}.tar.bz2
-	mirror://gentoo/${PN}-9.12-patchset-1.tar.bz2
-	djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz )"
-
-LICENSE="AGPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="cups dbus djvu gtk idn l10n_de static-libs tiff X"
-RESTRICT="djvu? ( bindist )"
-
-COMMON_DEPEND="
-	app-text/libpaper
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.9:2=
-	media-libs/jbig2dec
-	>=media-libs/lcms-2.6:2
-	>=media-libs/libpng-1.6.2:0=
-	>=sys-libs/zlib-1.2.7:=
-	virtual/jpeg:0
-	cups? ( >=net-print/cups-1.3.8 )
-	dbus? ( sys-apps/dbus )
-	djvu? ( app-text/djvu )
-	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
-	idn? ( net-dns/libidn )
-	tiff? ( >=media-libs/tiff-4.0.1: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
-	l10n_ja? ( media-fonts/kochi-substitute )
-	l10n_ko? ( media-fonts/baekmuk-fonts )
-	l10n_zh-CN? ( media-fonts/arphicfonts )
-	l10n_zh-TW? ( media-fonts/arphicfonts )
-	!!media-fonts/gnu-gs-fonts-std
-	!!media-fonts/gnu-gs-fonts-other
-	!<net-print/cups-filters-1.0.36-r2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="ja ko zh-CN zh-TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-pkg_setup() {
-	if use djvu; then
-		ewarn "With USE=\"djvu\", distribution of binaries is restricted!"
-		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}"/cups/libs
-	rm -rf "${S}"/expat
-	rm -rf "${S}"/freetype
-	rm -rf "${S}"/jbig2dec
-	rm -rf "${S}"/jpeg{,xr}
-	rm -rf "${S}"/lcms{,2}
-	rm -rf "${S}"/libpng
-	rm -rf "${S}"/tiff
-	rm -rf "${S}"/zlib
-	# 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/cgit/ghostscript.git
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
-	EPATCH_SOURCE="${WORKDIR}/patches/"
-	EPATCH_EXCLUDE="
-		ghostscript-gpl-9.12-sys-zlib.patch
-	"
-	epatch
-
-	if 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 "${S}"/contrib/contrib.mak "${S}"/base/contrib.mak.gsdjvu
-		grep -q djvusep "${S}"/contrib/contrib.mak || \
-			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}"/contrib/contrib.mak
-
-		# install ps2utf8.ps, bug #197818
-		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}"/lib
-		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' \
-			"${S}"/base/unixinst.mak || die "sed failed"
-	fi
-
-	if ! use gtk ; then
-		sed -i -e "s:\$(GSSOX)::" \
-			-e "s:.*\$(GSSOX_XENAME)$::" \
-			"${S}"/base/unix-dll.mak || die "sed failed"
-	fi
-
-	# Force the include dirs to a neutral location.
-	sed -i \
-		-e "/^ZLIBDIR=/s:=.*:=${T}:" \
-		configure.ac || die
-
-	# 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' \
-		"${S}"/Makefile.in "${S}"/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
-
-	# We force the endian configure flags until this is fixed:
-	# http://bugs.ghostscript.com/show_bug.cgi?id=696498
-	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
-	econf \
-		--enable-dynamic \
-		--enable-freetype \
-		--enable-fontconfig \
-		--enable-openjpeg \
-		--enable-$(tc-endian)-endian \
-		--disable-compile-inits \
-		--with-drivers=ALL \
-		--with-fontpath="$FONTPATH" \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper \
-		--without-lcms \
-		--without-luratech \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable gtk) \
-		$(use_with cups pdftoraster) \
-		$(use_with idn libidn) \
-		$(use_with tiff system-libtiff) \
-		$(use_with X x)
-
-	if use djvu ; then
-		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' \
-			"${S}"/Makefile || die "sed failed"
-	fi
-
-	cd "${S}/ijs"
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	# -j1 needed because of bug #550926
-	emake -j1 so all
-
-	cd "${S}/ijs"
-	emake
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install-so install
-
-	if use djvu ; then
-		dobin gsdjvu
-	fi
-
-	# 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 -j1 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 l10n_${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 l10n_de || rm -r "${D}"/usr/share/man/de
-}
diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index 573e02a219a6..f68477e789c8 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -1,2 +1 @@
-DIST gutenprint-5.2.10.tar.bz2 6241585 SHA256 431f352b412dfb9809d126a85a37a1fcd1c1826275ace8cdcd4fd9a6ee360e59 SHA512 bb71fd5c127748730dde01471b09907d500b72c35401abaf92c631d04156bacafd4b1a9baef61f48db6c4a622fd612a1e2834ed30207b5b178767ea9d9d5e1ac WHIRLPOOL 4d809f99df3515fc878d3be5df4f48b66fc764eea1f62db15e75d6ca7326c24c6c228bd975575c20f3e7bc8398c1e492e1025784e64a4534f82ad89c7ba92990
 DIST gutenprint-5.2.12.tar.bz2 6898738 SHA256 a42489fd7d6f2e4320811754bb80b0cd845db6632b52f819fbc2b4b75057341b SHA512 38dd34ca1946a37d0bdaa7d69f65b11651097b6d7f2b451387afd72b32fc92c3670bf54b46df226ca7a64d78f50117a648e2d6194ebaf2e86627cb29fb0e958e WHIRLPOOL f69696ae56a27e87006f471a2e9404dad53bf800743f51ce0524735f61f92e4955eb81cf8d9cc8c7e398316d55f7bc6346e2e4a0330689fad790c9ffbd9f7050
diff --git a/net-print/gutenprint/gutenprint-5.2.10.ebuild b/net-print/gutenprint/gutenprint-5.2.10.ebuild
deleted file mode 100644
index 2257f14c7df7..000000000000
--- a/net-print/gutenprint/gutenprint-5.2.10.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib autotools
-
-DESCRIPTION="Ghostscript and cups printer drivers"
-HOMEPAGE="http://gutenprint.sourceforge.net"
-SRC_URI="mirror://sourceforge/gimp-print/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="cups foomaticdb gimp gtk nls readline ppds static-libs"
-
-RDEPEND="<=app-text/ghostscript-gpl-9.15-r1
-	dev-lang/perl
-	readline? ( sys-libs/readline:0= )
-	cups? ( >=net-print/cups-1.1.14 )
-	foomaticdb? ( net-print/foomatic-db-engine )
-	gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
-	nls? ( sys-devel/gettext )"
-
-RESTRICT="test"
-
-REQUIRED_USE="gimp? ( gtk )"
-
-DOCS=( AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt} )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.2.4-CFLAGS.patch\
-		"${FILESDIR}"/${PN}-5.2.10-genppd.patch # bug 382927
-	sed -i "s:m4local:m4extra:" Makefile.am || die
-
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
-		-e "s/AM_PROG_CC_STDC/AC_PROG_CC/" \
-		-i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	if use cups && use ppds; then
-		myconf+=" --enable-cups-ppds --enable-cups-level3-ppds"
-	else
-		myconf+=" --disable-cups-ppds"
-	fi
-
-	use foomaticdb \
-		&& myconf+=" --with-foomatic3" \
-		|| myconf+=" --without-foomatic"
-
-	econf \
-		--enable-test \
-		--with-ghostscript \
-		--disable-translated-cups-ppds \
-		$(use_enable gtk libgutenprintui2) \
-		$(use_with gimp gimp2) \
-		$(use_with gimp gimp2-as-gutenprint) \
-		$(use_with cups) \
-		$(use_enable nls) \
-		$(use_with readline) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	dohtml doc/FAQ.html
-	dohtml -r doc/gutenprintui2/html
-	rm -fR "${ED}"/usr/share/gutenprint/doc
-	if ! use gtk; then
-		rm -f "${ED}"/usr/$(get_libdir)/pkgconfig/gutenprintui2.pc
-		rm -rf "${ED}"/usr/include/gutenprintui2
-	fi
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" == "/" ] && [ -x /usr/sbin/cups-genppdupdate ]; then
-		elog "Updating installed printer ppd files"
-		elog $(/usr/sbin/cups-genppdupdate)
-	else
-		elog "You need to update installed ppds manually using cups-genppdupdate"
-	fi
-}