Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

3 files changed, 88 insertions, 0 deletions

diff --git a/net-misc/rwhoisd/Manifest b/net-misc/rwhoisd/Manifest
index cba64fa2679f..3fea1b7dac61 100644
--- a/net-misc/rwhoisd/Manifest
+++ b/net-misc/rwhoisd/Manifest
@@ -1,5 +1,8 @@
 AUX rwhoisd 280 BLAKE2B 8d2e54026175bb53897e69a61abf83b5c7548acbe52555f6adbdc88a07f94a88e3486aea81dd2d3043a99b83b5bc7b4255014f3df2687d463ab60a86ef2a37b5 SHA512 cd278c6dd828d7f07c50147e5dedad7cf8c8e44926b4717fec442b91d891838b59f61dc2a51968df5b4b1dfe181958148a9a7f9e93e65fc815b69c6219dabd6d
+AUX rwhoisd-destdir-1.5.9.5.patch 1007 BLAKE2B 3e7ca5d13ceb724ab212b7a6b2d4186e15b2a524b07fdd40268f8eb1ec7983270ad6240c1eea2ce212353bab7ba94d71a947bef4cd5a31879ad7506d823ce4f8 SHA512 9fc08f639cd087c1cbbc3139eb648fc4afed1c8aa299fcec867c3938a773e8c0ca9b1be40acdc61026ded1f012df9eea2bb713ec1207464f1cd66d215c2fa221
 AUX rwhoisd.conf 154 BLAKE2B 1f80fde2a8ed3066c4c5b5a3a17ad735a6bef56bb897cb41bbc7d3e314803a9e3b06dc957077b28b3590435b7a18a0827f3f4554247509ea21bc0d5048b08cf2 SHA512 882d93ddf72f6a909ab6a33a6f5026e35f52ae025a9e4653cc0449c4b0ab1b2fda5799e1b44b19c620eb98337270a7a1c1eb9cff66af49832adf9726f4713bb8
+DIST rwhoisd-1.5.9.5.tar.gz 491600 BLAKE2B 3e6857e7aa260fb6d714d53b63279517e15fede29be0113541213bf1a9f70bf160486fa42561fb551e019dbd6d5d773fb01a67d3da794dd17dc5978f9d3f2335 SHA512 d9227cd700cb14e0c83003c7a8dff43f859eba58390f4ba74b03c58fe629bcc9e8a39f2aaf7ce9b55aa4f17f43fc54fed9ba05a29bcbe1df5fc1340202d7b04c
 DIST rwhoisd-1.5.9.6.tar.gz 491955 BLAKE2B 97587fc6a728cde58bc5049a9bf27ec1673ce7beb751aa0de7c787d08185b597e16a4920e89fa5aaabc6e7e1b5dfecedc50aaf55cbdbe7f85a43d6a125848cb9 SHA512 ab5674d9ed9f9c5fc00b2859b1336c766c546ca067ddf9d3863a0728c6d0eac11be3a9cd22dce8c25999ed8c8e5377e6da4aa1252e396d5b3c8e959794903c52
+EBUILD rwhoisd-1.5.9.5-r3.ebuild 892 BLAKE2B f35bbf5a22077d8cde0661adafb72d93f77b898627e16cdab220f06cb6cff593ffd7d28fc436b16edbb3d1bf7c9882984885b4ba97f591d56d18bce552dcef84 SHA512 ba47902133b686606c3aa64571ca7d9bf8530201971fe7f8abd750714dced074e4365e2c2418238f88b62bc3a40884462cd67e6a44d56d8b756f5ba0b9df40a0
 EBUILD rwhoisd-1.5.9.6.ebuild 873 BLAKE2B afb247fb325e53dd810912b5334cb9ec239a8e41008b49d7b8bcf425010664c7489be82c02f5c4a53598fde731af6a36fab822519a295f8d2d5f39be92c8b2ea SHA512 8959505ad0dff653851c312c6be15302163d5ba0b9190ec339a9f6180f2ccd838d5e520018463a0fb0b94567d9722ec2a06fdff3950e17444d40e6ab724acf67
 MISC metadata.xml 225 BLAKE2B 19246ee217a79a478dded3e88f6eb021a574016a0bb6dc118ee6dbece7b9cbc5df12e36d8585c71416cb4e3d5533edc652d686674044b188a7457094f53a5fa4 SHA512 0b610f2ab50e3c82c7e3fb9bbe1af0ce84851de95ad8b8caec506e4d8260e3bd64995e7d51d447c29bbd4696285a67d14fc1f10ceab9185e4501802986e27980
