gentoo new year resync : 01.01.2021

4 files changed, 50 insertions, 30 deletions

diff --git a/net-misc/astmanproxy/Manifest b/net-misc/astmanproxy/Manifest
index 12508c2624fa..43015b66d3f1 100644
--- a/net-misc/astmanproxy/Manifest
+++ b/net-misc/astmanproxy/Manifest
@@ -1,5 +1,6 @@
-AUX astmanproxy-1.28.2-gentoo.diff 1130 BLAKE2B 5538bb8515b1d2fab2580ba91905b5db8e9a2675fdfa31289edd0a87a517bb29d5df9ef10640cffeb3f77383c00c4930b78d6a81aba8bf63680ac0487141322c SHA512 296d885478cc66868a7e77d5edaefe1779b5939e3ad26933c21a6e4f44744de00ff0d6d8302948b63f7b924b6cf90c9e790fc5d7d74fdc9df4a6ed3ab5a1b44a
+AUX astmanproxy-1.28.2-fno-common.patch 247 BLAKE2B 516618338aee167143fe764a732668a4403b04cc729174c2120269e242c8d24bab1a6caceec95d53c53d99b7c4047bb3abc345f23d3c1677cba17306abde3636 SHA512 6f1b45bfa53f68872d405b0b3389a7da8163725d78ceb67ebfa004a3fc712a651dd3b00e6b4b645c8704d7e8f36cfcf862397e67a5345a6f212821a6535dc3ac
+AUX astmanproxy-1.28.2-gentoo.diff 1322 BLAKE2B d625d0068ac8436aa868171ee3bf59115512ddf8a913cdf005c1c9752ada3eb2b62e4f81fa8a041f662c82f575d5f77c909688aa8531f600db3ef41655cbb099 SHA512 3cc827c06ec7a253828b359f8bc42ce3d0d68b74353094d5a29be759fad0692c838db4810f029137f764fac9eca14344c4d98502bced3f38b7fd0a27e30d5cd0
 AUX astmanproxy.rc6 366 BLAKE2B ea8105b396342b1993c95851073dce4dcd0d7bb9d4538eddd36bd859ad8435de3bfed37c549f6bee7a86579951c55b00c95c611e178ce9a47550dd1d593e7adc SHA512 ad9f5a180ce5f2a63efd1a9f050d963ff2504c306e177562821ab80a62daad50d2a0077a4078094991d5fa85129708cf6970ad60adacf06989980fc46012559e
 DIST astmanproxy-1.28.2.tar.gz 65506 BLAKE2B b3aa3ca00f376d1030d96b4498880e55741a3e33bbd72b74e2ac52f9186c93bfb8f1c9d540ca51b122600e6ec519144184ef19e6e04f34a977a617b1c4c73052 SHA512 a37caaca42649b19d40b9b0cfe61c6a0e31d7d0de50378565a6add1b27ba09dd6044c7ac2d9b38c424f143fc12acbfa0931c59492399ee34db063ed73cce9293
-EBUILD astmanproxy-1.28.2.ebuild 981 BLAKE2B eb414be341aaf4bda4cfd5e612849199cd3e4d6e46089e04117549282b5a80dc5cab539ea17b48bf3178f93aeb9d01ccd9ee1cfea66a5cea8ddb14b8bf22a06f SHA512 985eba0d02da590cbe2a87c73b13f3abef7bceb108dad1a66a0fbca0282a132939300396f22feb80c3642c9eddb0f7de0e8d0ea6a7c58c46a38458a795d735f6
+EBUILD astmanproxy-1.28.2.ebuild 829 BLAKE2B ccf60dd4309900fbb11690fc1a9558a34017d4fa36ef521996511eb036cc3774a4922cbe7aa4fe619568eea6bbd82439c685a5b3a7f1af33cb7fbc3903699ce8 SHA512 f4b9b75851f5bd93b8125d656c46fe8f89b2810edda2a2deebfa99a5b5a522765ab92642ce2cc1df7d3390cd4cc1b68b43b9ea69a7ab874b84a76c02e492d58f
 MISC metadata.xml 305 BLAKE2B 4899629a0c66f4bfe08da5a38cac88a4d18f125facfd7ae70a7cf5e0d35250466545b7c1fe17c17355f78f502b361e9bc10e5290307d349354146c27f327216f SHA512 857608df82b978c77856f5d779f1a2e7756ba7b9d7d37a57c2c5b2618e5d99d6b648cf485b51ec3782d056c83a206e32c9b6e25ecb011b7a948ee056c50b2a76
diff --git a/net-misc/astmanproxy/astmanproxy-1.28.2.ebuild b/net-misc/astmanproxy/astmanproxy-1.28.2.ebuild
index 2fb64067a9ab..b1999a399500 100644
--- a/net-misc/astmanproxy/astmanproxy-1.28.2.ebuild
+++ b/net-misc/astmanproxy/astmanproxy-1.28.2.ebuild
@@ -1,49 +1,43 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit base flag-o-matic multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Proxy for the Asterisk manager interface"
 HOMEPAGE="https://github.com/davies147/astmanproxy/"
 SRC_URI="https://github.com/davies147/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-IUSE=""
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND=""
-PATCHES=( "${FILESDIR}/${P}-gentoo.diff" )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.diff
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
-	base_src_prepare
+	default
 
 	# Fix multilib
