From 9c5cef11f89018c18d3f78657864434f3f232744 Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi@gentoo.org>
Date: Sun, 3 May 2020 22:14:32 +0200
Subject: sys-apps/ifplugd: rev bump

- Bump to EAPI 7

- Fix building against GCC 10

Thanks-to: Jeroen Roovers <jer@gentoo.org>
Closes: https://bugs.gentoo.org/706746
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
 .../files/ifplugd-0.28-gcc10-compatibility.patch   | 13 ++++++
 sys-apps/ifplugd/ifplugd-0.28-r10.ebuild           | 48 ---------------------
 sys-apps/ifplugd/ifplugd-0.28-r11.ebuild           | 50 ++++++++++++++++++++++
 3 files changed, 63 insertions(+), 48 deletions(-)
 create mode 100644 sys-apps/ifplugd/files/ifplugd-0.28-gcc10-compatibility.patch
 delete mode 100644 sys-apps/ifplugd/ifplugd-0.28-r10.ebuild
 create mode 100644 sys-apps/ifplugd/ifplugd-0.28-r11.ebuild

(limited to 'sys-apps/ifplugd')

diff --git a/sys-apps/ifplugd/files/ifplugd-0.28-gcc10-compatibility.patch b/sys-apps/ifplugd/files/ifplugd-0.28-gcc10-compatibility.patch
new file mode 100644
index 000000000000..c87419e5a545
--- /dev/null
+++ b/sys-apps/ifplugd/files/ifplugd-0.28-gcc10-compatibility.patch
@@ -0,0 +1,13 @@
+--- a/./src/interface.h
++++ b/./src/interface.h
+@@ -21,8 +21,8 @@
+  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+  */
+ 
+-int interface_auto_up;
+-int interface_do_message;
++extern int interface_auto_up;
++extern int interface_do_message;
+ 
+ typedef enum { IFSTATUS_UP, IFSTATUS_DOWN, IFSTATUS_ERR } interface_status_t;
+ 
diff --git a/sys-apps/ifplugd/ifplugd-0.28-r10.ebuild b/sys-apps/ifplugd/ifplugd-0.28-r10.ebuild
deleted file mode 100644
index 9854033e3258..000000000000
--- a/sys-apps/ifplugd/ifplugd-0.28-r10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
-HOMEPAGE="http://0pointer.de/lennart/projects/ifplugd/"
-SRC_URI="http://0pointer.de/lennart/projects/ifplugd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc x86"
-IUSE="doc selinux"
-
-DEPEND="virtual/pkgconfig
-	doc? ( www-client/lynx )
-	>=dev-libs/libdaemon-0.5"
-RDEPEND=">=dev-libs/libdaemon-0.5
-	>=sys-apps/baselayout-1.12
-	selinux? ( sec-policy/selinux-ifplugd )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-nlapi.diff"
-	"${FILESDIR}/${P}-interface.patch"
-	"${FILESDIR}/${P}-strictalias.patch"
-	"${FILESDIR}/${P}-noip.patch"
-	"${FILESDIR}/${P}-musl.patch"
-	)
-DOCS=( doc/README doc/SUPPORTED_DRIVERS )
-HTML_DOCS=( doc/README.html doc/style.css )
-
-src_configure() {
-	econf \
-		$(use_enable doc lynx) \
-		--with-initdir=/etc/init.d \
-		--disable-xmltoman \
-		--disable-subversion
-}
-
-src_install() {
-	default
-
-	# Remove init.d configuration as we no longer use it
-	rm -rf "${ED}/etc/ifplugd" "${ED}/etc/init.d/${PN}" || die
-
-	exeinto "/etc/${PN}"
-	newexe "${FILESDIR}/${PN}.action" "${PN}.action"
-}
diff --git a/sys-apps/ifplugd/ifplugd-0.28-r11.ebuild b/sys-apps/ifplugd/ifplugd-0.28-r11.ebuild
new file mode 100644
index 000000000000..560ccc4ef8f4
--- /dev/null
+++ b/sys-apps/ifplugd/ifplugd-0.28-r11.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
+HOMEPAGE="http://0pointer.de/lennart/projects/ifplugd/"
+SRC_URI="http://0pointer.de/lennart/projects/ifplugd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc x86"
+IUSE="doc selinux"
+
+DEPEND="virtual/pkgconfig
+	doc? ( www-client/lynx )
+	>=dev-libs/libdaemon-0.5"
+RDEPEND=">=dev-libs/libdaemon-0.5
+	>=sys-apps/baselayout-1.12
+	selinux? ( sec-policy/selinux-ifplugd )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-nlapi.diff"
+	"${FILESDIR}/${P}-interface.patch"
+	"${FILESDIR}/${P}-strictalias.patch"
+	"${FILESDIR}/${P}-noip.patch"
+	"${FILESDIR}/${P}-musl.patch"
+	"${FILESDIR}/${P}-gcc10-compatibility.patch"
+)
+
+DOCS=( doc/README doc/SUPPORTED_DRIVERS )
+HTML_DOCS=( doc/README.html doc/style.css )
+
+src_configure() {
+	econf \
+		$(use_enable doc lynx) \
+		--with-initdir=/etc/init.d \
+		--disable-xmltoman \
+		--disable-subversion
+}
+
+src_install() {
+	default
+
+	# Remove init.d configuration as we no longer use it
+	rm -rf "${ED}/etc/ifplugd" "${ED}/etc/init.d/${PN}" || die
+
+	exeinto "/etc/${PN}"
+	newexe "${FILESDIR}/${PN}.action" "${PN}.action"
+}
-- 
cgit v1.2.3-65-gdbad