commit:     1d8732755a29efa19662b24b56fea99398071199
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 22:23:42 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 22:33:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d873275

sci-geosciences/gpsd: Clean old version up

 sci-geosciences/gpsd/Manifest                      |   1 -
 .../gpsd/files/gpsd-3.4-no-man-gen.patch           |  13 --
 sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch    |  17 --
 sci-geosciences/gpsd/gpsd-3.9-r1.ebuild            | 187 ---------------------
 4 files changed, 218 deletions(-)

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index d0afd60418..30c2e14007 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,3 +1,2 @@
 DIST gpsd-3.10.tar.gz 1566622 SHA256 
706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320 SHA512 
fd452185a8a9f9b8dfb2a5c2d5b6410f795d56dc46a7c216d8fcd686e43c5555a5f0421434060e9bb7afa465bb8a45a1e358108c4de42300eeb972caa334d8b6
 WHIRLPOOL 
52aa2285eff48f72a3e554c40bdb2b521bc36e35680a928d7ee53f3b55578d8451a573f4c75dcadc905eba7c48b41b5a317704aaf17b9699b614595560011514
 DIST gpsd-3.16.tar.gz 8587490 SHA256 
03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029 SHA512 
a8ad85a1f17d3ea550a4b99c262e47a834ed8fd16b00e10574f7cf5f34b6c506142aa77a870a61f8827c0d0c88fe7f65f6e916089d64e84c5667d4a2ca89c543
 WHIRLPOOL 
67d6db04593d6df62c64848965fd2c72d806003df9ad8a3623665ecf73a165e12c977d1d3988e46f7aec3c1cdee8bc026c515fd3be855b6da282def4e32498be
-DIST gpsd-3.9.tar.gz 1518775 SHA256 
d9b24be838b48db5e8eba66f74edf32d1982fe0fb018c9d9a7ad1ada9f189d5a SHA512 
082524a7744da5212074123ab7920fe77bfa35f99cb12a900ad7b2718ea563803f988d09d7a063d08784d790c8c7e65503daefce4e6dd6bd1bc77bf580db638f
 WHIRLPOOL 
1d3c70bfe5b4b8dec5dc4119287afb7ca4f426041f49c43b167b9e7f85c3995bfcb3bbf777cbe479ef353f1d485e54c891e732fd6871b6dbe9874d8d3c7fa6d1

