[gentoo-commits] repo/gentoo:master commit in: app-text/dvipng/files/, app-text/dvipng/

2021-02-05 Thread Sam James
commit: a092736c3941d6bbefb6f2401dbdb7430e4ca8a7
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb  6 00:21:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb  6 01:10:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a092736c

app-text/dvipng: cleanup old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 app-text/dvipng/Manifest   |  1 -
 app-text/dvipng/dvipng-1.15-r1.ebuild  | 50 --
 .../dvipng/files/dvipng-1.15-freetype-config.patch | 12 --
 3 files changed, 63 deletions(-)

diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index 6c1ddbe1d80..ee6fafc64bf 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1,2 +1 @@
-DIST dvipng-1.15.tar.gz 171529 BLAKE2B 
0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070
 SHA512 
54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
 DIST dvipng-1.17.tar.gz 171049 BLAKE2B 
7165135d818aa399d051977908bf7865774803127312fec515284bd72c4f9e88ffd7f1f7c3c8f1b5adf324fdbb9ac8d039582ede2398123db6ee7655500ac32a
 SHA512 
b56faa6f2b24572233e1f0d9b74122b3bb7fed22cf47c9c05f5530691854dffc9a1953b51803f7d539f9a9de364160d557560c68c369820212837bdbacfb80c7

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 00c92cd6118..000
--- 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/files/dvipng-1.15-freetype-config.patch 
b/app-text/dvipng/files/dvipng-1.15-freetype-config.patch
deleted file mode 100644
index 20b7ebaf465..000
--- 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])



[gentoo-commits] repo/gentoo:master commit in: app-text/dvipng/files/, app-text/dvipng/

2018-05-07 Thread Ulrich Müller
commit: 5f25b107a225e0820086bc481d5cf9a6744872b9
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon May  7 20:38:29 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon May  7 20:39:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f25b107

app-text/dvipng: Use pkg-config instead of freetype-config.

Closes: https://bugs.gentoo.org/655132
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 app-text/dvipng/dvipng-1.15-r1.ebuild  | 49 ++
 .../dvipng/files/dvipng-1.15-freetype-config.patch | 12 ++
 2 files changed, 61 insertions(+)

diff --git a/app-text/dvipng/dvipng-1.15-r1.ebuild 
b/app-text/dvipng/dvipng-1.15-r1.ebuild
new file mode 100644
index 000..1b3506f379f
--- /dev/null
+++ b/app-text/dvipng/dvipng-1.15-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~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-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 mylocal.m4 || die
+   AT_M4DIR=. 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/files/dvipng-1.15-freetype-config.patch 
b/app-text/dvipng/files/dvipng-1.15-freetype-config.patch
new file mode 100644
index 000..20b7ebaf465
--- /dev/null
+++ b/app-text/dvipng/files/dvipng-1.15-freetype-config.patch
@@ -0,0 +1,12 @@
+--- 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])