gentoo resync : 19.04.2018

4 files changed, 62 insertions, 50 deletions

diff --git a/media-gfx/gozer/Manifest b/media-gfx/gozer/Manifest
index 67de65816409..0ec5a44a3032 100644
--- a/media-gfx/gozer/Manifest
+++ b/media-gfx/gozer/Manifest
@@ -1,4 +1,4 @@
+AUX gozer-0.7-fix-build-system.patch 1600 BLAKE2B 2d1bb419c587c4c24bad15f8b0ec99f6052e6ff924db9e3ff4a26a7e04f2b2ecdbbe2bb0a022b24fc4c4150499ad562289e9311b711de71cf1dea280a2299276 SHA512 a17ffc77e3899dba47227343d7f3b656d3223085b8419460b73031c50e46d9ab5d7668154ea10cd733b3f3c2693649c355bf43306ef205213a42d2b990cc4648
 DIST gozer-0.7.tar.gz 103545 BLAKE2B 5eb3e2da348204f6fac9c00b681df56d4d419df671d9967c0b05b78838fd9b2ec4e76a7f2df07396e6aee1313117f72126aab57732d4b9713c54581bfbe3bf3d SHA512 ae39b74272f87d5e9bf71c9df7e6e9ac37a44a54dafba45aa5e8037657ba128e4e6c77a5624921fbca5c57791a0047f491013582cd9e5a6a5c8932a23233a29c
