[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/

2024-03-18 Thread Sam James 
commit: cdf02b67d95801d2437d69fc30badbd16620999b
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon Mar 18 05:49:35 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 18 07:20:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdf02b67

media-libs/sdl-ttf: make sure elibtoolize is applied

Since the libtool available is very old, that means running a full
eautoreconf.

Needed to e.g. pass LTO warning flags through to the linker.

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
index e8e9238c0a86..6b7b276efe6a 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 # Check SDL-1.2 branch for possible backports/new snapshots
 
-inherit multilib-minimal
+inherit autotools multilib-minimal
 
 SDL_TTF_COMMIT="2648c22c4f9e32d05a11b32f636b1c225a1502ac"
 
@@ -28,6 +28,11 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+src_prepare() {
+   default
+   eautoreconf
+}
+
 multilib_src_configure() {
local myeconfargs=(
$(use_enable static-libs static)

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/, media-libs/sdl-ttf/files/

2022-12-15 Thread Sam James 
commit: dda2112cb7bc7c5671b1a24c5a4ba1141cd84bdf
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 16 04:45:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 16 04:46:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dda2112c

media-libs/sdl-ttf: drop 2.0.11-r1

Signed-off-by: Sam James  gentoo.org>

 media-libs/sdl-ttf/Manifest|  1 -
 .../files/sdl-ttf-2.0.11-freetype_pkgconfig.patch  | 46 --
 .../sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch   | 10 
 media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild| 55 --
 4 files changed, 112 deletions(-)

diff --git a/media-libs/sdl-ttf/Manifest b/media-libs/sdl-ttf/Manifest
index 8faabab03788..cc5fb86c72e0 100644
--- a/media-libs/sdl-ttf/Manifest
+++ b/media-libs/sdl-ttf/Manifest
@@ -1,2 +1 @@
-DIST SDL_ttf-2.0.11.tar.gz 4053686 BLAKE2B 
3a78eeec91d7f6983b851cdd52925890c168cdf85dd34c7722183cc5a8848dab530c0c2d76493e0a380aa7e4f81967eeefd7cb34dc74faafc40497ffcb0e577b
 SHA512 
64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b
 DIST sdl-ttf-2.0.11_p20220525.tar.gz 5421461 BLAKE2B 
93422fdc912369a503ef0bc2f474a7afd749396176a295484b9ff8b1c0b5a06c2a5a21b93c91b616816f7c1c5f3ff35c611618251e8ae7f2b2d337109a3cab56
 SHA512 
a371488b59b8d1d2b067ee8bb67912d11875ac202912ffd31d5fee4630dac205e2e757505ab4dba3267e4d2700c043873c3b37aa6813ece8333f1b25fa096346

diff --git a/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch 
b/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch
deleted file mode 100644
index 02b06356190e..
--- a/media-libs/sdl-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/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch 
b/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch
deleted file mode 100644
index 7bd3a3993bb1..
--- a/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/Makefile.am
-+++ b/Makefile.am
-@@ -33,6 +33,7 @@
-   -release $(LT_RELEASE)  \
-   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- endif
-+libSDL_ttf_la_LIBADD = @MATHLIB@
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = SDL_ttf.pc

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
deleted file mode 100644
index 217cd490b4d7..
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# We may want to grab backports from the SDL-1.2 branch upstream or
-# even take snapshots from it in future, as no SDL 1 / 1.2.x releases
-# will be made anymore.
-
-inherit autotools multilib-minimal
-
-MY_P="${P/sdl-/SDL_}"
-DESCRIPTION="library that allows you to use TrueType fonts in SDL applications"
-HOMEPAGE="https://github.com/libsdl-org/SDL_ttf;
-SRC_URI="https://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz;
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="static-libs X"
-
-RDEPEND="
-   X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
-   >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
-   >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-   "${FILESDIR}"/${P}-underlink.patch
-

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/

2022-12-03 Thread Arthur Zamarin 
commit: 5880dc9662f4af5a441266f8d9c04e6007047ff7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec  3 15:41:22 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec  3 15:41:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5880dc96

media-libs/sdl-ttf: Stabilize 2.0.11_p20220525 x86, #883979

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
index 1e861438662a..b3dff2793631 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_TTF_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/

2022-12-03 Thread Arthur Zamarin 
commit: 759f07a22130959c9b894ec6e17fc3cdf29c67a8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec  3 11:40:21 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec  3 11:40:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=759f07a2

media-libs/sdl-ttf: Stabilize 2.0.11_p20220525 amd64, #883979

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
index 6744d0948ec3..1e861438662a 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_TTF_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/

2022-12-02 Thread Arthur Zamarin 
commit: 32e0135cdf0f0b9b3b3caa689b281d7ce80f6a57
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  2 18:57:02 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  2 18:57:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32e0135c

media-libs/sdl-ttf: Stabilize 2.0.11_p20220525 ppc, #883979

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
index d629de7bdc2f..6744d0948ec3 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_TTF_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/

2022-12-02 Thread Arthur Zamarin 
commit: f48d8065364ae23bb6162dfbc601c0e69d9cae7e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  2 09:47:48 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  2 09:47:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f48d8065

media-libs/sdl-ttf: Stabilize 2.0.11_p20220525 ppc64, #883979

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
index abe5185d362a..d629de7bdc2f 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_TTF_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/

2022-12-02 Thread Arthur Zamarin 
commit: 3100f717a75d260ca4cda1b4f3acb1f3eec8ebb8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  2 08:34:36 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  2 08:34:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3100f717

media-libs/sdl-ttf: Stabilize 2.0.11_p20220525 arm64, #883979

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
index f2b1f29e3158..abe5185d362a 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_TTF_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/

2022-12-02 Thread Arthur Zamarin 
commit: 2b49033c0a4360d79ac6fd90137bd47318255b5e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  2 08:15:27 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  2 08:15:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b49033c

media-libs/sdl-ttf: Stabilize 2.0.11_p20220525 sparc, #883979

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
index 8660a53fc6f2..f2b1f29e3158 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_TTF_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/

2022-12-02 Thread Arthur Zamarin 
commit: 54fd11e6e1bb1d26eff49d8ab8509bcf903b164e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  2 08:12:02 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  2 08:12:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54fd11e6

media-libs/sdl-ttf: Stabilize 2.0.11_p20220525 arm, #883979

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
index 414664c29897..8660a53fc6f2 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_TTF_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/

2022-11-10 Thread Sam James 
commit: 9dd2a3ec3c9c8ed26e4d5e5fd5233fc6e39dc5d0
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 11 06:29:37 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 11 06:29:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dd2a3ec

media-libs/sdl-ttf: drop superfluous autoreconf

Upstream commit configure etc to git, so even though they don't make releases, 
we
don't need autoreconf

Signed-off-by: Sam James  gentoo.org>

 media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
index e6683a15dc3d..414664c29897 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 # Check SDL-1.2 branch for possible backports/new snapshots
 
-inherit autotools multilib-minimal
+inherit multilib-minimal
 
 SDL_TTF_COMMIT="2648c22c4f9e32d05a11b32f636b1c225a1502ac"
 
@@ -28,11 +28,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-   default
-   eautoreconf
-}
-
 multilib_src_configure() {
local myeconfargs=(
$(use_enable static-libs static)

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/

2022-11-09 Thread Sam James 
commit: 0915ed81e89dd211b45bdd8d200f3d8c70c39624
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 10 06:39:55 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 10 06:39:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0915ed81

media-libs/sdl-ttf: add explicit backports/snapshot TODO

Signed-off-by: Sam James  gentoo.org>

 media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index a2068af4c79a..040210674b8a 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -2,6 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
+# We may want to grab backports from the SDL-1.2 branch upstream or
+# even take snapshots from it in future, as no SDL 1 / 1.2.x releases
+# will be made anymore.
+
 inherit autotools multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/

2022-11-09 Thread Sam James 
commit: 61085e74f6a8ebecb44203aa439f86565573db77
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 10 06:37:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 10 06:37:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61085e74

media-libs/sdl-ttf: add github upstream metadata

Note that we want the SDL-1.2 branch.

Signed-off-by: Sam James  gentoo.org>

 media-libs/sdl-ttf/metadata.xml | 22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/media-libs/sdl-ttf/metadata.xml b/media-libs/sdl-ttf/metadata.xml
index a569823703ad..f82bde12e798 100644
--- a/media-libs/sdl-ttf/metadata.xml
+++ b/media-libs/sdl-ttf/metadata.xml
@@ -1,13 +1,17 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   ga...@gentoo.org
-   Gentoo Games Project
-
-
-This is a sample library which allows you to use TrueType fonts in your SDL 
applications. It 
-comes with an example program "showfont" which displays an example string for 
a given 
-TrueType font file.
-
+   
+   ga...@gentoo.org
+   Gentoo Games Project
+   
+   
+   This is a sample library which allows you to use TrueType fonts in your 
SDL applications. It
+   comes with an example program "showfont" which displays an example 
string for a given
+   TrueType font file.
+   
+   
+   
+   libsdl-org/SDL_ttf
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/

2021-01-06 Thread Fabian Groffen 
commit: b25d83d60de6fa2c8b37eeb54421fd983fe812fa
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 14:24:39 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 14:26:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25d83d6

media-libs/sdl-ttf: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index be598a7c4c2..9b59a5446ed 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 
SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz;
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/

2020-08-08 Thread Sergei Trofimovich 
commit: 4b835a365d59c4de2e018450f8bec4d49fa79c9e
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Aug  8 08:40:27 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug  8 08:49:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b835a36

media-libs/sdl-ttf: stable 2.0.11-r1 for hppa, bug #730970

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index be598a7c4c2..7770cdaccff 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz;
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/

2020-07-09 Thread Sam James 
commit: bebc5a3b54b259a6250c3469f99397b9806d8bbf
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 10 00:10:13 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 10 00:15:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bebc5a3b

media-libs/sdl-ttf: arm64 stable (bug #730970)

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

 media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index abfc1f01aa8..be598a7c4c2 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz;
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/

2020-03-03 Thread Michał Górny 
commit: 2266f071d720fb0f5cab65591aef8d572a3e
Author: Roy Bamford  gentoo  org>
AuthorDate: Tue Mar  3 14:22:20 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Mar  4 04:47:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2266f071

media-libs/sdl-ttf: added ~arm64 keyword

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Roy Bamford  gentoo.org>
Signed-off-by: Michał Górny  gentoo.org>

 media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index 70a44ce8728..0b08fb9f09b 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz;
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/

2018-05-04 Thread Lars Wendler 
commit: 2b26aa05e909cf14d64288dbdbd120bf4569c10f
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri May  4 10:34:58 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri May  4 10:34:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b26aa05

media-libs/sdl-ttf: We need virtual/pkgconfig in DEPEND now.

Package-Manager: Portage-2.3.35, Repoman-2.3.9

 media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index e72a1d47b82..61ff98347e5 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -18,7 +18,8 @@ RDEPEND="
X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}

[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-ttf/files/, media-libs/sdl-ttf/

2018-05-04 Thread Lars Wendler 
commit: 180acb7085490a0c57e180eb72e6b2520022df66
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri May  4 07:55:43 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri May  4 07:55:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=180acb70

media-libs/sdl-ttf: Use pkg-config to search for freetype.

Closes: https://bugs.gentoo.org/654758
Package-Manager: Portage-2.3.35, Repoman-2.3.9

 .../files/sdl-ttf-2.0.11-freetype_pkgconfig.patch  | 46 ++
 .../sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch   |  4 +-
 media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild| 30 --
 3 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch 
b/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch
new file mode 100644
index 000..02b06356190
--- /dev/null
+++ b/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch
@@ -0,0 +1,46 @@
+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/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch 
b/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch
index 136589ec7f1..7bd3a3993bb 100644
--- a/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch
+++ b/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch
@@ -1,5 +1,5 @@
 Makefile.am.old2011-05-17 17:17:18.972003301 +0200
-+++ Makefile.am2011-05-17 17:18:38.281983708 +0200
+--- a/Makefile.am
 b/Makefile.am
 @@ -33,6 +33,7 @@
-release $(LT_RELEASE)  \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild 
b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index 2f74af33495..e72a1d47b82 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils multilib-minimal
+EAPI=6
+inherit autotools multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"
 DESCRIPTION="library that allows you to use TrueType fonts in SDL applications"
@@ -22,23 +22,29 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+   "${FILESDIR}"/${P}-underlink.patch
+   "${FILESDIR}"/${P}-freetype_pkgconfig.patch
+)
+
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-underlink.patch
+   default
+   mv configure.{in,ac} || die
eautoreconf
 }
 
 multilib_src_configure() {
-   ECONF_SOURCE="${S}" econf \
-   --disable-dependency-tracking \
-   $(use_enable static-libs static) \
+   local myeconfargs=(
+   --disable-dependency-tracking
+   $(use_enable static-libs static)
$(use_with X x)
-}
-
-multilib_src_install() {
-   emake DESTDIR="${D}" install
+   )
+   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
dodoc CHANGES README
-   use static-libs || prune_libtool_files --all
+   if ! use static-libs ; then
+   find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+   fi
 }