gentoo (valentine's day) resync : 14.02.2021

4 files changed, 2 insertions, 67 deletions

diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index 7ae9b86bb3fb..01f4d72f10a1 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1,6 +1,3 @@
-AUX dvipng-1.15-freetype-config.patch 405 BLAKE2B cb60958773b1091026f4bd59cab2dbb51404a3696f61606a4394563b70e2d4a506664d91435b9485417fa8ef61a07051240b8d05861f4bf1e0196a93de69966e SHA512 65fb9900e0b929902713a0c61e5bd2cafd56828a0f294171852bd7d6a5ee44356a26e3f5a3bc57f5e0c532cc6e31a8111ca1daf52945909eecd7b7f1c74c3546
-DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
 DIST dvipng-1.17.tar.gz 171049 BLAKE2B 7165135d818aa399d051977908bf7865774803127312fec515284bd72c4f9e88ffd7f1f7c3c8f1b5adf324fdbb9ac8d039582ede2398123db6ee7655500ac32a SHA512 b56faa6f2b24572233e1f0d9b74122b3bb7fed22cf47c9c05f5530691854dffc9a1953b51803f7d539f9a9de364160d557560c68c369820212837bdbacfb80c7
-EBUILD dvipng-1.15-r1.ebuild 1285 BLAKE2B b1966083be571eb035c58ca968ae0e15ac1648cef37e7d60772cb8c0a4ae0cc52afa75e525580237ca7306d8b34d367ea5de1703d68142ce6a4bbc0927d7d3a0 SHA512 41491e753d5102ea718ce2d991ecb04b12aeb90ebf32aa9c848479105780f527763d4d580619246ea1b016d5bf965c03f7927fc4379ffbed47372ae44dc04625
-EBUILD dvipng-1.17.ebuild 1102 BLAKE2B 6065c23f7b8944d39293d24a0c52e28926390987421c776a39a83efa4c3729ac191f69775c17518a8fad0bec07fd5fb73c95f20bb0d2867b5faa7abdd50d6441 SHA512 7024d5302582be69b1823fde6c5c460fe932d5588b2a793e20577a464ceafea59be1c503f492eb9d448d13d0a65ba15c9482aa463820996c4713ebca4d9e0c70
+EBUILD dvipng-1.17.ebuild 1101 BLAKE2B b95fb6f2c3ef006b5477e3acf017829ed355f9ddd22e08206d6daf5d25a3e66f1e69a2cbfb8695b3d0865a49963d1c6971ede5236c7677422142343024089e5f SHA512 2392c88334ce53e3d73fce4e53f37b89435ef77c6b02f46237e893ecc25630b73c0a82b1e1ba32ab6734103eb95a2f1eeab3b44996740ffa0cfd73db7a6f0fd1
 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
deleted file mode 100644
index 00c92cd61184..000000000000
--- a/app-text/dvipng/dvipng-1.15-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="truetype test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/kpathsea-6.2.1:=
-	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_prepare() {
-	eapply "${FILESDIR}"/${P}-freetype-config.patch
-	eapply_user
-
-	# save local macros, since we regenerate aclocal.m4 below
-	mv aclocal.m4 acinclude.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	if ! use truetype; then
-		sed -i -e 's/\(--exists.*\)freetype2/\1dIsAbLe/' configure \
-			|| die "sed failed"
-	fi
-
-	export VARTEXFONTS="${T}/fonts"
-	econf
-}
diff --git a/app-text/dvipng/dvipng-1.17.ebuild b/app-text/dvipng/dvipng-1.17.ebuild
index 80b7d38c3a40..068bb18ba2aa 100644
--- a/app-text/dvipng/dvipng-1.17.ebuild
+++ b/app-text/dvipng/dvipng-1.17.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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="truetype test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/dvipng/files/dvipng-1.15-freetype-config.patch b/app-text/dvipng/files/dvipng-1.15-freetype-config.patch
deleted file mode 100644
index 20b7ebaf465c..000000000000
--- a/app-text/dvipng/files/dvipng-1.15-freetype-config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dvipng-1.15-orig/configure.ac
-+++ dvipng-1.15/configure.ac
-@@ -78,7 +78,8 @@
- AC_CHECK_HEADERS([libgen.h])
- PSFONTS_O=""
- AC_SUBST(PSFONTS_O)
--AC_CHECK_FT2(,[CFLAGS="$FT2_CFLAGS $CFLAGS"
-+PKG_CHECK_MODULES([FT2], [freetype2 >= 6.1.0],
-+	[CFLAGS="$FT2_CFLAGS $CFLAGS"
- 	LIBS="$FT2_LIBS $LIBS"
- 	PSFONTS_O="sfd.o ft.o enc.o fontmap.o tfm.o"
- 	AC_DEFINE(HAVE_FT2, 1, [Define to 1 if you have freetype2])