From d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 29 Jan 2021 18:03:51 +0000 Subject: gentoo resync : 29.01.2021 --- media-libs/sdl2-ttf/Manifest | 3 -- .../files/sdl-ttf-2.0.11-freetype_pkgconfig.patch | 46 --------------------- media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild | 47 ---------------------- 3 files changed, 96 deletions(-) delete mode 100644 media-libs/sdl2-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch delete mode 100644 media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild (limited to 'media-libs/sdl2-ttf') diff --git a/media-libs/sdl2-ttf/Manifest b/media-libs/sdl2-ttf/Manifest index b51332612a2c..f77d9fcd064c 100644 --- a/media-libs/sdl2-ttf/Manifest +++ b/media-libs/sdl2-ttf/Manifest @@ -1,6 +1,3 @@ -AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066b818cd32409c1eff159cd827606c6ea893a739eb698586d8cc292b1d3c21b3963112a26f5685aba532b47d1e83bc21fcce6995253 SHA512 abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937 -DIST SDL2_ttf-2.0.14.tar.gz 4147462 BLAKE2B c676c8880d26ee61900f82c418474d0eee9844842eb006f44c80f0cc3384dd2a3f0a1da0dc8a7e50f78caa6420cc494a4a4be1ef7a294310084d5a91b8ec3c44 SHA512 4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099 DIST SDL2_ttf-2.0.15.tar.gz 4479718 BLAKE2B 8401ed4979dade5affa86be4463958d0c90f72d3b2874540cf868e460c5d6773a2b11eaf6d13792d23193085050970ebf877b707b0febaba9be29c4329be9d7c SHA512 30d685932c3dd6f2c94e2778357a5c502f0421374293d7102a64d92f9c7861229bf36bedf51c1a698b296a58c858ca442d97afb908b7df1592fc8d4f8ae8ddfd -EBUILD sdl2-ttf-2.0.14.ebuild 1099 BLAKE2B 0295afa0a1c642fe8bbab2e71d52e53b5c00a812cd42be08b5f950f7dd61cab1ec196a39e600be3a275ac3c03f2f1557278b42c1fd1af64463d7c8d12d8c67ab SHA512 3c7099971f3c7e1980bfb6765f38dc2ec8fe9abf28cd5028517dfdb7d38ce5c86545ac9aee0fa5ac6ec0f62f677e2bd54c920e61ef4da363c3e366368c4f98a0 EBUILD sdl2-ttf-2.0.15.ebuild 1006 BLAKE2B 094ee32c485d67fc19a98f1d9697d656e4b037ed0c9474fd56341d0641b7fd19a60eb22cd159b04009de559d49038e9777cc2730b1375325af23da72be76b43d SHA512 be39cfa034f6fcd1a052eb3db609b96900b986e6ccf52800fd1bd8d8c5c49b8140da395d353db6700bd20313dd2a7dcf4bdf0bc401f04fee849607b89c3d4a4c MISC metadata.xml 501 BLAKE2B bf59cfab67a21e983789c97ca2b7c457ff228546a9b9a0649c84751d8dad50b79d3bd1c00317e1710e93cbaca727cbec5e648546556e724c12745462e746e709 SHA512 90a6e2793665a3e29fa719b5dad023be6ebf2a5aa4c0ea1f33f99210829b33602fefc8b4722ae0df05085e7190f828bb49aa53c9ff004c91e0f6c9f2338a09b7 diff --git a/media-libs/sdl2-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch b/media-libs/sdl2-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch deleted file mode 100644 index 02b06356190e..000000000000 --- a/media-libs/sdl2-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://bugs.gentoo.org/654758 - ---- SDL_ttf-2.0.11/configure.in -+++ SDL_ttf-2.0.11/configure.in -@@ -64,6 +64,7 @@ - ;; - esac - -+PKG_PROG_PKG_CONFIG - - dnl Check for iconv (character conversion library; see iconv.m4) - dnl This isn't available on many systems -@@ -94,6 +95,17 @@ - dnl - dnl Get the cflags and libraries from the freetype-config script - dnl -+PKG_CHECK_MODULES( -+ FREETYPE2, -+ freetype2, -+ [ -+ ft_found=yes -+ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" -+ LIBS="$LIBS $FREETYPE2_LIBS" -+ ], -+ ft_found=no -+) -+ - AC_ARG_WITH(freetype-prefix,[ --with-freetype-prefix=PFX Prefix where FREETYPE is - installed (optional)], - freetype_prefix="$withval", freetype_prefix="") -@@ -101,6 +113,7 @@ - where FREETYPE is installed (optional)], - freetype_exec_prefix="$withval", freetype_exec_prefix="") - -+if test "x$ft_found" != "xyes" ; then - if test x$freetype_exec_prefix != x ; then - freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix" - if test x${FREETYPE_CONFIG+set} != xset ; then -@@ -123,6 +136,7 @@ - CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`" - LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`" - fi -+fi - - dnl Check for SDL - SDL_VERSION=1.2.4 diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild deleted file mode 100644 index 9bb754c90b17..000000000000 --- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools multilib-minimal - -MY_P="SDL2_ttf-${PV}" -DESCRIPTION="library that allows you to use TrueType fonts in SDL applications" -HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/" -SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="static-libs X" - -RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] ) - >=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}] - >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/sdl-ttf-2.0.11-freetype_pkgconfig.patch" -) - -src_prepare() { - default - mv configure.{in,ac} || die - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - $(use_with X x) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - dodoc {CHANGES,README}.txt - find "${ED}" -name '*.la' -delete || die -} -- cgit v1.2.3