gentoo resync : 15.12.2019

3 files changed, 55 insertions, 12 deletions

diff --git a/media-libs/giblib/Manifest b/media-libs/giblib/Manifest
index 1e394b7f8c45..071a669a682c 100644
--- a/media-libs/giblib/Manifest
+++ b/media-libs/giblib/Manifest
@@ -1,3 +1,4 @@
+AUX giblib-1.2.4-fix-build-system.patch 792 BLAKE2B 4e59d03acceb1ff6ea013660e2c6ce1435c47bfcd040800de7deda37346ec7b5687d4b7809222b2331c6b9f52e54c53524d30ca03fe4096b0134fcd5e1a11a7d SHA512 8dc2de904f9c0082b5be16d21d366e84f6912cf891e80b8c32681e4f589c911775fb5227f0ef3d4790920512b279b02b451f3afcbbada329d004c2eac494fe8f
 DIST giblib-1.2.4.tar.gz 287653 BLAKE2B 0b936fe3b56b933a5038751428ec56a872911d3c4ae972e9670cb1ce2496de6a8e21cb4718e7bab4eb1d547eb67ca71b25d77405ff04ebcb1ca0dc03fafea7ef SHA512 4866df223e6d219a5c9a327874bcd67260c83fba8f99862222df41ef86fb31efa0172a777bf46c853ca380dc2a64bbd41bf4fd658fcb84a924cab4e0f525dcfd
-EBUILD giblib-1.2.4-r1.ebuild 877 BLAKE2B ecad038c51683f25ffeac4a9937425ee23b2aaf8200fb60525864465b71d18d9bf14f69bf2cacfb0d650ca6b66cc239ae61996c8a02568a28540777bcd9fc424 SHA512 53c6002d53293fe19f0532f591109b004f56f028ead71bf2ce011be3725c5ebc286b42173613edb66ca070dcdb9c0f37193b21438307bb21b1a96a88381d5682
+EBUILD giblib-1.2.4-r1.ebuild 804 BLAKE2B 60f195dca2cbbde502f49e7bad05b8cdc8e425cb171a9b329af85bc75d3112dfebcf1824132c867c0f2b27c3847f19c388fa9e190f72d8c59843dfba920d23d9 SHA512 4712fc6ee61d53b33b57ed0cf4b6aa35f43b40f63bd2fc7424853003649d5f29054808bd520e5445bddb44ab5c23e422ef54affed25b9058c37e3e4229c3e723
 MISC metadata.xml 750 BLAKE2B d02c2f96076c9be5a95d8701e935ed802f3b8759d2c1cc220e6235e6a310773a05dcd5e77398ee3f32f7a55822c407c5d18c3cb79b674ba5124043934b04539b SHA512 4827fa23f4b181c3e0a76eb422bd05b1504f6982edd7b8de4ac0464043b9cb8339939629162ec0f2ca1a663940e3a52f8c95ca890ad1eb9aed6d9df4c6580c34
diff --git a/media-libs/giblib/files/giblib-1.2.4-fix-build-system.patch b/media-libs/giblib/files/giblib-1.2.4-fix-build-system.patch
new file mode 100644
index 000000000000..f1c37fbadaed
--- /dev/null
+++ b/media-libs/giblib/files/giblib-1.2.4-fix-build-system.patch
@@ -0,0 +1,33 @@
+--- a/giblib-config.in
++++ b/giblib-config.in
+@@ -46,7 +46,7 @@
+       ;;
+     --libs)
+       libdirs=-L@libdir@
+-      echo $libdirs -lgiblib @LDFLAGS@ @IMLIB_LIBS@
++      echo $libdirs -lgiblib @IMLIB_LIBS@
+       ;;
+     *)
+       echo "${usage}" 1>&2
+--- a/giblib.pc.in
++++ b/giblib.pc.in
+@@ -6,6 +6,6 @@
+ Name: giblib
+ Description: wrapper library for imlib2, and other stuff
+ Version: @VERSION@
+-Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB_LIBS@
++Libs: -L${libdir} -lgiblib @IMLIB_LIBS@
+ Cflags: -I${includedir} -I${includedir}/giblib @IMLIB_CFLAGS@
+ 
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,8 +2,7 @@
+ 
+ SUBDIRS = giblib
+ 
+-docs_DATA = README AUTHORS ChangeLog TODO
+-docsdir = $(prefix)/doc/giblib
++doc_DATA = README AUTHORS ChangeLog TODO
+ 
+ EXTRA_DIST= $(docs_DATA) giblib.pc.in
+ 
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
 }