From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- net-misc/olsrd/Manifest | 5 -- net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch | 21 ----- net-misc/olsrd/olsrd-0.9.6.1.ebuild | 104 ------------------------- net-misc/olsrd/olsrd-0.9.8.ebuild | 117 ---------------------------- 4 files changed, 247 deletions(-) delete mode 100644 net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch delete mode 100644 net-misc/olsrd/olsrd-0.9.6.1.ebuild delete mode 100644 net-misc/olsrd/olsrd-0.9.8.ebuild (limited to 'net-misc/olsrd') diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest index 5946e44a8f46..744f352ff542 100644 --- a/net-misc/olsrd/Manifest +++ b/net-misc/olsrd/Manifest @@ -1,10 +1,5 @@ AUX olsrd 491 BLAKE2B 31844255d3aac5d427ab821a7655201ede53a3ab57ac8da3562e9db473d786c1e9acccf3512ba437d203798114ea1e9eb1fa79f4e5c6eca977b7b1357c2e668e SHA512 26329da5360bd25dacea3fde8c025f0bc34203970d2e75b47157fc0c4a3873cf6e7faa93c0a5a51bf20618846135ab18a09b6157521c3199c0667f969d491c4d AUX olsrd-0.9.0.2-gtk.patch 926 BLAKE2B af444d476ed31190454fc89bd6802a6c41f33625eb05e62338efce126fe06e7c59f021848ba12247d35196864496cab3ac9414bdd9cddda54ea6fb5deb2360e2 SHA512 191bb1cb0da122a9b44a9297e78998f9b1ecc70948dd9ee216b5d4fb56b41072c53249b39a6c0584366c7518ee2d4b161833be2e5289d707693dd0d87f2e6791 -AUX olsrd-0.9.6-gpsd.patch 537 BLAKE2B 841d0d92106a620aec47d781cf0a79e669e4aa3e6ba304c023a98c7776fc1df53e6bee5c080deb784106b05273a702d093617c9dc33bfa427a6f3b20c444234e SHA512 d3f89ead360acb8d1c26884ec7559c21dd1b7fbc40eb17d7d3fc2313e17d4f160b507d4b6271ed458d7b74fc7a7f1d9482fcb953d2762734fc963a1fb0e94f88 -DIST olsrd-0.9.6.1.tar.bz2 908871 BLAKE2B 180a30039607fd5c16676c62d0d1045bc5ce2a13675b34ca192f1f19127facb12428f6ba631e45fc42b191693a6ef987271745d769a74062ce682e1796b83dc9 SHA512 06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a -DIST olsrd-0.9.8.tar.gz 14416300 BLAKE2B 67477d9359686cb163221f5f354f330b38811e9e77bd71379e359bbfba2b55e917009ac537b845420a5bb73284ac83e0b91495e011c810f8169e4edb6bea940f SHA512 cf3066310c4ea644ba1f482e847aa073ad006000308bfa993cecda4ccf4e9919a9005680b3c1d98e34f0c13818213f208e8dc93c8b060eeaaac160fc3df4ce8c DIST olsrd-0.9.8_p20210612.tar.gz 14446761 BLAKE2B ef841fcf81ae25acb3c47d70f15e34c614b17c28688e0f718aa45ebabea68844f825a4187bbf5468daa4763c8a2b8c87f5f5a502ce0c5fde1b940f9aa3c6ca5e SHA512 466b762ea1f9ecc4ded3298700d1786b893d87fbcc2e457c75f5adfaaf543e6cea5ab2e63d34814a7c2f65cab895fb19c4cb5a7ec5347b13d0e18703a641126e -EBUILD olsrd-0.9.6.1.ebuild 2243 BLAKE2B c8c1227e9cb3c445c59c37bc88f567fe0d6f931fa02c3972c9eb0288eec57eb797877d411706c01ac7782ceee55f7b8143186af0d1fff028712e668b18b39e05 SHA512 f28e2701e44d7e6b6e9a5ab1044d337a1c9a456d6c35e85986e7fec9a2df9143d2a18b27c7f3a275d42cbcb78ad6a0894c212f42415bf3b041009e2f0792ec48 -EBUILD olsrd-0.9.8.ebuild 2411 BLAKE2B 0cda86cfb22e55060a58fc5e73e73997c4db95525eb12bcc12df80587f8c5d61b74bd32c51f2869a8aaa28f9b60e96441775bf40c5b2e13343df92bd74b9af59 SHA512 3d4cfb163509c3d2c71f51c5cf6bb2a9d11af4663856e6e5193233708747c35928d82aa03b89cfdaf299b7cc1b3858994b555bf6f1a85002bc119ac2583fb04e EBUILD olsrd-0.9.8_p20210612.ebuild 2655 BLAKE2B 46420f18ff26eb00d8b29f18a71a8d21e12ff6d5bf6b50da4a1e17c4b2a91d74dff7ad9400f77d4367c855395163d65a0dfcdd01048eea737ba99ec33e06bb08 SHA512 086b206676f785066746108cdc713f72e2eb9e7c783f1abb38433589b7c34a82baa9d5d911f2c158b9d24d5ea1b230292ec5551ed684244c0605c7db61da6e31 MISC metadata.xml 244 BLAKE2B c96f92863f59c5672e9fd06a833d19ac4884039c1a6b4550b167f4e228b663963c2f98534e9865cd039561345d1097edb52b4c5614417b46accc48c2acbab668 SHA512 c044670830d2077e8075125980c7502a96fc956fcdb24ac01d390afebe4780cf6b7f79b4a8749e57ae436fc5e8f7af976c02765ab5f6575de01a5f0881008c4c diff --git a/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch b/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch deleted file mode 100644 index a70115f1675c..000000000000 --- a/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/lib/pud/src/gpsdclient.c -+++ b/lib/pud/src/gpsdclient.c -@@ -343,7 +343,6 @@ - | POLICY_SET // - #ifdef GPSD_JESSIE - | TIMEDRIFT_SET // -- | EOF_SET // - #endif - #ifdef GPSD_NEW - | TOFF_SET // ---- a/lib/pud/Makefile -+++ b/lib/pud/Makefile -@@ -108,7 +108,7 @@ - - default_target: nmealib library $(PLUGIN_FULLNAME) - --$(PLUGIN_FULLNAME): $(OBJS) version-script.txt -+$(PLUGIN_FULLNAME): nmealib library $(OBJS) version-script.txt - ifeq ($(PUD_NMEALIB_STATICALLY_LINKED),) - ifeq ($(VERBOSE),0) - endif diff --git a/net-misc/olsrd/olsrd-0.9.6.1.ebuild b/net-misc/olsrd/olsrd-0.9.6.1.ebuild deleted file mode 100644 index 8e8f409db132..000000000000 --- a/net-misc/olsrd/olsrd-0.9.6.1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs versionator - -DESCRIPTION="An implementation of the Optimized Link State Routing protocol" -HOMEPAGE="http://www.olsr.org/" -SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${P}.tar.bz2" - -LICENSE="BSD LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gtk pud" - -DEPEND=" - virtual/pkgconfig - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - pud? ( sci-geosciences/gpsd ) -" -RDEPEND=" - ${DEPEND} -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch - "${FILESDIR}"/${PN}-0.9.6-gpsd.patch -) - -src_prepare() { - default - - # fix parallel make - # respect AR - # verbose build - # fix default prefix, bug #453440 - sed -i \ - -e '/@echo "\[/d' \ - -e 's|$(MAKECMD)|$(MAKE)|g' \ - -e 's|@$(CC)|$(CC)|g' \ - -e 's|@ar |$(AR) |g' \ - -e '/^prefix/s:/usr/local:/usr:' \ - $( find . -name 'Makefile*' ) || die - - # respect LDFLAGS - sed -i \ - -e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \ - lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die -} - -src_configure() { - if ! use pud; then - sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die - fi -} - -src_compile() { - tc-export PKG_CONFIG - emake \ - CC="$(tc-getCC)" \ - VERBOSE=1 \ - LIBDIR="/usr/$(get_libdir)/${PN}" \ - OLSRD_LDFLAGS="${LDFLAGS}" \ - OS=linux \ - build_all - - if use gtk; then - emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)" - fi -} - -src_install() { - emake OS=linux LIBDIR="${D}/usr/$(get_libdir)/${PN}" \ - DESTDIR="${D}" STRIP=true install_all - - if use gtk; then - emake -C gui/linux-gtk \ - LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}" install - fi - - doinitd "${FILESDIR}/${PN}" - - dodoc CHANGELOG \ - valgrind-howto.txt files/olsrd.conf.default.rfc \ - files/olsrd.conf.default.lq \ - lib/arprefresh/README_ARPREFRESH \ - lib/bmf/README_BMF \ - lib/dot_draw/README_DOT_DRAW \ - lib/dyn_gw/README_DYN_GW \ - lib/dyn_gw_plain/README_DYN_GW_PLAIN \ - lib/httpinfo/README_HTTPINFO \ - lib/mini/README_MINI \ - lib/nameservice/README_NAMESERVICE \ - lib/pgraph/README_PGRAPH \ - lib/quagga/README_QUAGGA \ - lib/secure/README_SECURE \ - lib/txtinfo/README_TXTINFO \ - lib/watchdog/README_WATCHDOG -} diff --git a/net-misc/olsrd/olsrd-0.9.8.ebuild b/net-misc/olsrd/olsrd-0.9.8.ebuild deleted file mode 100644 index bede675037e3..000000000000 --- a/net-misc/olsrd/olsrd-0.9.8.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="An implementation of the Optimized Link State Routing protocol" -HOMEPAGE="http://www.olsr.org/" -SRC_URI="https://github.com/OLSR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk pud" - -DEPEND=" - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - pud? ( sci-geosciences/gpsd ) -" -RDEPEND=" - ${DEPEND} -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch - "${FILESDIR}"/${PN}-0.9.6-gpsd.patch -) - -src_prepare() { - default - - # fix parallel make - # respect AR - # verbose build - # fix default prefix, bug #453440 - sed -i \ - -e '/@echo "\[/d' \ - -e 's|$(MAKECMD)|$(MAKE)|g' \ - -e 's|@$(CC)|$(CC)|g' \ - -e 's|@ar |$(AR) |g' \ - -e '/^prefix/s:/usr/local:/usr:' \ - $( find -name 'Makefile*' ) || die - - # respect LDFLAGS - sed -i \ - -e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \ - lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die -} - -src_configure() { - if ! use pud; then - sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die - fi -} - -src_compile() { - tc-export PKG_CONFIG - - emake \ - CC="$(tc-getCC)" \ - LIBDIR="/usr/$(get_libdir)/${PN}" \ - OLSRD_LDFLAGS="${LDFLAGS}" \ - OS=linux \ - VERBOSE=1 \ - build_all - - if use gtk; then - emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)" - fi -} - -src_install() { - emake \ - DESTDIR="${D}" \ - DOCDIR_OLSRD="${D}/usr/share/doc/${PF}" \ - LIBDIR="${D}/usr/$(get_libdir)/${PN}" \ - OS=linux \ - STRIP=true \ - install_all - - if use gtk; then - emake -C gui/linux-gtk \ - DESTDIR="${D}" \ - LIBDIR="${D}/usr/$(get_libdir)/${PN}" \ - install - fi - - doinitd "${FILESDIR}"/${PN} - - gzip -d \ - "${ED}"/usr/share/man/man5/olsrd.conf.5.gz \ - "${ED}"/usr/share/man/man8/olsrd.8.gz \ - || die - - dodoc CHANGELOG \ - valgrind-howto.txt files/olsrd.conf.default.rfc \ - files/olsrd.conf.default.lq \ - lib/arprefresh/README_ARPREFRESH \ - lib/bmf/README_BMF \ - lib/dot_draw/README_DOT_DRAW \ - lib/dyn_gw/README_DYN_GW \ - lib/dyn_gw_plain/README_DYN_GW_PLAIN \ - lib/httpinfo/README_HTTPINFO \ - lib/mini/README_MINI \ - lib/nameservice/README_NAMESERVICE \ - lib/pgraph/README_PGRAPH \ - lib/quagga/README_QUAGGA \ - lib/secure/README_SECURE \ - lib/txtinfo/README_TXTINFO \ - lib/watchdog/README_WATCHDOG -} -- cgit v1.2.3