gentoo resync : 28.04.2021

3 files changed, 8 insertions, 55 deletions

diff --git a/media-libs/sdl-gfx/Manifest b/media-libs/sdl-gfx/Manifest
index 28ad40ad59f8..a5bc2d0151bc 100644
--- a/media-libs/sdl-gfx/Manifest
+++ b/media-libs/sdl-gfx/Manifest
@@ -1,4 +1,3 @@
 DIST SDL_gfx-2.0.26.tar.gz 1771164 BLAKE2B 09556762bd9f3e19989d9db4117ec63deff466c015fe0d7b40595b8d3d0f2e7f17d142d101a1463a71144b6ee7700370513057f4f4753a4b4c605308cd42bc64 SHA512 e571caa0d7575683efd4cf8f0a41ab10f4acf913f9ece216ac823af11da22c8734fc2c0ea049009a3e1a53715e49622f5bfcfdbdafb95e5151990d0a4eb69c01
-EBUILD sdl-gfx-2.0.26-r1.ebuild 1194 BLAKE2B 89d995b1dc114637f04adf91dcc4d788f2e2748fc69cde248ec804e94c464ccac73b3c0dec8e2640ab08bb55152690e2f190f6655085e2abd658a6a02e7b932f SHA512 fa55cc2565ddadd22b0561f1ab683fe9fa435e7014ce67a0d8235da26d2eb7015c99fbd3d09519c67935e8d762252f346c2d64339aba5242a0056b5098c61963
-EBUILD sdl-gfx-2.0.26.ebuild 1167 BLAKE2B fd021b412999dac8556766918270164ff961c7e3b249c12a0b3cf36be6c3cdf654a893ed12697158d658f3c3c158037fbdc89a129586d08d69ffebb95b57f934 SHA512 91ab8a68fafbad85b960cf1c7fc137bdad2834134d4e04aa30b5c447d7e1e596eaa38ed64920078817fc09b455ad43e63451824bcf98b069bbe6a5d9842db7b6
+EBUILD sdl-gfx-2.0.26-r1.ebuild 1163 BLAKE2B 33d41a7543c6d7d08399c27bcdb71b782b3760233b7238f00960945b011ed080fac8766d8591527c0d76cc1d9393b4d6849d6fd3d0a1c9623194580ec74f484f SHA512 c0d56a2fec8dc8628c9f1087dcb640b7279623b8fb6451a26d6ee55d580c68807d0cf4dbe217b99e90fa3aff2778925532dfa57e000fafb86dfa37cf45560e4e
 MISC metadata.xml 913 BLAKE2B 24b8ef9a2b333c6df842a85ec91f6d3a70c4439ed6bcd829641b158d4fb6f100ac20134cba4b2b2e5732825730ed0a214f55b10ff38a328e6a004770b3d246a5 SHA512 495205062ad772f808daa2da58de9abf6ec504665e06ba9f38392bcae2b4ee343a935be43d5d82e56353d1b282c6e293a859d495f98face961f9c5921503c162
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
index 69cfd9504e43..d836fe55697f 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
@@ -2,25 +2,25 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"
 DESCRIPTION="Graphics drawing primitives library for SDL"
 HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/"
 SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0/16" # libSDL_gfx.so.16
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc cpu_flags_x86_mmx static-libs"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc cpu_flags_x86_mmx"
 
 RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog README )
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	default
 	sed -i -e 's/-O //' configure.in || die
@@ -31,7 +31,7 @@ src_prepare() {
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable static-libs static)
+		--disable-static
 }
 
 #multilib_src_install() {
@@ -40,9 +40,11 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
+
 	if use doc ; then
 		docinto html
 		dodoc -r Docs/*
 	fi
+
 	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
 }
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
deleted file mode 100644
index 373fb1ac374f..000000000000
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal
-
-MY_P="${P/sdl-/SDL_}"
-DESCRIPTION="Graphics drawing primitives library for SDL"
-HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/"
-SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${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-solaris"
-IUSE="doc cpu_flags_x86_mmx static-libs"
-
-RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog README )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i -e 's/-O //' configure.in || die
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable static-libs static)
-}
-
-#multilib_src_install() {
-#	emake DESTDIR="${D}" install
-#}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use doc ; then
-		docinto html
-		dodoc -r Docs/*
-	fi
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}