3 files changed, 10 insertions, 67 deletions
diff --git a/net-misc/geomyidae/Manifest b/net-misc/geomyidae/Manifest
index 8c12008d5b1b..089f6c2aa298 100644
--- a/net-misc/geomyidae/Manifest
+++ b/net-misc/geomyidae/Manifest
@@ -1,5 +1,3 @@
-DIST geomyidae-v0.34.tgz 22242 BLAKE2B bc25f50c49c10e5a04b83a12cdcd7546b33f6a7d93eab504122bcfb2fdacfbcb82205890d5fd999d1b8b681c65dc0ef0dc5f95ea2d56a795fa371031c4af43b8 SHA512 55b7845c8b9fbee70b2e2bd71d2e3bb8e34c3029a1ea410cb39750763c81d5c31af8c703f7b673aa28fbfd61dd7915300ed4ff22f94c8430ac754681bc30ce41
-DIST geomyidae-v0.69.tar.gz 34631 BLAKE2B a1d7e33d403df5d6bb4d5fdc0999fdcfa94da058dd5dc1c0f22c49b9cc1b06cf45fafdb839eb91dec78be0aa778e3a74bf26d8ffa5054d45e5c6e86918480ad4 SHA512 c66f751472c35107c2c91f1675ab40bf68da1d3d5742ec94125c8ecba54b2832e82c8106a3627da53216cf3802ae7900ef8457c383160614ecce2a07b318662a
-EBUILD geomyidae-0.34-r1.ebuild 1092 BLAKE2B ac44156e892812b7c00ec072999f3c86a0d68f02c2b7dae9826778586d6486b9d0520627f2ccc89babaf2f310e8ced288e9893740c2be6a65861a89b2648cc70 SHA512 49a96889f0c256ad49eb7e7e6e424769ec40932551416ae89ebc23a19dbfa9b3e63257d354d1b4d5c056087a06d862feeec168750a57483500b8870ecf16ffcf
-EBUILD geomyidae-0.69.ebuild 938 BLAKE2B c338eaa89241505ddb2e4079d2cafe72f01eee13674c9ea8c99fa1b8ee106ee93909094e93e770288bfab2c38337ac57ddf5c684b12f9b52466bb651adc9f62d SHA512 2eedcb6e80195eed604fda396f72170d398a20e6bffa114d9735e22c80f2e376beaf91719041a7c108e7b75d7dc643a145445027cb9db6c5404059115aa224fb
+DIST geomyidae-v0.96.tar.gz 38373 BLAKE2B 30bc409e8a124a6375ef113919f6b78fcb59103243237e57951ee0cc2907adf9a45168e7ceed55cb29af09d83e96a2e8f6123ba4586e4f216dc1eb4eb8f031c9 SHA512 3c73baca4ae3a58dfc2b064c448ec7c1d34b110f8b88c301a4287d0565ad22ee1676a5cf18707771bb26352291f04586276d5dec74c10b66d3a1c340805afc91
+EBUILD geomyidae-0.96.ebuild 1023 BLAKE2B 96ad856de8713aab625a5aff1e81137b4f6373bc0d4958df9242cdc562d0c4166c818d62b8c8848a3340f1897c2c0a92058ff765c9f5f12c1ffaf08b6706094d SHA512 c44e619ffdb268fa2710e16d5f278e2885fd95cc7f46b4ea2d9005417c0d1072c0f0d14d0b5316e8ab62c91b788403214394c9e05c45a899f4a36a6ecdfa2912
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-misc/geomyidae/geomyidae-0.34-r1.ebuild b/net-misc/geomyidae/geomyidae-0.34-r1.ebuild
deleted file mode 100644
index 36930da5891e..000000000000
--- a/net-misc/geomyidae/geomyidae-0.34-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-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"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="
-	acct-group/gopherd
-	acct-user/gopherd
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# enable verbose build
-	# respect CFLAGS
-	# remove /usr/lib from LDFLAGS, bug #731672
-	sed -i \
-		-e 's/@${CC}/${CC}/g' \
-		-e '/CFLAGS/s/=/?=/' \
-		-e '/GEOM_LDFLAGS/s:-L/usr/lib ::' \
-		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.69.ebuild b/net-misc/geomyidae/geomyidae-0.96.ebuild
index 3bd6b1bc1db3..0ca0e14bb6b9 100644
--- a/net-misc/geomyidae/geomyidae-0.69.ebuild
+++ b/net-misc/geomyidae/geomyidae-0.96.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A daemon to serve the gopher protocol"
-HOMEPAGE="http://r-36.net/scm/geomyidae/"
+HOMEPAGE="https://r-36.net/scm/geomyidae/"
 SRC_URI="ftp://bitreich.org/releases/geomyidae/${PN}-v${PV}.tar.gz"
 
 S="${WORKDIR}/${PN}-v${PV}"
@@ -15,12 +15,13 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
+BDEPEND="acct-group/gopherd"
+DEPEND="dev-libs/libretls:0="
 RDEPEND="
-	acct-group/gopherd
+	${BDEPEND}
+	${DEPEND}
 	acct-user/gopherd
-	dev-libs/libretls:0=
 "
-DEPEND="${RDEPEND}"
 
 src_prepare() {
 	# remove /usr/lib from LDFLAGS, bug #731672
@@ -32,6 +33,7 @@ src_prepare() {
 }
 
 src_compile() {
+	append-cflags -D_FILE_OFFSET_BITS=64 # bug 927733
 	emake CC="$(tc-getCC)"
 }