gentoo auto-resync : 01:08:2022 - 03:14:32

4 files changed, 61 insertions, 16 deletions

diff --git a/app-misc/mepl/Manifest b/app-misc/mepl/Manifest
index 15df8f774ead..457d17482828 100644
--- a/app-misc/mepl/Manifest
+++ b/app-misc/mepl/Manifest
@@ -1,4 +1,5 @@
-AUX mepl-0.45-gcc433.patch 600 BLAKE2B 12835e147142dbd001bbbb6c8a642a549b6f08d0d85751909ece7eb38010b76506cdc1a38dd44ab2cf105bcc1af1a665df1af61ea502b4ba275b12bcd3f54e1d SHA512 847c3006e2afc2fd0bd5cd614b8893d8b3bd8ebb2ff39662e3f0e38945220609843d1e6d072d1ffc168192e04160a7da7c579e59d7467527f75e9395e9ff0f12
+AUX mepl-0.45-gcc433.patch 1072 BLAKE2B f0eb8c38648d27e93abe577e00bc4f0f75bcb7bb60425a1b955dc18f15526c6a6ec8a93ac68333d5ccbac124fdf9aecee9ffcee8683eaa444053a16cf90bc948 SHA512 3d61b9a1e2008ec54af9e44dc29da1be6012d01cd1644cd844316b93b8107cd8f05fa19d6043a1f8edad291c0f2696f4688bc82523053fdc8f6d0dcbfdf2772b
+AUX mepl-0.45-makefile.patch 563 BLAKE2B c19b12f06fd242e8877983d875198632fc1c0b865599b7a3f85c784f8bf4eb96c148b2c6604b54908dd0b41851a0576ff3b8e2d57b530ffaa1ca99abe1de7c13 SHA512 0b7d5bc35538aa00da09e2f8e31a41fd92e288c7ce0d38acd3dfc712236d89f8b1605c2b1dd04d5dfe580ef1ca06cb67bc4c1d5de5bfd5af6a1128b2c9d7bddc
 DIST mepl0.45.tar.gz 18968 BLAKE2B 15d5e426ea3984e8b6672e1512afcfb6b4e5678bfc473e1b21df7ba66da9596a0971a08114792720de6f779deb767846ad77a9545ee4734906679207a2c690f1 SHA512 679ac7548f6a4870164410db403d9fb8a18d7daa651a29d8e0dd87d8d3fdf1f9e8d381513ab922188951eba0798b1d32eadceafa117236ff54ef3e645d876c1e
-EBUILD mepl-0.45-r1.ebuild 701 BLAKE2B b19b056179fffb66034fd1220844505a1d4b364691e1594f0834184937658b19ae428b58034710a2c24952d3fdee0729a1f20a9362262b6ab6a28de10d995a34 SHA512 ab07d182efc4103b760f5ba26ddefccf4e038f38e3e1ac91f1143fdb3a12ed630a1ba5a541ddee00e32b3c9e145101b0aa9ded597c02ffa507e1e60b7cf56add
+EBUILD mepl-0.45-r2.ebuild 641 BLAKE2B e310423f8142cc624b848e57ec4268be9aed4fa7f4c4869a2bcc98f47e687957df076473ef290b3d4a0dbb6a8e7d5cd3d21fc2c59fbe050236e2d81618ce8d63 SHA512 9244f7e8c31171d19782f2e126e745b0dfa2dd9419f5e74563751040cd68802ad123f789cf560ce125d1e52269f54448bf0f425fa51bdbf27302925d80edf74a
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/mepl/files/mepl-0.45-gcc433.patch b/app-misc/mepl/files/mepl-0.45-gcc433.patch
index 0fd857a9ae30..baf26c03c4f4 100644
--- a/app-misc/mepl/files/mepl-0.45-gcc433.patch
+++ b/app-misc/mepl/files/mepl-0.45-gcc433.patch
@@ -1,11 +1,34 @@
---- a/mepl.c	2009-04-07 21:17:32.000000000 +0200
-+++ b/mepl.c	2009-04-07 21:16:48.000000000 +0200
+--- a/mepl.c
++++ b/mepl.c
 @@ -1,3 +1,4 @@
 +#include <stdlib.h>
  #define VERSION "0.45 Don Nov 25 19:13:58 CET 1999"
  /*  Version: @(#) mepl.c 0.45
-     Autor: Frank Holtz <frank@hof-berlin.de>--- mepl.c	2009-04-07 21:08:18.000000000 +0200
-@@ -347,7 +347,7 @@
+     Autor: Frank Holtz <frank@hof-berlin.de>
+@@ -18,11 +19,12 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ #include <fcntl.h>
+-// #include <signal.h> #If you have problems to compile remove the "//"
++#include <signal.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
++#include <sys/wait.h>
+ #include <termios.h>
+ #include <time.h>
+ #include <unistd.h>
+@@ -93,7 +95,7 @@
+ int hex(unsigned char *);
+ int fget(int);
+ 
+-main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+  int   i,z,j,k,error,errz,ic,resin,resout,n,pid,opt;
+  struct termios oldtio,newtio;
+@@ -346,7 +348,7 @@
   errz=0; 
   do {
   error=0;
diff --git a/app-misc/mepl/files/mepl-0.45-makefile.patch b/app-misc/mepl/files/mepl-0.45-makefile.patch
new file mode 100644
index 000000000000..cbd89103719a
--- /dev/null
+++ b/app-misc/mepl/files/mepl-0.45-makefile.patch
@@ -0,0 +1,19 @@
+--- a/Makefile
++++ b/Makefile
+@@ -13,14 +13,9 @@
+ initdir = /etc/rc.d/init.d
+ initdir2 = /etc/init.d
+ 
+-CC	= gcc
+-CFLAGS	= -DMEPLCONFIG=\"$(CONFIGFILE)\"
++CPPFLAGS += -DMEPLCONFIG=\"$(CONFIGFILE)\"
+ 
+-en:	mepl.c
+-	@echo "Type \"make de\" or \"make installde\" for german version."
+-	@echo "Taper \"make fr\" ou \"make installfr\" pour la version française."
+-	@echo "Scrivi \"make it\" or \"make installit\" per la versione italiana."
+-	$(CC) $(CFLAGS) -o mepl mepl.c 
++en:	mepl
+ 
+ de:	mepl.c
+ 	@echo "Type \"make en\" or \"make installen\" for english version."
diff --git a/app-misc/mepl/mepl-0.45-r1.ebuild b/app-misc/mepl/mepl-0.45-r2.ebuild
index 260918797539..7a9c8a94b754 100644
--- a/app-misc/mepl/mepl-0.45-r1.ebuild
+++ b/app-misc/mepl/mepl-0.45-r2.ebuild
@@ -1,29 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Self-employed-mode software for 3COM/USR message modems"
 HOMEPAGE="https://web.archive.org/web/20031204100644/http://www.hof-berlin.de:80/mepl/"
 SRC_URI="http://www.hof-berlin.de/mepl/mepl${PV}.tar.gz"
+S="${WORKDIR}/${PN}${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
-S="${WORKDIR}/${PN}${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-gcc433.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-gcc433.patch
+)
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -DMEPLCONFIG=\\\"/etc/mepl.conf\\\" ${LDFLAGS}" en
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin "${PN}" "${PN}mail"
+	dobin mepl meplmail
 	insinto /etc
-	doins "${PN}.conf"
-	newman "${PN}.en" "${PN}.7"
+	doins mepl.conf
+	newman mepl.en mepl.7
 }