[patch] Switch sci-geosciences/gpsd to EAPI=7

gpsd-9999-eapi7.patch (text/plain), 2.09 KB, created by Michael Weiser on 2020-01-02 16:36:26 UTC

--- /usr/portage/sci-geosciences/gpsd/gpsd-9999.ebuild	2019-10-04 21:39:38.000000000 +0200
+++ gpsd-9999.ebuild	2020-01-02 17:30:44.120693334 +0100
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
@@ -84,10 +84,10 @@
 		die "please sync ebuild & source"
 	fi
 
-	epatch "${FILESDIR}"/${PN}-3.19-do_not_rm_library.patch
+	eapply "${FILESDIR}"/${PN}-3.19-do_not_rm_library.patch
 	# Merged upstream
-	#epatch "${FILESDIR}"/${P}-scons-print.patch
-	#epatch "${FILESDIR}"/${P}-scons-py3.patch
+	#eapply "${FILESDIR}"/${P}-scons-print.patch
+	#eapply "${FILESDIR}"/${P}-scons-py3.patch
 
 	# Avoid useless -L paths to the install dir
 	sed -i \
@@ -136,20 +136,20 @@
 		nostrip=True
 		manbuild=False
 		shared=$(usex !static True False)
-		$(use_scons bluetooth bluez)
-		$(use_scons cxx libgpsmm)
-		$(use_scons debug clientdebug)
-		$(use_scons dbus dbus_export)
-		$(use_scons ipv6)
-		$(use_scons latency-timing timing)
-		$(use_scons ncurses)
-		$(use_scons ntp ntpshm)
-		$(use_scons ntp pps)
-		$(use_scons python)
-		$(use_scons qt5 qt)
-		$(use_scons shm shm_export)
-		$(use_scons sockets socket_export)
-		$(use_scons usb)
+		$(usex bluetooth bluez=1 bluez=0)
+		$(usex cxx libgpsmm=1 libgpsmm=0)
+		$(usex debug clientdebug=1 clientdebug=0)
+		$(usex dbus dbus_export=1 dbus_export=0)
+		$(usex ipv6 ipv6=1 ipv6=1)
+		$(usex latency-timing timing=1 timing=0)
+		$(usex ncurses ncurses=1 ncurses=0)
+		$(usex ntp ntpshm=1 ntpshm=0)
+		$(usex ntp pps=1 pps=0)
+		$(usex python python=1 python=0)
+		$(usex qt5 qt=1 qt=0)
+		$(usex shm shm_export=1 shm_export=0)
+		$(usex sockets socket_export=1 socket_export=0)
+		$(usex usb usb=1 usb=0)
 	)
 
 	use X && myesconsargs+=( xgps=1 xgpsspeed=1 )
@@ -158,7 +158,7 @@
 	# enable specified protocols
 	local protocol
 	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
+		myesconsargs+=( $(usex gpsd_protocols_${protocol} ${protocol}=1 ${protocol}=0) )
 	done
 }