gentoo resync : 02.08.2019

1 files changed, 36 insertions, 5 deletions

diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 9361c44b1797..72387056e698 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools eutils multilib user python-single-r1
 
@@ -25,7 +25,7 @@ else
 	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}/${PN}-${COMMIT}"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86"
 fi
 
 DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
@@ -91,6 +91,7 @@ src_configure() {
 		$(use_enable lm_sensors lmsensors) \
 		$(use_enable mousejack libusb) \
 		$(use_enable networkmanager libnm) \
+		--sysconfdir=/etc/kismet \
 		--disable-optimization
 }
 
@@ -103,8 +104,8 @@ src_install() {
 
 	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
 	dodoc CHANGELOG README*
-	newinitd "${FILESDIR}"/${PN}.initd-r1 kismet
-	newconfd "${FILESDIR}"/${PN}.confd-r1 kismet
+	newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
+	newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
 }
 
 pkg_preinst() {
@@ -128,3 +129,33 @@ pkg_preinst() {
 		ewarn "your user to the kismet group."
 	fi
 }
+
+migrate_config() {
+	einfo "Kismet Configuration files are now read from /etc/kismet/"
+	if [ -n "$(ls ${EROOT}/etc/kismet_*.conf)" ]; then
+		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
+		ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
+	fi
+	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+		mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
+		ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
+	elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+		ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
+		ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${REPLACING_VERSIONS}" ]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test ${v} -lt 2019.07.2 ; then
+				migrate_config
+				break
+			fi
+			if ver_test ${v} -eq 9999 ; then
+				migrate_config
+				break
+			fi
+		done
+	fi
+}