[patch] proposed ebuild patch

file_777960.txt (text/plain), 4.03 KB, created by James Browning on 2021-06-01 20:32:59 UTC

--- /var/db/repos/gentoo/sci-geosciences/gpsd/gpsd-9999.ebuild  2021-06-01 12:39:45.000000000 -0000
+++ /var/db/repos/gentoo/sci-geosciences/gpsd/gpsd-9999.ebuild  2021-06-01 20:28:26.352859140 -0000
@@ -67,17 +67,16 @@
        virtual/pkgconfig
        test? ( sys-devel/bc )"
 
-# xml packages are for man page generation
+# asciidoctor is required for man page generation
 if [[ ${PV} == *9999* ]] ; then
        DEPEND+="
-               app-text/xmlto
-               =app-text/docbook-xml-dtd-4.1*"
+               dev-ruby/asciidoctor"
 fi
 
 src_prepare() {
        # Make sure our list matches the source.
        local src_protocols=$(echo $(
-               sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
+               sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort
        ) )
        if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
                eerror "Detected protocols: ${src_protocols}"
@@ -85,15 +84,6 @@
                die "please sync ebuild & source"
        fi
 
-       # Avoid useless -L paths to the install dir
-       sed -i \
-               -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-               SConstruct || die
-
-       #Fix systemd binary paths
-       sed -i -e 's/local\///' 'systemd/gpsd.service'
-       sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in'
-
        default
 
        use python && distutils-r1_src_prepare
@@ -102,8 +92,8 @@
 python_prepare_all() {
        python_setup
 
-       # Extract python info out of SConstruct so we can use saner distribute
-       pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConstruct ; }
+       # Extract python info out of SConscript so we can use saner distribute
+       pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConscript ; }
        local pyprogs=$(pyarray python_progs)
        local pybins=$("${PYTHON}" -c "${pyprogs}; \
                print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))" || die "Unable to list pybins")
@@ -114,17 +104,22 @@
        local pysrcs=$(pyarray packet_ffi_extension)
        local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types")
 
-       pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+       pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConscript ; }
        # Post 3.19 the clienthelpers were merged into gps.packet
        sed \
                -e "s|@VERSION@|$(pyvar gpsd_version)|" \
-               -e "s|@URL@|$(pyvar website)|" \
-               -e "s|@EMAIL@|$(pyvar devmail)|" \
+               -e "s|@DEVMAIL@|$(pyvar devmail)|" \
                -e "s|@SCRIPTS@|${pybins}|" \
                -e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-               -e "/@GPS_CLIENT_SOURCES@/d" \
                -e "s|@SCRIPTS@|${pybins}|" \
-               "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
+               -e "s|@DOWNLOAD@|$(pyvar download)|" \
+               -e "s|@IRCCHAN@|$(pyvar ircchan)|" \
+               -e "s|@ISSUES@|$(pyvar bugtracker)|" \
+               -e "s|@MAILMAN@|$(pyvar mailman)|" \
+               -e "s|@PROJECTPAGE@|$(pyvar projectpage)|" \
+               -e "s|@SUPPORT@|https://gpsd.io/SUPPORT.html|" \
+               "${S}"/packaging/gpsd-setup.py.in > setup.py || die
+               #-e "s|@WEBSITE@|$(pyvar website)|" \
        distutils-r1_python_prepare_all
 }
 
@@ -138,7 +133,6 @@
                gpsd_user=gpsd
                gpsd_group=dialout
                nostrip=True
-               manbuild=False
                shared=$(usex !static True False)
                bluez=$(usex bluetooth)
                libgpsmm=$(usex cxx)
@@ -159,6 +153,10 @@
                usb=$(usex usb)
        )
 
+       if [[ ${PV} != *9999* ]] ; then
+               myesconsargs+=( manbuild=False )
+       fi
+
        use X && scons_opts+=( xgps=1 xgpsspeed=1 )
        use qt5 && scons_opts+=( qt_versioned=5 )