commit: d91b772cb89aadf1ee8d66f9711ea1220297658d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 11:46:29 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 24 11:46:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d91b772c
net-irc/psybnc: rename patches
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/psybnc/Manifest | 1 +
.../{compile.diff => psybnc-2.3.2.9-compile.patch} | 0
...-fix.patch => psybnc-2.3.2.9-ldflags-fix.patch} | 0
net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild | 26 ++++++++++++----------
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
index 7feaa0cb2399..9ff638d4d120 100644
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -1 +1,2 @@
DIST psyBNC-2.3.2-9.tar.gz 318676 BLAKE2B
0197aa3bc8c770738a7d4d5a5a79b77f7a0cafeef60ccca1167172b28af05c0cd9836f7e9816c873dafa2e55b0bf9ce54cfbe3958939405f58f7f3874ec7ea64
SHA512
b664f57610e54fadd938b359a0e8052b8fe3dd36bd1ee339f36ee22ae4d36a76e803425c5133f925ac18c01767ffbc8a2f471c014b5b76b05894cfea9fe5416b
+DIST psyBNC-2.4.3.tar.gz 1108733 BLAKE2B
e0f02cab97b503301db0a4c111497e4f99b75d8d2c798b2b5d97997a4c4921d8a7de8dabad79c1291fa4b7efce0d1ed0c7dede1345b155561bb6ce6033b591bb
SHA512
02228baef6fa889d5e12bfa715facc2eab3b033c01b1f799a1c6c995ef9eedfacf3ed328c875f52595d64c47124c20e4145288b2636182dea17ec9027d367bb7
diff --git a/net-irc/psybnc/files/compile.diff
b/net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch
similarity index 100%
rename from net-irc/psybnc/files/compile.diff
rename to net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch
diff --git a/net-irc/psybnc/files/ldflags-fix.patch
b/net-irc/psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch
similarity index 100%
rename from net-irc/psybnc/files/ldflags-fix.patch
rename to net-irc/psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
index 001c32520db9..684b08d88a1f 100644
--- a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
+++ b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
@@ -11,7 +11,7 @@ PSYBNC_HOME="/var/lib/psybnc"
DESCRIPTION="A multi-user and multi-server gateway to IRC networks"
HOMEPAGE="http://www.psybnc.at/index.html";
SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz";
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}"/${PN}
LICENSE="GPL-2"
SLOT="0"
@@ -26,6 +26,11 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.2.9-compile.patch
+ "${FILESDIR}"/${PN}-2.3.2.9-ldflags-fix.patch
+)
+
src_unpack() {
unpack ${A}
cd "${S}" || die
@@ -45,17 +50,14 @@ src_unpack() {
src_prepare() {
default
- eapply "${FILESDIR}/compile.diff"
- eapply "${FILESDIR}/ldflags-fix.patch"
-
- # add oidentd
- use oidentd && eapply "${FILESDIR}/${P}-oidentd.patch"
+ # Add oidentd
+ use oidentd && PATCHES+=( "${FILESDIR}"/${P}-oidentd.patch )
- # add scripting support
- use scripting && eapply "${FILESDIR}/${P}-scripting.patch"
+ # Add scripting support
+ use scripting && PATCHES+=( "${FILESDIR}"/${P}-scripting.patch )
- # add multinetwork support
- use multinetwork && eapply "${FILESDIR}/${P}-multinetwork.patch"
+ # Add multinetwork support
+ use multinetwork && PATCHES+=( "${FILESDIR}"/${P}-multinetwork.patch )
# Prevent stripping the binary
sed -i -e "/@strip/ d" tools/autoconf.c || die
@@ -103,10 +105,10 @@ src_install() {
insinto /etc
doins "${FILESDIR}"/oidentd.conf.psybnc
fperms 640 /etc/oidentd.conf.psybnc
- # install init-script with oidentd-support
+ # Install init-script with oidentd-support
newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc
else
- # install init-script without oidentd-support
+ # Install init-script without oidentd-support
newinitd "${FILESDIR}"/psybnc.initd psybnc
fi