-EBUILD gozer-0.7-r2.ebuild 760 BLAKE2B bd8df407d063fa3d40c14fea2e6995a4f30d21aecad4f0499ca868b39fc7b70c266b44f3cdbd312f20b132ed8a2727b44d6756b31a713690c892be82d1d22974 SHA512 4db8ecb35307fbc730100c259c18b509473bd9793d829afb430a158dc4e430aabba87983bf865e8c95d68cc47e46a180a1d4c17f3f8c337d9a870592f43da8f5
-EBUILD gozer-0.7-r3.ebuild 768 BLAKE2B f6ac14b93153c88f022e04950b113d0b54dab1e119da979de6a228f45dee770c67c52b7332eda25b698f352c94fe2445850385667484ade88cc7c57c9c4772be SHA512 bc57b6c5374a0db074363cb9fca5d1fbf955c6b3de5d28dc6c01d2d3fcdea87e34662765b364f1f4e4c6db4f332b5ac75c62aa6eb49a458aeb3e86a9277b6a55
+EBUILD gozer-0.7-r3.ebuild 602 BLAKE2B 9aee70b89e2c5aa1f5557ee4932948812543ff3da79891fa680d9fd087055d1c55aca35bb974b3e554c150fd2ee018a67971feea64c9fb947ab5e75764dd4f96 SHA512 48f681c15824aa2d0ff9d64ea5d1ebd6207c587e73b18f62d161d5c604520351cbbfa8298c9ae0ba3790e1a259d9069119717682fa4b7a5cf7dd41a85c010216
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/gozer/files/gozer-0.7-fix-build-system.patch b/media-gfx/gozer/files/gozer-0.7-fix-build-system.patch
new file mode 100644
index 000000000000..6102fe9c64c8
--- /dev/null
+++ b/media-gfx/gozer/files/gozer-0.7-fix-build-system.patch
@@ -0,0 +1,51 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,14 +5,9 @@
+ # A list of all the files in the current directory which can be regenerated
+ MAINTAINERCLEANFILES = Makefile.in gozer.spec
+ 
+-LDFLAGS           = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib
+-INCLUDES          = -I/usr/X11R6/include \
+-$(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I.
+-
+ man_MANS = gozer.1
+ 
+-docs_DATA = README AUTHORS ChangeLog TODO
+-docsdir = $(prefix)/doc/@PACKAGE@
++doc_DATA = README AUTHORS ChangeLog TODO
+ 
+ EXTRA_DIST = \
+ gozer.spec gozer.1 $(docs_DATA)
+--- a/src/fonts/Makefile.am
++++ b/src/fonts/Makefile.am
+@@ -8,6 +8,6 @@
+ fonts_DATA = \
+ helmetr.ttf
+ 
+-fontsdir=$(prefix)/share/@PACKAGE@/fonts
++fontsdir=$(prefix)/share/$(PACKAGE)/fonts
+ 
+ EXTRA_DIST = $(fonts_DATA)
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,15 +1,13 @@
+ # A list of all the files in the current directory which can be regenerated
+-MAINTAINERCLEANFILES = Makefile.in				
++MAINTAINERCLEANFILES = Makefile.in
+ 
+ SUBDIRS = fonts
+ 
+-LDFLAGS           = -L/usr/X11R6/lib
+-INCLUDES          = -g -O3 -Wall -I/usr/X11R6/include \
+-$(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. \
+--DPREFIX=\""$(prefix)"\" @GIBLIB_CFLAGS@
+-LIBOBJS = @LIBOBJS@
++AM_CPPFLAGS = -Wall -I/usr/X11R6/include \
++	$(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. \
++	-DPREFIX=\""$(prefix)"\" $(GIBLIB_CFLAGS)
+ 
+ bin_PROGRAMS      = gozer
+ gozer_SOURCES       = main.c getopt.c getopt1.c getopt.h gozer.h \
+ options.c options.h debug.h utils.c utils.h imlib.c structs.h
+-gozer_LDADD         = @GIBLIB_LIBS@
++gozer_LDADD         = $(GIBLIB_LIBS) -L/usr/X11R6/lib
diff --git a/media-gfx/gozer/gozer-0.7-r2.ebuild b/media-gfx/gozer/gozer-0.7-r2.ebuild
deleted file mode 100644
index db1e762db93e..000000000000
--- a/media-gfx/gozer/gozer-0.7-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools
-
-DESCRIPTION="tool for rendering arbitrary text as graphics, using ttfs and styles"
-HOMEPAGE="http://www.linuxbrit.co.uk/gozer/"
-SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="x11-libs/libXext
-	>=media-libs/giblib-1.2.1"
-RDEPEND=">=media-libs/giblib-1.2.1
-	media-libs/imlib2"
-
-src_prepare() {
-	sed -i src/Makefile.am \
-		-e 's|-g -O3|$(CFLAGS)|g' \
-		-e '/LDFLAGS/s|=|+=|g' \
-		|| die "sed src/Makefile.am"
-	eautoreconf
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	rm -rf "${D}"/usr/doc
-	dodoc TODO README AUTHORS ChangeLog
-}
diff --git a/media-gfx/gozer/gozer-0.7-r3.ebuild b/media-gfx/gozer/gozer-0.7-r3.ebuild
index 05e8079d3ba2..eb15f0c92d2d 100644
--- a/media-gfx/gozer/gozer-0.7-r3.ebuild
+++ b/media-gfx/gozer/gozer-0.7-r3.ebuild
@@ -11,25 +11,20 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 LICENSE="feh LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="x11-libs/libXext
-	>=media-libs/giblib-1.2.1"
-RDEPEND=">=media-libs/giblib-1.2.1
+RDEPEND="
+	media-libs/giblib
 	media-libs/imlib2"
+DEPEND="
+	${RDEPEND}
+	x11-libs/libXext"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
 src_prepare() {
 	default
-	sed -i src/Makefile.am \
-		-e 's|-g -O3|$(CFLAGS)|g' \
-		-e '/LDFLAGS/s|=|+=|g' \
-		|| die "sed src/Makefile.am"
+	mv configure.{in,ac} || die
 	eautoreconf
 }
-
-src_install() {
-	emake install DESTDIR="${D}"
-	rm -rf "${D}"/usr/doc || die
-	dodoc TODO README AUTHORS ChangeLog
-}