commit: b58d61c1d8d88460d3ed844de0df8b3699dc11e7 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Sep 26 14:45:58 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Sep 26 14:49:18 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b58d61c1
net-misc/tokyotyrant: Remove last-rited pkg Closes: https://bugs.gentoo.org/681044 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-misc/tokyotyrant/Manifest | 1 - .../tokyotyrant/files/fix_makefiles-1.4.41.patch | 85 ----------------- net-misc/tokyotyrant/files/fix_testsuite.patch | 104 --------------------- net-misc/tokyotyrant/files/tokyotyrant.confd | 15 --- net-misc/tokyotyrant/files/tokyotyrant.initd | 38 -------- net-misc/tokyotyrant/metadata.xml | 8 -- net-misc/tokyotyrant/tokyotyrant-1.1.41-r2.ebuild | 64 ------------- profiles/package.mask | 7 -- 8 files changed, 322 deletions(-) diff --git a/net-misc/tokyotyrant/Manifest b/net-misc/tokyotyrant/Manifest deleted file mode 100644 index fce612ee0a6..00000000000 --- a/net-misc/tokyotyrant/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST tokyotyrant-1.1.41.tar.gz 196196 BLAKE2B adfeb14146a4078d01d75608c8deb206de60b956b73d7cab2d2b29b2daf9ef7be7c3ab932984460fc07858e836421932472eaef801d0d79f4e8dd3ed7ab37580 SHA512 fb181ecab19981733b4b478614f9b28d7f1f776bafe6c58c4bc3e26ed294301a6242d7cd1d47b7d6b55a93305474d2e8e0a75f2f01af21a8bc93d158c8f8179e diff --git a/net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch b/net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch deleted file mode 100644 index 40d26cc5f93..00000000000 --- a/net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index b388455..52d3bc3 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -58,8 +58,8 @@ CFLAGS = @MYCFLAGS@ - LDFLAGS = @MYLDFLAGS@ - CMDLDFLAGS = @MYCMDLDFLAGS@ - LIBS = @LIBS@ --LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:. --RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@ -+LDENV = -+RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR) - POSTCMD = @MYPOSTCMD@ - - -@@ -120,10 +120,6 @@ install : - cp -Rf $(LIBRARYFILES) $(DESTDIR)$(LIBDIR) - mkdir -p $(DESTDIR)$(BINDIR) - cp -Rf $(COMMANDFILES) $(DESTDIR)$(BINDIR) -- mkdir -p $(DESTDIR)$(SBINDIR) -- cp -Rf $(INITFILES) $(DESTDIR)$(SBINDIR) -- mkdir -p $(DESTDIR)$(DATADIR) -- cp -Rf $(SCREXTFILES) $(DOCUMENTFILES) $(DESTDIR)$(DATADIR) - mkdir -p $(DESTDIR)$(MAN1DIR) - cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR) - mkdir -p $(DESTDIR)$(MAN3DIR) -@@ -132,7 +128,6 @@ install : - cd man && cp -Rf $(MAN8FILES) $(DESTDIR)$(MAN8DIR) - mkdir -p $(DESTDIR)$(PCDIR) - cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR) -- [ "$$UID" == 0 ] && ldconfig || true - @printf '\n' - @printf '#================================================================\n' - @printf '# Thanks for using Tokyo Tyrant.\n' -diff --git a/configure.in b/configure.in -index fbe0c71..809a839 100644 ---- a/configure.in -+++ b/configure.in -@@ -28,33 +28,15 @@ MYDOCUMENTFILES="COPYING ChangeLog THANKS doc tokyotyrant.idl" - MYPCFILES="tokyotyrant.pc" - - # Building flags --MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2" -+MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char" - MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include" - MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__" --MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib" -+MYLDFLAGS="-L. -L\$(LIBDIR)" - MYCMDLDFLAGS="" - MYRUNPATH="\$(LIBDIR)" - MYLDLIBPATHENV="LD_LIBRARY_PATH" - MYPOSTCMD="true" - --# Building paths --PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" --PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb" --CPATH="$HOME/include:/usr/local/include:$CPATH" --LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" --LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" --PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" --export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH --if type pkg-config > /dev/null 2>&1 --then -- PATH="$PATH:`pkg-config --variable=bindir tokyocabinet`" -- CPATH="$CPATH:`pkg-config --variable=includedir tokyocabinet`" -- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`" -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`" --fi -- -- -- - #================================================================ - # Options - #================================================================ -diff --git a/tokyotyrant.pc.in b/tokyotyrant.pc.in -index efb3749..efec1f6 100644 ---- a/tokyotyrant.pc.in -+++ b/tokyotyrant.pc.in -@@ -10,5 +10,5 @@ datadir=@datadir@ - Name: Tokyo Tyrant - Description: network interface of Tokyo Cabinet - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -ltokyotyrant @LIBS@ -+Libs: -L${libdir} -ltokyotyrant - Cflags: -I${includedir} diff --git a/net-misc/tokyotyrant/files/fix_testsuite.patch b/net-misc/tokyotyrant/files/fix_testsuite.patch deleted file mode 100644 index 7ee9dc801cb..00000000000 --- a/net-misc/tokyotyrant/files/fix_testsuite.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- a/Makefile.in 2009-10-14 10:33:16.000000000 +0200 -+++ b/Makefile.in.new 2009-10-14 10:27:39.000000000 +0200 -@@ -166,48 +166,49 @@ - - - check : -+ $(RUNENV) $(RUNCMD) ./ttserver -dmn -host 127.0.0.1 -port 19781 -pid /tmp/tttest.pid /tmp/tttest.tch - $(RUNENV) $(RUNCMD) ./tcrmgr version -- $(RUNENV) $(RUNCMD) ./tcrtest write -cnum 5 -tout 5 -rnd 127.0.0.1 50000 -- $(RUNENV) $(RUNCMD) ./tcrtest write -cnum 5 -tout 5 -nr -rnd 127.0.0.1 50000 -- $(RUNENV) $(RUNCMD) ./tcrtest write -cnum 5 -tout 5 127.0.0.1 50000 -- $(RUNENV) $(RUNCMD) ./tcrtest read -cnum 5 -tout 5 127.0.0.1 -- $(RUNENV) $(RUNCMD) ./tcrtest read -cnum 5 -tout 5 -mul 5 127.0.0.1 -- $(RUNENV) $(RUNCMD) ./tcrtest remove -cnum 5 -tout 5 127.0.0.1 -- $(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 127.0.0.1 50000 -- $(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 -shl 50 127.0.0.1 50000 -- $(RUNENV) $(RUNCMD) ./tcrmgr vanish 127.0.0.1 -- $(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 -dad 127.0.0.1 50000 -- $(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 -ext putcat -xlr 127.0.0.1 50000 -- $(RUNENV) $(RUNCMD) ./tcrtest misc -cnum 5 -tout 5 127.0.0.1 5000 -- $(RUNENV) $(RUNCMD) ./tcrtest wicked -cnum 5 -tout 5 127.0.0.1 5000 -- $(RUNENV) $(RUNCMD) ./tcrmgr inform 127.0.0.1 -- $(RUNENV) $(RUNCMD) ./tcrmgr vanish 127.0.0.1 -- $(RUNENV) $(RUNCMD) ./tcrmttest write -tnum 5 127.0.0.1 5000 -- $(RUNENV) $(RUNCMD) ./tcrmttest read -tnum 5 127.0.0.1 -- $(RUNENV) $(RUNCMD) ./tcrmttest remove -tnum 5 127.0.0.1 -- $(RUNENV) $(RUNCMD) ./tcrmttest write -tnum 5 -ext putcat -rnd 127.0.0.1 5000 -- $(RUNENV) $(RUNCMD) ./tcrmttest typical -tnum 5 127.0.0.1 5000 -- $(RUNENV) $(RUNCMD) ./tcrmgr vanish 127.0.0.1 -- $(RUNENV) $(RUNCMD) ./tcrmgr put 127.0.0.1 one first -- $(RUNENV) $(RUNCMD) ./tcrmgr put 127.0.0.1 two second -- $(RUNENV) $(RUNCMD) ./tcrmgr put -dk 127.0.0.1 three third -- $(RUNENV) $(RUNCMD) ./tcrmgr put -dc 127.0.0.1 three third -- $(RUNENV) $(RUNCMD) ./tcrmgr put -dc 127.0.0.1 three third -- $(RUNENV) $(RUNCMD) ./tcrmgr put -dc 127.0.0.1 three third -- $(RUNENV) $(RUNCMD) ./tcrmgr put 127.0.0.1 four fourth -- $(RUNENV) $(RUNCMD) ./tcrmgr put -dk 127.0.0.1 five fifth -- $(RUNENV) $(RUNCMD) ./tcrmgr out 127.0.0.1 one -- $(RUNENV) $(RUNCMD) ./tcrmgr out 127.0.0.1 two -- $(RUNENV) $(RUNCMD) ./tcrmgr get 127.0.0.1 three > check.out -- $(RUNENV) $(RUNCMD) ./tcrmgr get 127.0.0.1 four > check.out -- $(RUNENV) $(RUNCMD) ./tcrmgr get 127.0.0.1 five > check.out -- $(RUNENV) $(RUNCMD) ./tcrmgr mget 127.0.0.1 one two three four five > check.out -- $(RUNENV) $(RUNCMD) ./tcrmgr misc 127.0.0.1 putlist six sixth seven seventh -- $(RUNENV) $(RUNCMD) ./tcrmgr misc 127.0.0.1 outlist six -- $(RUNENV) $(RUNCMD) ./tcrmgr misc 127.0.0.1 getlist three four five six > check.out -- $(RUNENV) $(RUNCMD) ./tcrmgr list -pv 127.0.0.1 > check.out -- $(RUNENV) $(RUNCMD) ./tcrmgr list -pv -fm f 127.0.0.1 > check.out -- $(RUNENV) $(RUNCMD) ./tcrmgr http -ih http://127.0.0.1:1978/five > check.out -+ $(RUNENV) $(RUNCMD) ./tcrtest write -port 19781 -cnum 5 -tout 5 -rnd 127.0.0.1 50000 -+ $(RUNENV) $(RUNCMD) ./tcrtest write -port 19781 -cnum 5 -tout 5 -nr -rnd 127.0.0.1 50000 -+ $(RUNENV) $(RUNCMD) ./tcrtest write -port 19781 -cnum 5 -tout 5 127.0.0.1 50000 -+ $(RUNENV) $(RUNCMD) ./tcrtest read -port 19781 -cnum 5 -tout 5 127.0.0.1 -+ $(RUNENV) $(RUNCMD) ./tcrtest read -port 19781 -cnum 5 -tout 5 -mul 5 127.0.0.1 -+ $(RUNENV) $(RUNCMD) ./tcrtest remove -port 19781 -cnum 5 -tout 5 127.0.0.1 -+ $(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 127.0.0.1 50000 -+ $(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 -shl 50 127.0.0.1 50000 -+ $(RUNENV) $(RUNCMD) ./tcrmgr vanish -port 19781 127.0.0.1 -+ $(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 -dad 127.0.0.1 50000 -+ $(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 -ext putcat -xlr 127.0.0.1 50000 -+ $(RUNENV) $(RUNCMD) ./tcrtest misc -port 19781 -cnum 5 -tout 5 127.0.0.1 5000 -+ $(RUNENV) $(RUNCMD) ./tcrtest wicked -port 19781 -cnum 5 -tout 5 127.0.0.1 5000 -+ $(RUNENV) $(RUNCMD) ./tcrmgr inform -port 19781 127.0.0.1 -+ $(RUNENV) $(RUNCMD) ./tcrmgr vanish -port 19781 127.0.0.1 -+ $(RUNENV) $(RUNCMD) ./tcrmttest write -port 19781 -tnum 5 127.0.0.1 5000 -+ $(RUNENV) $(RUNCMD) ./tcrmttest read -port 19781 -tnum 5 127.0.0.1 -+ $(RUNENV) $(RUNCMD) ./tcrmttest remove -port 19781 -tnum 5 127.0.0.1 -+ $(RUNENV) $(RUNCMD) ./tcrmttest write -port 19781 -tnum 5 -ext putcat -rnd 127.0.0.1 5000 -+ $(RUNENV) $(RUNCMD) ./tcrmttest typical -port 19781 -tnum 5 127.0.0.1 5000 -+ $(RUNENV) $(RUNCMD) ./tcrmgr vanish -port 19781 127.0.0.1 -+ $(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 127.0.0.1 one first -+ $(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 127.0.0.1 two second -+ $(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dk 127.0.0.1 three third -+ $(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dc 127.0.0.1 three third -+ $(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dc 127.0.0.1 three third -+ $(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dc 127.0.0.1 three third -+ $(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 127.0.0.1 four fourth -+ $(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dk 127.0.0.1 five fifth -+ $(RUNENV) $(RUNCMD) ./tcrmgr out -port 19781 127.0.0.1 one -+ $(RUNENV) $(RUNCMD) ./tcrmgr out -port 19781 127.0.0.1 two -+ $(RUNENV) $(RUNCMD) ./tcrmgr get -port 19781 127.0.0.1 three > check.out -+ $(RUNENV) $(RUNCMD) ./tcrmgr get -port 19781 127.0.0.1 four > check.out -+ $(RUNENV) $(RUNCMD) ./tcrmgr get -port 19781 127.0.0.1 five > check.out -+ $(RUNENV) $(RUNCMD) ./tcrmgr mget -port 19781 127.0.0.1 one two three four five > check.out -+ $(RUNENV) $(RUNCMD) ./tcrmgr misc -port 19781 127.0.0.1 putlist six sixth seven seventh -+ $(RUNENV) $(RUNCMD) ./tcrmgr misc -port 19781 127.0.0.1 outlist six -+ $(RUNENV) $(RUNCMD) ./tcrmgr misc -port 19781 127.0.0.1 getlist three four five six > check.out -+ $(RUNENV) $(RUNCMD) ./tcrmgr list -port 19781 -pv 127.0.0.1 > check.out -+ $(RUNENV) $(RUNCMD) ./tcrmgr list -port 19781 -pv -fm f 127.0.0.1 > check.out -+ $(RUNENV) $(RUNCMD) ./tcrmgr http -ih http://127.0.0.1:19781/five > check.out - rm -rf ulog ; mkdir -p ulog - $(RUNENV) $(RUNCMD) ./ttultest write -lim 10000 ulog 5000 - $(RUNENV) $(RUNCMD) ./ttultest write -lim 10000 -as ulog 5000 -@@ -215,6 +216,10 @@ - rm -rf ulog ; mkdir -p ulog - $(RUNENV) $(RUNCMD) ./ttultest thread -lim 10000 ulog 5 5000 - $(RUNENV) $(RUNCMD) ./ttultest thread -lim 10000 -as ulog 5 5000 -+ -+ kill `cat /tmp/tttest.pid` -+ rm /tmp/tttest.tch -+ - @printf '\n' - @printf '#================================================================\n' - @printf '# Checking completed.\n' diff --git a/net-misc/tokyotyrant/files/tokyotyrant.confd b/net-misc/tokyotyrant/files/tokyotyrant.confd deleted file mode 100644 index b6417134f47..00000000000 --- a/net-misc/tokyotyrant/files/tokyotyrant.confd +++ /dev/null @@ -1,15 +0,0 @@ -# Tokyo tyrant config - -# Listening options -TT_HOST=127.0.0.1 -TT_PORT=1978 - -# Database file - please refer to man ttserver for alternatives -TT_DB="/var/lib/tokyotyrant/casket.tch#bnum=1000000#opts=ld" - -# ttserver accepts a wide range of options, put them here -TT_OPTS="" - -# don't change these -TT_PID=/var/run/tokyotyrant/db.pid -TT_LOG=/var/log/tokyotyrant/db.log \ No newline at end of file diff --git a/net-misc/tokyotyrant/files/tokyotyrant.initd b/net-misc/tokyotyrant/files/tokyotyrant.initd deleted file mode 100644 index f754d4901bf..00000000000 --- a/net-misc/tokyotyrant/files/tokyotyrant.initd +++ /dev/null @@ -1,38 +0,0 @@ -#!/sbin/openrc-run - -extra_commands="configtest reload" - -depend() { - need net -} - -start() { - configtest || return 1 - ebegin "Starting tokyo tyrant" - start-stop-daemon --start --exec /usr/bin/ttserver -- \ - -pid ${TT_PID} -dmn -host ${TT_HOST} -log ${TT_LOG} \ - -port ${TT_PORT} ${TT_OPTS} ${TT_DB} - eend $? "Failed to start tokyo tyrant" -} - -stop() { - configtest || return 1 - ebegin "Stopping tokyo tyrant" - start-stop-daemon --stop --pidfile ${TT_PID} - eend $? "Failed to stop tokyo tyrant" - rm -f ${TT_PID} -} - -reload() { - configtest || return 1 - ebegin "Gracefully restarting tokyo tyrant" - kill -HUP `cat ${TT_PID}` &>/dev/null - eend $? "Failed to reload tokyo tyrant" -} - -configtest() { - if [ -z "${TT_DB}" ] || [ -z "${TT_PORT}" ] ; then - eerror "Please check your configuration" - eend $? - fi -} diff --git a/net-misc/tokyotyrant/metadata.xml b/net-misc/tokyotyrant/metadata.xml deleted file mode 100644 index 40aa45df2b0..00000000000 --- a/net-misc/tokyotyrant/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Patrick Lauer</name> - </maintainer> -</pkgmetadata> diff --git a/net-misc/tokyotyrant/tokyotyrant-1.1.41-r2.ebuild b/net-misc/tokyotyrant/tokyotyrant-1.1.41-r2.ebuild deleted file mode 100644 index 1da7a34c200..00000000000 --- a/net-misc/tokyotyrant/tokyotyrant-1.1.41-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit user - -DESCRIPTION="A network interface to Tokyo Cabinet" -HOMEPAGE="https://fallabs.com/tokyotyrant/"; -SRC_URI="https://fallabs.com/tokyotyrant/${P}.tar.gz"; - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86 ~ppc-macos ~x86-macos" -IUSE="debug examples lua" - -DEPEND="dev-db/tokyocabinet - sys-libs/zlib - lua? ( dev-lang/lua )" -RDEPEND="${DEPEND}" - -pkg_setup() { - if use !prefix ; then - enewgroup tyrant - enewuser tyrant -1 -1 /var/lib/${PN} tyrant - fi -} - -src_prepare() { - default - eapply "${FILESDIR}"/fix_makefiles-1.4.41.patch - eapply "${FILESDIR}"/fix_testsuite.patch -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable lua) -} - -src_install() { - rm ttservctl || die "Install failed" - default - - for x in /var/{lib,run,log}/${PN}; do - dodir "${x}" || die "Install failed" - use prefix || fowners tyrant:tyrant "${x}" - done - - if use examples; then - insinto /usr/share/${PF}/example - doins -r example/ - fi - - dodoc -r doc - - newinitd "${FILESDIR}/${PN}.initd" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} - -} - -src_test() { - emake -j1 check -} diff --git a/profiles/package.mask b/profiles/package.mask index 4a379ddd756..07eed1bfccc 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1128,13 +1128,6 @@ sci-libs/grib_api # Removal in 30 days. Bug #692796. dev-tcltk/tkTheme -# Michał Górny <[email protected]> (2019-08-27) -# Discontinued upstream, in favor of Tokyo Tycoon. Last release -# in 2010. Not touched by the Gentoo maintainer since 2010, with bugs -# having to be addressed by other developers. -# Removal in 30 days. Bug #681044. -net-misc/tokyotyrant - # Miroslav Šulc <[email protected]> (2019-08-19) # Depends on >=virtual/{jdk,jre}-11 which is masked =www-servers/tomcat-9.0.24
