gentoo resync : 12.01.2019

3 files changed, 2 insertions, 42 deletions

diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index c5e835835443..c97bcb99641e 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1,5 +1,4 @@
 AUX dvipng-1.15-freetype-config.patch 405 BLAKE2B cb60958773b1091026f4bd59cab2dbb51404a3696f61606a4394563b70e2d4a506664d91435b9485417fa8ef61a07051240b8d05861f4bf1e0196a93de69966e SHA512 65fb9900e0b929902713a0c61e5bd2cafd56828a0f294171852bd7d6a5ee44356a26e3f5a3bc57f5e0c532cc6e31a8111ca1daf52945909eecd7b7f1c74c3546
 DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
-EBUILD dvipng-1.15-r1.ebuild 1296 BLAKE2B acf6c12d9a346fe60b958f34c7608246b587a06a2146fff929e51120228e19e1b594882f25e1b21a538696deafe830ffd6bc8782908e78760396bff5c3b9a5cd SHA512 2a2f35d0bea016801901e0a244084b8eb9638bfb214198aeb8d6f50358fc609024c52c31ebcea0cbe21374b3769b2e71bc0c4bdd684208acf1a409688e0e9855
-EBUILD dvipng-1.15.ebuild 1121 BLAKE2B 3975d100ff1722886fc277ad7d37584bce315d6e3ced9e5cb62e86bab7430483cbf6bd6dba30fc2227097e9b6e247c7b65bf8590dad4c70476205f579b2b277d SHA512 95692a71c955e8d9ff08b32171831148aa455a60b765e2b1beea7687da1eeb1d8e7b9f0acd9c8da4a3f2173f26f1b77f6c2d67210d538eed25a88f80075eb82f
+EBUILD dvipng-1.15-r1.ebuild 1295 BLAKE2B 5b3272e0974907c12c4bfc87cd4ed918831066d78e81ceb4beea7f3d7d1cb571ce3bdcab09188e9a13516daaf6eaa16efc595a7b1badc5ca4fddf2f01be6d02e SHA512 0bcd7a13d6af039c90e8ffd9c34f88c50ef83153245bd786c5aec474a0894a483dc81b471a495b9ffd99c76b7cb7b779b2373247d7aa2685bead65ce740756f7
 MISC metadata.xml 1122 BLAKE2B fcfe5bf7616dd40ccaa74751ba1c653012de0f263ae8c4764363c4a5b1ce9546a335b7e2c0917a9d2a0a30cde98bcc5b8e3184619b83f1d6267d7172584144d2 SHA512 c2f663c6ae8113fc462e16ce50ef44172c8d5cffaf34e9095701df7e3ae568126bb782c8a02e3d735239ea7263e6cd9778bf21f4d7166c24799a9090ecd8bc26
diff --git a/app-text/dvipng/dvipng-1.15-r1.ebuild b/app-text/dvipng/dvipng-1.15-r1.ebuild
index 13c8825da288..4f7f255a1b52 100644
--- a/app-text/dvipng/dvipng-1.15-r1.ebuild
+++ b/app-text/dvipng/dvipng-1.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="truetype test"
 
 RDEPEND="
diff --git a/app-text/dvipng/dvipng-1.15.ebuild b/app-text/dvipng/dvipng-1.15.ebuild
deleted file mode 100644
index 6b0df705d059..000000000000
--- a/app-text/dvipng/dvipng-1.15.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Translate DVI files into PNG or GIF graphics"
-HOMEPAGE="http://dvipng.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="truetype test"
-
-RDEPEND="
-	dev-libs/kpathsea:=
-	media-libs/gd:2=[jpeg,png]
-	media-libs/libpng:0=
-	virtual/latex-base
-	sys-libs/zlib
-	truetype? ( >=media-libs/freetype-2.1.5 )"
-DEPEND="${RDEPEND}
-	virtual/texi2dvi
-	virtual/pkgconfig
-	test? ( dev-texlive/texlive-fontsrecommended )"
-
-DOCS="ChangeLog README RELEASE"
-
-src_configure() {
-	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	if ! use truetype; then
-		sed -i -e 's/FT_Init_FreeType/dIsAbLe&/' configure || die "sed failed"
-	fi
-
-	export VARTEXFONTS="${T}/fonts"
-	econf
-}