From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D7286158020 for ; Mon, 24 Oct 2022 11:47:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A608E07FE; Mon, 24 Oct 2022 11:47:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6E1FCE07FE for ; Mon, 24 Oct 2022 11:47:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 58EB0341099 for ; Mon, 24 Oct 2022 11:47:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DFCD862C for ; Mon, 24 Oct 2022 11:47:04 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1666611989.d91b772cb89aadf1ee8d66f9711ea1220297658d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/psybnc/files/, net-irc/psybnc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/psybnc/Manifest net-irc/psybnc/files/compile.diff net-irc/psybnc/files/ldflags-fix.patch net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch net-irc/psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild X-VCS-Directories: net-irc/psybnc/ net-irc/psybnc/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d91b772cb89aadf1ee8d66f9711ea1220297658d X-VCS-Branch: master Date: Mon, 24 Oct 2022 11:47:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0c04c867-1ae1-45ae-8c49-4953ae425ce5 X-Archives-Hash: 82697ecda73aee05c4b7f3e2c1486370 commit: d91b772cb89aadf1ee8d66f9711ea1220297658d Author: Sam James gentoo org> AuthorDate: Mon Oct 24 11:46:29 2022 +0000 Commit: Sam James gentoo 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 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