diff --git a/sci-geosciences/gpsd/files/gpsd-3.4-no-man-gen.patch 
b/sci-geosciences/gpsd/files/gpsd-3.4-no-man-gen.patch
deleted file mode 100644
index 20a3b707a4..0000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.4-no-man-gen.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-the scons logic is dumb and will always regenerate the man pages.
-forcibly disable that as the releases contain the man pages.
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -575,6 +575,7 @@
-     manbuilder = "xmlto man $SOURCE; mv `basename $TARGET` $TARGET"
- else:
-     announce("Neither xsltproc nor xmlto found, documentation cannot be 
built.")
-+manbuilder = htmlbuilder = False
- if manbuilder:
-     env['BUILDERS']["Man"] = Builder(action=manbuilder)
-     env['BUILDERS']["HTML"] = Builder(action=htmlbuilder,

diff --git a/sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch 
b/sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch
deleted file mode 100644
index 5419cd31f6..0000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-don't set the -rpath/-L flags to the install dir as this breaks DESTDIR
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -268,11 +268,7 @@
-     return wrapped
- 
- # Honor the specified installation prefix in link paths.
--if not env["sysroot"]:
--    env.Prepend(LIBPATH=[installdir('libdir')])
--else:
--    env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir')])
--if env["shared"]:
-+if env["shared"] and env["chrpath"]:
-     env.Prepend(RPATH=[installdir('libdir')])
- 
- # Give deheader a way to set compiler flags

diff --git a/sci-geosciences/gpsd/gpsd-3.9-r1.ebuild 
b/sci-geosciences/gpsd/gpsd-3.9-r1.ebuild
deleted file mode 100644
index 0c4dc52f5c..0000000000
--- a/sci-geosciences/gpsd/gpsd-3.9-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_DEPEND="python? 2:2.6"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-SCONS_MIN_VERSION="1.2.1"
-
-inherit eutils udev user multilib distutils scons-utils systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
-       inherit git-2
-else
-       SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-       KEYWORDS="amd64 arm ppc ppc64 x86"
-fi
-
-DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping 
clients"
-HOMEPAGE="http://catb.org/gpsd/";
-
-LICENSE="BSD"
-SLOT="0"
-
-GPSD_PROTOCOLS=(
-       aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
-       geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip
-       oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt
-       tripmate tsip ubx
-)
-IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing 
ncurses ntp python qt4 +shm +sockets systemd test udev usb X"
-REQUIRED_USE="X? ( python )
-       gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )"
-
-RDEPEND="X? ( dev-python/pygtk:2 )
-       ncurses? ( sys-libs/ncurses )
-       bluetooth? ( net-wireless/bluez )
-       usb? ( virtual/libusb:1 )
-       dbus? (
-               sys-apps/dbus
-               dev-libs/dbus-glib
-       )
-       ntp? ( || ( net-misc/ntp net-misc/chrony ) )
-       systemd? ( sys-apps/systemd )
-       qt4? ( dev-qt/qtgui:4 )"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       test? ( sys-devel/bc )"
-
-# xml packages are for man page generation
-if [[ ${PV} == "9999" ]] ; then
-       DEPEND+="
-               app-text/xmlto
-               =app-text/docbook-xml-dtd-4.1*"
-fi
-
-pkg_setup() {
-       use python && python_pkg_setup
-}
-
-src_unpack() {
-       default
-
-       # 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
-       ) )
-       if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
-               eerror "Detected protocols: ${src_protocols}"
-               eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
-               die "please sync ebuild & source"
-       fi
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
-       epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
-       epatch "${FILESDIR}"/${PN}-3.7-rpath.patch
-
-       # Avoid useless -L paths to the install dir
-       sed -i \
-               -e '/^env.Prepend(LIBPATH=.installdir(.libdir.).)$/d' \
-               -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-               SConstruct || die
-
-       # Extract python info out of SConstruct so we can use saner distribute
-       if use python ; then
-               pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
-               local pybins=$(pyvar python_progs)
-               local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ 
*::;s:os[.]sep:"/":g;p}' SConstruct)
-               local packet=$(python -c "${pysrcs}; 
print(python_extensions['gps/packet'])")
-               local client=$(python -c "${pysrcs}; 
print(python_extensions['gps/clienthelpers'])")
-               sed \
-                       -e "s|@VERSION@|$(pyvar gpsd_version)|" \
-                       -e "s|@URL@|$(pyvar website)|" \
-                       -e "s|@EMAIL@|$(pyvar devmail)|" \
-                       -e "s|@SCRIPTS@|${pybins}|" \
-                       -e "s|@GPS_PACKET_SOURCES@|${packet}|" \
-                       -e "s|@GPS_CLIENT_SOURCES@|${client}|" \
-                       -e "s|@SCRIPTS@|$(pyvar python_progs)|" \
-                       "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-               distutils_src_prepare
-       fi
-}
-
-src_configure() {
-       myesconsargs=(
-               prefix="${EPREFIX}/usr"
-               libdir="\$prefix/$(get_libdir)"
-               udevdir="$(get_udevdir)"
-               chrpath=False
-               gpsd_user=gpsd
-               gpsd_group=uucp
-               strip=False
-               python=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 shm shm_export)
-               $(use_scons sockets socket_export)
-               $(use_scons systemd)
-               $(use_scons qt4 libQgpsmm)
-               $(use_scons usb)
-       )
-
-       # enable specified protocols
-       local protocol
-       for protocol in ${GPSD_PROTOCOLS[@]} ; do
-               myesconsargs+=( $(use_scons gpsd_protocols_${protocol} 
${protocol}) )
-       done
-}
-
-src_compile() {
-       export CHRPATH=
-       tc-export CC CXX PKG_CONFIG
-       export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-       escons
-
-       use python && distutils_src_compile
-}
-
-src_install() {
-       DESTDIR="${D}" escons install $(usex udev udev-install "")
-
-       newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
-       newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
-       if use systemd; then
-               systemd_dounit "${S}"/systemd/gpsd.service
-               systemd_dounit "${S}"/systemd/gpsd.socket
-       fi
-
-       if use python ; then
-               distutils_src_install
-               # Delete all X related packages if user doesn't want them
-               if ! use X ; then
-                       local p
-                       for p in $(grep -Il 'import .*pygtk' *) ; do
-                               find "${D}"/usr/bin -name "${p}*" -delete
-                       done
-               fi
-       fi
-}
-
-pkg_preinst() {
-       # Run the gpsd daemon as gpsd and group uucp; create it here
-       # as it doesn't seem to be needed during compile/install ...
-       enewuser gpsd -1 -1 -1 "uucp"
-}
-
-pkg_postinst() {
-       use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-       use python && distutils_pkg_postrm
-}

Reply via email to