-	sed -i -e "s#/usr/lib/#/usr/$(get_libdir)/#" "${S}/Makefile" \
+	sed -i -e "s#/usr/lib/#/usr/$(get_libdir)/#" Makefile \
 		|| die "multilib sed failed"
 }
 
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		LDFLAGS="${LDFLAGS}" \
-		LD="$(tc-getLD)" \
-		RAWLDFLAGS="$(raw-ldflags)"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	dosbin astmanproxy
 
+	dodoc -r samples
 	dodoc README VERSIONS
 
-	docinto samples
-	dodoc samples/*
-
 	insinto /etc/asterisk
-	doins configs/astmanproxy.conf
-	doins configs/astmanproxy.users
+	doins configs/astmanproxy.{conf,users}
 
 	newinitd "${FILESDIR}"/astmanproxy.rc6 astmanproxy
 }
diff --git a/net-misc/astmanproxy/files/astmanproxy-1.28.2-fno-common.patch b/net-misc/astmanproxy/files/astmanproxy-1.28.2-fno-common.patch
new file mode 100644
index 000000000000..a7fb09687702
--- /dev/null
+++ b/net-misc/astmanproxy/files/astmanproxy-1.28.2-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/include/astmanproxy.h
++++ b/src/include/astmanproxy.h
+@@ -154,7 +154,7 @@ struct message {
+ 	struct mansession *session;
+ };
+ 
+-struct proxyconfig pc;
++extern struct proxyconfig pc;
+ extern int debug;
+ 
+ /* Common Function Prototypes */
diff --git a/net-misc/astmanproxy/files/astmanproxy-1.28.2-gentoo.diff b/net-misc/astmanproxy/files/astmanproxy-1.28.2-gentoo.diff
index 68534cd61086..c6696fedf4a1 100644
--- a/net-misc/astmanproxy/files/astmanproxy-1.28.2-gentoo.diff
+++ b/net-misc/astmanproxy/files/astmanproxy-1.28.2-gentoo.diff
@@ -1,21 +1,23 @@
-diff -uNr astmanproxy-1.28.2.ORIG/Makefile astmanproxy-1.28.2/Makefile
---- astmanproxy-1.28.2.ORIG/Makefile	2014-02-10 11:18:06.027132570 +0000
-+++ astmanproxy-1.28.2/Makefile	2014-02-10 11:21:07.382135291 +0000
-@@ -17,7 +17,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -15,9 +15,8 @@
+ CONFFILE := astmanproxy.conf
+ PERMFILE := astmanproxy.users
  
- CC := gcc
+-CC := gcc
  INCLUDES :=
 -PREFIX:= /usr/local
 +PREFIX:= /usr
  BINDIR := $(DESTDIR)$(PREFIX)/sbin
  
  # For compilation dependencies
-@@ -27,7 +27,7 @@
+@@ -27,7 +26,8 @@
  LIBS := -lssl
  
  # Add -g below for debug/GDB symbols
 -CFLAGS:=-Wall -O2 -D_REENTRANT -D_GNU_SOURCE -fPIC -Isrc/include -I/usr/include/openssl
-+CFLAGS += -Wall -O2 -D_REENTRANT -D_GNU_SOURCE -fPIC -Isrc/include -I/usr/include/openssl
++CFLAGS += -Wall -fPIC
++CPPFLAGS += -D_REENTRANT -D_GNU_SOURCE -Isrc/include -I/usr/include/openssl
  
  ifeq (${OSARCH},Darwin)  
    LIBS+=-lresolv
@@ -28,7 +30,7 @@ diff -uNr astmanproxy-1.28.2.ORIG/Makefile astmanproxy-1.28.2/Makefile
  
  CFLAGS += $(DEFINES)
  
-@@ -76,7 +76,7 @@
+@@ -76,16 +76,16 @@
  SRCS := $(MODS:%=src/%.c)
  HDRS := src/include/astmanproxy.h
  
@@ -36,4 +38,16 @@ diff -uNr astmanproxy-1.28.2.ORIG/Makefile astmanproxy-1.28.2/Makefile
 +all: astmanproxy
  
  astmanproxy: $(OBJS) $(SOBJS)
- 	$(CC) $(CFLAGS) -o $@ $(ASTLINK) $(OBJS) $(LIBS)
+-	$(CC) $(CFLAGS) -o $@ $(ASTLINK) $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASTLINK) $(OBJS) $(LIBS)
+ 
+ $(OBJS): %.o: %.c
+-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c -o $@ $<
+ 
+ $(SOBJS): %.so: %.o
+-	$(CC) $(SOLINK) $< -o $@
++	$(CC) $(LDFLAGS) $(SOLINK) $< -o $@
+ 
+ SERIAL=`date "+%Y%m%d%H%M%S"`
+