gentoo resync : 15.12.2019

1 files changed, 20 insertions, 11 deletions

diff --git a/media-libs/giblib/giblib-1.2.4-r1.ebuild b/media-libs/giblib/giblib-1.2.4-r1.ebuild
index 8c542462cf43..8eb73843f2be 100644
--- a/media-libs/giblib/giblib-1.2.4-r1.ebuild
+++ b/media-libs/giblib/giblib-1.2.4-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-inherit epunt-cxx libtool
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="a graphics library built on top of imlib2"
 HOMEPAGE="http://freecode.com/projects/giblib http://www.linuxbrit.co.uk/giblib/"
@@ -11,21 +12,29 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 LICENSE="feh"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~sh sparc x86"
-IUSE="static-libs"
 
-RDEPEND=">=media-libs/imlib2-1.0.3[X]
+RDEPEND="
+	media-libs/freetype
+	media-libs/imlib2:=[X]
 	x11-libs/libX11
-	x11-libs/libXext
-	>=media-libs/freetype-2.0"
+	x11-libs/libXext"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.2.4-fix-build-system.patch )
+
 src_prepare() {
-	sed -i 's:@LDFLAGS@::' giblib-config.in giblib.pc.in || die #430724
-	sed -i "/^docsdir/s:=.*:= @datadir@/doc/${PF}:" Makefile.in || die
-	epunt_cxx
-	elibtoolize # otherwise it doesnt install the .so -> .so.x symlink on fbsd
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }