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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5E1271382C5 for ; Fri, 20 Apr 2018 20:01:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2DAEE08F3; Fri, 20 Apr 2018 20:01:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 74318E08F3 for ; Fri, 20 Apr 2018 20:01:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF807335C78 for ; Fri, 20 Apr 2018 20:01:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 53DD5291 for ; Fri, 20 Apr 2018 20:01:26 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1524254457.8b8dfee6f3f4240ce6844f73b05b022716043a2b.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/epic5/, net-irc/epic5/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/epic5/epic5-1.1.10-r2.ebuild net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch X-VCS-Directories: net-irc/epic5/files/ net-irc/epic5/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 8b8dfee6f3f4240ce6844f73b05b022716043a2b X-VCS-Branch: master Date: Fri, 20 Apr 2018 20:01:26 +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-Archives-Salt: 9044ebbe-e6a9-41a0-b5b6-a63e8368a495 X-Archives-Hash: 80165f52dddc651caad2627c5f633d7c commit: 8b8dfee6f3f4240ce6844f73b05b022716043a2b Author: Marty E. Plummer startmail com> AuthorDate: Fri Apr 20 09:10:49 2018 +0000 Commit: David Seifert gentoo org> CommitDate: Fri Apr 20 20:00:57 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b8dfee6 net-irc/epic5: epatch->PATCHES=() Reworked a patch to be -p1 applicable. Also, this ebuild cannot be built at due to missing xlocale.h on >=glibc-2.26, with or without my changes. Package-Manager: Portage-2.3.28, Repoman-2.3.9 net-irc/epic5/epic5-1.1.10-r2.ebuild | 22 +++++++++++----------- .../epic5/files/epic5-1.1.10-socks5-libsocks.patch | 9 ++------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/net-irc/epic5/epic5-1.1.10-r2.ebuild b/net-irc/epic5/epic5-1.1.10-r2.ebuild index 323296c7006..289bab3402a 100644 --- a/net-irc/epic5/epic5-1.1.10-r2.ebuild +++ b/net-irc/epic5/epic5-1.1.10-r2.ebuild @@ -5,7 +5,7 @@ EAPI=6 USE_RUBY="ruby22 ruby23" -inherit autotools eutils multilib ruby-single toolchain-funcs +inherit autotools ruby-single toolchain-funcs DESCRIPTION="Epic5 IRC Client" SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.bz2" @@ -30,17 +30,17 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${P} -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch \ - "${FILESDIR}"/${P}-ruby-automagic-as-needed.patch \ - "${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \ - "${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \ - "${FILESDIR}"/${P}-without-localdir.patch \ - "${FILESDIR}"/${P}-socks5-libsocks.patch - - eapply_user +PATCHES=( + "${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch \ + "${FILESDIR}"/${P}-ruby-automagic-as-needed.patch \ + "${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \ + "${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \ + "${FILESDIR}"/${P}-without-localdir.patch \ + "${FILESDIR}"/${P}-socks5-libsocks.patch +) +src_prepare() { + default eautoconf } diff --git a/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch b/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch index c2555c059e7..4aef0c7d6af 100644 --- a/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch +++ b/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch @@ -1,13 +1,8 @@ From: Nathan Phillip Brink Subject: Use -lsocks instead of -lsocks5 for `./configure --with-socks5`. -Index: configure.in -=================================================================== -RCS file: /home/cvs/repository/epic5/configure.in,v -retrieving revision 1.101 -diff -u -b -B -u -r1.101 configure.in ---- configure.in 9 Apr 2014 17:51:06 -0000 1.101 -+++ configure.in 4 Sep 2014 00:18:00 -0000 +--- a/configure.in ++++ b/configure.in @@ -861,7 +861,7 @@ AC_MSG_CHECKING(whether to support SOCKS)