gentoo resync : 04.01.2018

4 files changed, 47 insertions, 23 deletions

diff --git a/net-misc/openr2/Manifest b/net-misc/openr2/Manifest
index 75a8b1f68900..618bc4d83816 100644
--- a/net-misc/openr2/Manifest
+++ b/net-misc/openr2/Manifest
@@ -1,4 +1,4 @@
-AUX 1.3.0-respect-user-cflags.patch 460 BLAKE2B a3eced9975c8d9bde331a05d2da8bef8577cbc83755fe102794b81733a83320798cc0abdefb70cfdd9f4824fde54c60bc542ffc7db017035c6db729aece514d7 SHA512 b644bb2ce9d789c6bb5c87914482203576165a0d0f59fb2b7c15662c5ff15c6a8e664bdbd1130bcfd1ef2244f8a55a4d5afacdccfde2e15b8b2a0219d65d564d
+AUX openr2-1.3.0-fix-build-system.patch 855 BLAKE2B 0712ab876e8941f63756531597a861e433e2e3a8f457fcf62c83e3d5f32d1f0f809c2fb34ce362533d7a4e1d434132c0df81ddb656e3223f7dab1381001215b4 SHA512 6f71b83d1ec8a07a32a019784954148adde44b2fdfc982ec9d02deeae66fc307448f6577d715276de4cdde42f771d647d625d3111a6189cf60ae8f6c5c6c2d2e
 DIST openr2-1.3.0.tar.gz 650048 BLAKE2B bff444c839d5f62fc889c1720cb9c17c38c5bd4b0dc3b3884c8fd00226aa6354281cf37c7a748fca4e16e633a94ac055c8f7b5e4bf69d97732846fdbc618ca47 SHA512 2cee4534eeebb91a2cf0f74c9fcd2a16db3966db01a4bae7e3406416546fdc1c5e20bb9172375f55e5dcc30cfcc2c8f7182ef7476253b4fcce9421f74b8d125e
-EBUILD openr2-1.3.0.ebuild 551 BLAKE2B 3a89c17c8c9fd28f73c6aa3b32dd268876181662c62f2f57331e2ebe85f34b32331b997255a2771196a4dcff5d483db1e5644db538339f8292c3346d0ad58bac SHA512 8108ee5d0c04d4951349b714d345ae3f9a94da14974fcf7e51d4437b5d0570847ea451f95a1623cc926a5465cc28e504b3cef95e28698e19a045ff396b0aa8db
+EBUILD openr2-1.3.0.ebuild 642 BLAKE2B d9b0c9535138d24f4d5ee61300489d61d6208c47c8830de35fb656455fccf88d68cb0c107fea3ba8d0d8c928086b419fc0745fefaa972c8105db1ad1a02f9dd5 SHA512 bf60eb9b6729382d7e7d9b64511ae0af3cd274ba9d90c7eaec5726a6d3954bc3c4f4034d0ec4f42dc448cdb7206421be728477da08b7a19f604c50a6e3e215df
 MISC metadata.xml 321 BLAKE2B 3dc8aa546d5d86ecf848c338ebe8e931681f5cc3879187206e8dbd41378542f55e12f577a5826f873eaf315dff7f89c3a45394a90d73cde2ac43a65e92156ae5 SHA512 9c0374655261ecff333a0e004ad2fe9e0ddb79b0064f45e4ed03121caae7acb136b5ca10d8e86d74cde50ed62695aabbf80b47d493570c328f9d46956e4c2305
diff --git a/net-misc/openr2/files/1.3.0-respect-user-cflags.patch b/net-misc/openr2/files/1.3.0-respect-user-cflags.patch
deleted file mode 100644
index 7a8f23f3f29c..000000000000
--- a/net-misc/openr2/files/1.3.0-respect-user-cflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -uNr openr2-1.3.0.ORIG//configure.in openr2-1.3.0/configure.in
---- openr2-1.3.0.ORIG//configure.in	2010-05-13 11:59:14.000000000 +0100
-+++ openr2-1.3.0/configure.in	2010-05-13 11:59:35.000000000 +0100
-@@ -25,11 +25,6 @@
- AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE
- 
--# let's default to compile with debugging information
--# most users will not even care about it
--CFLAGS='-ggdb3 -O0'
--CXXFLAGS='-ggdb3 -O0'
--
- AC_PROG_CC
- AC_PROG_LIBTOOL
- AC_LANG([C])
diff --git a/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch b/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch
new file mode 100644
index 000000000000..59918934d563
--- /dev/null
+++ b/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch
@@ -0,0 +1,30 @@
+--- a/configure.in
++++ b/configure.in
+@@ -25,11 +25,6 @@
+ AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE
+ 
+-# let's default to compile with debugging information
+-# most users will not even care about it
+-CFLAGS='-ggdb3 -O0'
+-CXXFLAGS='-ggdb3 -O0'
+-
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ AC_LANG([C])
+diff -ur ORIG/src/Makefile.am MOD/src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,10 +1,10 @@
+-AM_CFLAGS = -std=c99 -pedantic -Wall -Werror -Wwrite-strings -Wunused-variable -Wstrict-prototypes -Wmissing-prototypes 
++AM_CFLAGS = -std=c99 -pedantic -Werror -Wwrite-strings -Wunused-variable -Wstrict-prototypes -Wmissing-prototypes
+ if WANT_OR2_TRACE_STACKS
+ AM_CFLAGS += -DOR2_TRACE_STACKS
+ endif
+ 
+ if HAVE_SVNVERSION
+-AM_CFLAGS += -DREVISION=\"$(shell svnversion -n .)\"
++AM_CFLAGS += -DREVISION=\"0\"
+ endif
+ 
+ lib_LTLIBRARIES = libopenr2.la
diff --git a/net-misc/openr2/openr2-1.3.0.ebuild b/net-misc/openr2/openr2-1.3.0.ebuild
index d00d14389463..3e45c4921241 100644
--- a/net-misc/openr2/openr2-1.3.0.ebuild
+++ b/net-misc/openr2/openr2-1.3.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
-inherit autotools base
+EAPI=6
+
+inherit autotools
 
 DESCRIPTION="An open implementation of the MFC/R2 telephony signaling protocol"
 HOMEPAGE="http://libopenr2.org/"
@@ -14,13 +15,21 @@ KEYWORDS="~amd64"
 IUSE=""
 
 RDEPEND="net-misc/dahdi"
-PATCHES=( "${FILESDIR}/${PV}-respect-user-cflags.patch" )
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
 src_prepare() {
-	base_src_prepare
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
+	find "${D}" -name '*.la' -delete || die
 }