Gentoo Archives: gentoo-commits

From: Julian Ospald <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/hexchat/
Date: Wed, 30 Sep 2015 20:16:44
Message-Id: 1443644166.b929089bc2989d71e6d3d32ceaafaa85ecf32dc6.hasufell@gentoo
1 commit: b929089bc2989d71e6d3d32ceaafaa85ecf32dc6
2 Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 30 20:08:34 2015 +0000
4 Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 30 20:16:06 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b929089b
7
8 net-irc/hexchat: add libressl support
9
10 ...exchat-9999.ebuild => hexchat-2.10.2-r1.ebuild} | 28 +++++++---------------
11 net-irc/hexchat/hexchat-9999.ebuild | 7 ++++--
12 2 files changed, 14 insertions(+), 21 deletions(-)
13
14 diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-2.10.2-r1.ebuild
15 similarity index 81%
16 copy from net-irc/hexchat/hexchat-9999.ebuild
17 copy to net-irc/hexchat/hexchat-2.10.2-r1.ebuild
18 index 064761a..6d16041 100644
19 --- a/net-irc/hexchat/hexchat-9999.ebuild
20 +++ b/net-irc/hexchat/hexchat-2.10.2-r1.ebuild
21 @@ -1,21 +1,20 @@
22 -# Copyright 1999-2014 Gentoo Foundation
23 +# Copyright 1999-2015 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 # $Id$
26
27 EAPI=5
28
29 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
30 -inherit autotools eutils fdo-mime gnome2-utils mono-env multilib python-single-r1 git-2
31 +inherit eutils fdo-mime gnome2-utils mono-env multilib python-single-r1
32
33 DESCRIPTION="Graphical IRC client based on XChat"
34 HOMEPAGE="http://hexchat.github.io/"
35 -SRC_URI=""
36 -EGIT_REPO_URI="git://github.com/hexchat/hexchat.git"
37 +SRC_URI="https://dl.hexchat.net/hexchat/${P}.tar.xz"
38
39 LICENSE="GPL-2 plugin-fishlim? ( MIT )"
40 SLOT="0"
41 -KEYWORDS=""
42 -IUSE="dbus +gtk ipv6 libcanberra libnotify libproxy nls ntlm perl +plugins plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo python spell ssl theme-manager"
43 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
44 +IUSE="dbus +gtk ipv6 libcanberra libnotify libproxy libressl nls ntlm perl +plugins plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo python spell ssl theme-manager"
45 REQUIRED_USE="plugins? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
46
47 DEPEND="dev-libs/glib:2
48 @@ -32,7 +31,10 @@ DEPEND="dev-libs/glib:2
49 python? ( ${PYTHON_DEPS} )
50 )
51 spell? ( app-text/iso-codes )
52 - ssl? ( dev-libs/openssl:0 )
53 + ssl? (
54 + !libressl? ( dev-libs/openssl:0 )
55 + libressl? ( dev-libs/libressl )
56 + )
57 theme-manager? ( dev-lang/mono )"
58 RDEPEND="${DEPEND}
59 spell? ( app-text/enchant )"
60 @@ -69,19 +71,7 @@ pkg_setup() {
61 }
62
63 src_prepare() {
64 - sed -i \
65 - -e "/intl\/Makefile/d" \
66 - -e "/po\/Makefile.in/d" \
67 - configure.ac || die
68 - sed -i -e "/SUBDIRS/s/intl//" Makefile.am || die
69 - epatch -p1 \
70 - "${FILESDIR}"/${PN}-2.9.5-autoconf-missing-macros.patch
71 epatch_user
72 - cp $(type -p gettextize) "${T}"/ || die
73 - sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" || die
74 - einfo "Running gettextize -f --no-changelog..."
75 - "${T}"/gettextize -f --no-changelog > /dev/null || die "gettexize failed"
76 - AT_M4DIR="m4" eautoreconf
77 }
78
79 src_configure() {
80
81 diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
82 index 064761a..3e10703 100644
83 --- a/net-irc/hexchat/hexchat-9999.ebuild
84 +++ b/net-irc/hexchat/hexchat-9999.ebuild
85 @@ -15,7 +15,7 @@ EGIT_REPO_URI="git://github.com/hexchat/hexchat.git"
86 LICENSE="GPL-2 plugin-fishlim? ( MIT )"
87 SLOT="0"
88 KEYWORDS=""
89 -IUSE="dbus +gtk ipv6 libcanberra libnotify libproxy nls ntlm perl +plugins plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo python spell ssl theme-manager"
90 +IUSE="dbus +gtk ipv6 libcanberra libnotify libproxy libressl nls ntlm perl +plugins plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo python spell ssl theme-manager"
91 REQUIRED_USE="plugins? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
92
93 DEPEND="dev-libs/glib:2
94 @@ -32,7 +32,10 @@ DEPEND="dev-libs/glib:2
95 python? ( ${PYTHON_DEPS} )
96 )
97 spell? ( app-text/iso-codes )
98 - ssl? ( dev-libs/openssl:0 )
99 + ssl? (
100 + !libressl? ( dev-libs/openssl:0 )
101 + libressl? ( dev-libs/libressl )
102 + )
103 theme-manager? ( dev-lang/mono )"
104 RDEPEND="${DEPEND}
105 spell? ( app-text/enchant )"