From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 15 Dec 2019 18:09:03 +0000
Subject: gentoo resync : 15.12.2019

---
 media-libs/compface/Manifest                       |  4 ++--
 media-libs/compface/compface-1.5.2.ebuild          | 15 ++++--------
 .../compface/files/compface-1.5.2-destdir.diff     | 17 -------------
 .../files/compface-1.5.2-fix-build-system.patch    | 28 ++++++++++++++++++++++
 4 files changed, 35 insertions(+), 29 deletions(-)
 delete mode 100644 media-libs/compface/files/compface-1.5.2-destdir.diff
 create mode 100644 media-libs/compface/files/compface-1.5.2-fix-build-system.patch

(limited to 'media-libs/compface')

diff --git a/media-libs/compface/Manifest b/media-libs/compface/Manifest
index e9a9861dbfd0..17e0772be4b6 100644
--- a/media-libs/compface/Manifest
+++ b/media-libs/compface/Manifest
@@ -1,4 +1,4 @@
-AUX compface-1.5.2-destdir.diff 408 BLAKE2B 83798a6d80b57f29b06edc1ce931d5fe52357344693fb890cbbc1de81a7fd87a399c585de370b396d5ca180c41b7ff049a1d007c0e575306462df1a428510de0 SHA512 d9137aab3623907ee48d72f61593480f5a952dcecf794e69404b15a3b0be0b5098abd9aaff8966f82f14f797fb243e00d2b4b4a7f7951f1aef233fe24bfa543a
+AUX compface-1.5.2-fix-build-system.patch 899 BLAKE2B e9bc5c7e6194ff77967ba5ff700771015f8a29612f2c28f32853de06871e30e4f8f4211ae035efbc739326a0b0460aedf0cd859644741cfcf8920f71c485d0ee SHA512 b42ce74af078598f58bca042d820a3d40077447091de111a5d15eddf83ed6c409c330ef79398304998b7e9057b753398b1d84e6318d42a8acb1556eb030c190c
 DIST compface-1.5.2.tar.gz 46970 BLAKE2B d26c25a35b3a2e63ddfb50feace61930fa3be9f4150ad8f8c96a3820ccebf1422fda5703628d58ad646f1d1eeaccc5f2f08ed5f2e74b845f5d7328f2829e63d6 SHA512 0da9ee4c5fb2b5c712466d9fa6170e5687b23c038e6304baa42d7ede6d9bd50a1b84da416eb853a420c01a6b9eccd5e7d92a4ebc26295714b85254c05c9e3360
-EBUILD compface-1.5.2.ebuild 631 BLAKE2B e9c3eb589b9dc6ed3ebcd7305adf7de21ba4815c39386da99bc50f73fcc9d71f0c492724013951808091eb73087fb25cd883023716d24b0a96e1bff8ee68eca0 SHA512 571fbef11ddff7bd26c76e5eddf8fa76057b9b04c749553f772d8101e334087c5b3e5bce314f28a3f1dd8835288154eac23b3fce8e10b9487c62c222465e9043
+EBUILD compface-1.5.2.ebuild 550 BLAKE2B ad91b7fba3479466cb611c80528e22f4d749cf34cf1c4d830a72cea425e517de3b42e7c30fbb5fffdfcdeb8971581806c460bac4b1e7c5afedd25c62aba2e3a9 SHA512 f5ce1b99d312bb2ecd26b3d132e4fc9ce4e1c4c00b24bdf3ca6e96e117e599de4531d8285d35df295d48dc7305fc1281e208084e5080e8ef578f1911e98a3699
 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/media-libs/compface/compface-1.5.2.ebuild b/media-libs/compface/compface-1.5.2.ebuild
index af03c528e505..db1dd3858f06 100644
--- a/media-libs/compface/compface-1.5.2.ebuild
+++ b/media-libs/compface/compface-1.5.2.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Utilities and library to convert to/from X-Face format"
 HOMEPAGE="http://www.xemacs.org/Download/optLibs.html"
@@ -12,15 +10,12 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/aux/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-destdir.diff
-	sed -i "/strip/d" Makefile.in
-}
+RDEPEND="dev-lang/perl"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README
+	default
 	newbin xbm2xface{.pl,}
 }
diff --git a/media-libs/compface/files/compface-1.5.2-destdir.diff b/media-libs/compface/files/compface-1.5.2-destdir.diff
deleted file mode 100644
index 18ecfd1b4e5f..000000000000
--- a/media-libs/compface/files/compface-1.5.2-destdir.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- compface-1.5.2.orig/Makefile.in
-+++ compface-1.5.2/Makefile.in
-@@ -1,10 +1,10 @@
- prefix          = @prefix@
- exec_prefix     = @exec_prefix@
- srcdir          = @srcdir@
--BINDIR		= @bindir@
--LIBDIR		= @libdir@
--MANDIR		= @mandir@
--INCLUDEDIR	= @includedir@
-+BINDIR		= $(DESTDIR)/@bindir@
-+LIBDIR		= $(DESTDIR)/@libdir@
-+MANDIR		= $(DESTDIR)/@mandir@
-+INCLUDEDIR	= $(DESTDIR)/@includedir@
- 
- @SET_MAKE@
- 
diff --git a/media-libs/compface/files/compface-1.5.2-fix-build-system.patch b/media-libs/compface/files/compface-1.5.2-fix-build-system.patch
new file mode 100644
index 000000000000..2cfea742c981
--- /dev/null
+++ b/media-libs/compface/files/compface-1.5.2-fix-build-system.patch
@@ -0,0 +1,28 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,10 +1,10 @@
+ prefix          = @prefix@
+ exec_prefix     = @exec_prefix@
+ srcdir          = @srcdir@
+-BINDIR		= @bindir@
+-LIBDIR		= @libdir@
+-MANDIR		= @mandir@
+-INCLUDEDIR	= @includedir@
++BINDIR		= $(DESTDIR)/@bindir@
++LIBDIR		= $(DESTDIR)/@libdir@
++MANDIR		= $(DESTDIR)/@mandir@
++INCLUDEDIR	= $(DESTDIR)/@includedir@
+ 
+ @SET_MAKE@
+ 
+@@ -77,10 +77,8 @@
+ 		$(INSTALL_PROGRAM) -d $(BINDIR) $(LIBDIR) $(MAN1DIR) $(MAN3DIR) $(INCLUDEDIR)
+ 		$(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(EXECUTABLE) 
+ 		-chmod 0755 $(EXECUTABLE)
+-		-strip $(EXECUTABLE)
+ 		$(INSTALL_PROGRAM) $(srcdir)/$(UNNAMEEXE) $(UNEXECUTABLE)
+ 		-chmod 0755 $(UNEXECUTABLE)
+-		-strip $(UNEXECUTABLE)
+ 		$(INSTALL_DATA) $(srcdir)/$(NAME).1 $(MAN1DIR)/$(NAME).1
+ 		cd $(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1
+ 		$(INSTALL_DATA) $(srcdir)/$(NAME).3 $(MAN3DIR)/$(NAME).3
-- 
cgit v1.2.3