diff --git a/net-misc/rwhoisd/files/rwhoisd-destdir-1.5.9.5.patch b/net-misc/rwhoisd/files/rwhoisd-destdir-1.5.9.5.patch
new file mode 100644
index 000000000000..6cd6b28f2e51
--- /dev/null
+++ b/net-misc/rwhoisd/files/rwhoisd-destdir-1.5.9.5.patch
@@ -0,0 +1,39 @@
+--- a/tools/rwhois_repack/Makefile.in
++++ b/tools/rwhois_repack/Makefile.in
+@@ -52,9 +52,9 @@
+ # procedural
+ 
+ install:
+-	if [ ! -d $(exec_prefix) ]; then mkdir $(exec_prefix); fi
+-	if [ ! -d $(bindir) ]; then mkdir $(bindir); fi
+-	$(INSTALL) rwhois_repack $(bindir)
++	if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir $(DESTDIR)$(exec_prefix); fi
++	if [ ! -d $(DESTDIR)$(bindir) ]; then mkdir $(DESTDIR)$(bindir); fi
++	$(INSTALL) rwhois_repack $(DESTDIR)$(bindir)
+ 
+ uninstall:
+	$(RM) $(bindir)/rwhois_repack
+
+--- a/sample.data/Makefile.in
++++ b/sample.data/Makefile.in
+@@ -10,7 +10,7 @@
+ prefix      = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir      = $(exec_prefix)/bin
+-etcdir      = $(exec_prefix)/etc
++etcdir      = /etc
+ 
+ srcdir	    = @srcdir@
+ VPATH       = @srcdir@
+
+--- a/sample.data/Makefile.in
++++ b/sample.data/Makefile.in
+@@ -17,7 +17,7 @@
+ 
+ DESTDIR =
+ 
+-RWHOIS_ROOT_DIR = $(DESTDIR)$(etcdir)/rwhoisd/samples
++RWHOIS_ROOT_DIR = $(DESTDIR)/var/rwhoisd/samples
+ 
+ FILES = \
+         a.com \
diff --git a/net-misc/rwhoisd/rwhoisd-1.5.9.5-r3.ebuild b/net-misc/rwhoisd/rwhoisd-1.5.9.5-r3.ebuild
new file mode 100644
index 000000000000..0ff7fbf1072d
--- /dev/null
+++ b/net-misc/rwhoisd/rwhoisd-1.5.9.5-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic user
+
+DESCRIPTION="ARIN rwhois daemon"
+HOMEPAGE="http://projects.arin.net/rwhois/"
+SRC_URI="http://projects.arin.net/rwhois/ftp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
+
+pkg_setup() {
+	enewgroup rwhoisd
+	enewuser rwhoisd -1 -1 /var/rwhoisd rwhoisd
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-destdir-${PV}.patch
+	append-cflags -DNEW_STYLE_BIN_SORT
+}
+
+src_compile() {
+	emake -C common
+	emake -C regexp
+	emake -C mkdb
+	default
+}
+
+src_install () {
+	default
+	doinitd "${FILESDIR}"/rwhoisd
+	newconfd "${FILESDIR}"/rwhoisd.conf rwhoisd
+}
+
+pkg_postinst () {
+	einfo "Please make sure to set the userid in rwhoisd.conf to rwhoisd."
+	einfo "It is highly inadvisable to run rwhoisd as root."
+}