gentoo resync : 25.08.2020

3 files changed, 5 insertions, 60 deletions

diff --git a/net-misc/geomyidae/Manifest b/net-misc/geomyidae/Manifest
index fcbbb4b796c3..2009e66e3a6f 100644
--- a/net-misc/geomyidae/Manifest
+++ b/net-misc/geomyidae/Manifest
@@ -1,5 +1,3 @@
-DIST geomyidae-v0.32.2.tgz 20897 BLAKE2B 117a4e89a379a8e84355661d910fcb227ef6105cdf6c5860a89c94caa7ed71d278b53c325a59bf200acdd589b515559995b27536c9fab3fe30fe87cb82f10130 SHA512 3b0927a16082df862b9efacc2f29fd1b1ca76f7d465426e179d5995a416bc27b518daba422512091304ed5479ff133e3d40f7bf66aedfbd8d99d13710809d519
 DIST geomyidae-v0.34.tgz 22242 BLAKE2B bc25f50c49c10e5a04b83a12cdcd7546b33f6a7d93eab504122bcfb2fdacfbcb82205890d5fd999d1b8b681c65dc0ef0dc5f95ea2d56a795fa371031c4af43b8 SHA512 55b7845c8b9fbee70b2e2bd71d2e3bb8e34c3029a1ea410cb39750763c81d5c31af8c703f7b673aa28fbfd61dd7915300ed4ff22f94c8430ac754681bc30ce41
-EBUILD geomyidae-0.32.2.ebuild 1029 BLAKE2B c242ef54e3a92f257149a373d276d3ef496c757c27cfdf8197b8285d56ddaf790a2feea8a2c7e032ea8e0a84beea69c03d7dcd1a70445b6ecabd105511f55a19 SHA512 875352e3b65ec186ec6fc3489c32173db9a214fdf235ad58dcf8bfba0f9c5283265c8aa413d2a65f1061add4f219feca76c35c11e57b0f77982228da314e5d29
-EBUILD geomyidae-0.34.ebuild 1029 BLAKE2B c242ef54e3a92f257149a373d276d3ef496c757c27cfdf8197b8285d56ddaf790a2feea8a2c7e032ea8e0a84beea69c03d7dcd1a70445b6ecabd105511f55a19 SHA512 875352e3b65ec186ec6fc3489c32173db9a214fdf235ad58dcf8bfba0f9c5283265c8aa413d2a65f1061add4f219feca76c35c11e57b0f77982228da314e5d29
+EBUILD geomyidae-0.34.ebuild 1106 BLAKE2B 9274bb87b8c0d99d33052b26acd4f0b21a5118105bd4ae0db0a825cf2c5bfb536413cdc8a75d563f2cd98e5086121f80d1743baeba9e4c377818ce9f6c2add5b SHA512 f2ba1cf38519d8850ae2b8b494afa204d1300c89eecde9c11252de844f8faf42f2d1f02b6629726e989a718fdb116323af7296e53a345ed417e5fb1c39dd3497
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/net-misc/geomyidae/geomyidae-0.32.2.ebuild b/net-misc/geomyidae/geomyidae-0.32.2.ebuild
deleted file mode 100644
index 18d502998aa1..000000000000
--- a/net-misc/geomyidae/geomyidae-0.32.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs user
-
-DESCRIPTION="A daemon to serve the gopher protocol"
-HOMEPAGE="http://r-36.net/scm/geomyidae/"
-SRC_URI="ftp://bitreich.org/releases/geomyidae/${PN}-v${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-pkg_setup() {
-	enewgroup gopherd
-	enewuser gopherd -1 -1 /var/gopher gopherd
-}
-
-src_prepare() {
-	# enable verbose build
-	# drop -O. from CFLAGS
-	sed -i \
-		-e 's/@${CC}/${CC}/g' \
-		-e '/CFLAGS/s/-O. //' \
-		Makefile || die 'sed on Makefile failed'
-	# fix path for pid file
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		rc.d/Gentoo.init.d || die
-
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd rc.d/Gentoo.init.d ${PN}
-	newconfd rc.d/Gentoo.conf.d ${PN}
-
-	insinto /var/gopher
-	doins index.gph
-	fowners -R root.gopherd /var/gopher
-	fperms -R g=rX,o=rX /var/gopher
-
-	doman ${PN}.8
-	dodoc CGI README
-}
diff --git a/net-misc/geomyidae/geomyidae-0.34.ebuild b/net-misc/geomyidae/geomyidae-0.34.ebuild
index 18d502998aa1..1125cd687e28 100644
--- a/net-misc/geomyidae/geomyidae-0.34.ebuild
+++ b/net-misc/geomyidae/geomyidae-0.34.ebuild
@@ -22,10 +22,12 @@ pkg_setup() {
 
 src_prepare() {
 	# enable verbose build
-	# drop -O. from CFLAGS
+	# respect CFLAGS
+	# remove /usr/lib from LDFLAGS, bug #731672
 	sed -i \
 		-e 's/@${CC}/${CC}/g' \
-		-e '/CFLAGS/s/-O. //' \
+		-e '/CFLAGS/s/=/?=/' \
+		-e '/GEOM_LDFLAGS/s:-L/usr/lib ::' \
 		Makefile || die 'sed on Makefile failed'
 	# fix path for pid file
 	sed -i \