[gentoo-commits] repo/gentoo:master commit in: net-irc/hexchat/

[Lars Wendler]

commit:     6f7cab7b12ddc568b0aa0a9239905517e61478cb
Author:     Anthony Ryan <anthonyryan1 <AT> gmail <DOT> com>
AuthorDate: Thu Oct  6 20:59:11 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 08:00:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f7cab7b

net-irc/hexchat: version bump 2.12.2

Gentoo-bug: 582952, 528052, 592568

* EAPI 6
* Removed USE=ipv6 (required by upstream)
* Added USE=debug
* Removed USE=ntlm (removed by upstream)
* Removed USE=plugins (required for simplicity)
* Removed eutils & multilib
Closes: https://github.com/gentoo/gentoo/pull/2498

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-irc/hexchat/Manifest              |   1 +
 net-irc/hexchat/hexchat-2.12.2.ebuild | 139 +++++++++++++++++++++++++++++++++
 net-irc/hexchat/hexchat-9999.ebuild   | 142 +++++++++++-----------------------
 3 files changed, 187 insertions(+), 95 deletions(-)

diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 61a199a..515ff8d 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -1 +1,2 @@
 DIST hexchat-2.10.2.tar.xz 1529732 SHA256 87ebf365c576656fa3f23f51d319b3a6d279e4a932f2f8961d891dd5a5e1b52c SHA512 799be6ca02d4f7bad98c005e0fb7dba151717b52841d7f2dd3ed86b80a20de934825a1e58aab4621ac751a605103e68e368a95e9709c48f52b9e5333e5e290ab WHIRLPOOL 5d8dcd59941a145544bbde2e761db092e801036d6879a0eb3a8b48ece43c02c78df88c889304ac1b4594e89cd68fccc02cd1239d6b60b4a0c13a5156f28154a7
+DIST hexchat-2.12.2.tar.xz 1600156 SHA256 6dad783f37aac32a8301a12d498af7a74900f011aec4e77bb378ae9797a3ccf6 SHA512 848ce16423e84ce3b019d4f0308eee0593a250a6441c7487ddafdff0b92d95e38de1b9edbcf8710522eef3016ec549a8c338bbe82d1f649523b56f4e81059417 WHIRLPOOL ee0c1ac39f57600a2bb4d08b00d996a0bae12c99e5a1f9a0aa9b02122226d4af35215ab2b4d9f4038afd9b876589331e2e05123b1e9fbf0a2ea29b9a1fd0e667

diff --git a/net-irc/hexchat/hexchat-2.12.2.ebuild b/net-irc/hexchat/hexchat-2.12.2.ebuild
new file mode 100644
index 00000000..530b157
--- /dev/null
+++ b/net-irc/hexchat/hexchat-2.12.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit autotools fdo-mime gnome2-utils mono-env python-single-r1
+
+DESCRIPTION="Graphical IRC client based on XChat"
+HOMEPAGE="https://hexchat.github.io/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="git://github.com/hexchat/hexchat.git"
+else
+	SRC_URI="https://dl.hexchat.net/hexchat/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+fi
+
+LICENSE="GPL-2 plugin-fishlim? ( MIT )"
+SLOT="0"
+IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua nls perl plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo python spell ssl theme-manager"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="dev-libs/glib:2
+	dbus? ( sys-apps/dbus )
+	gtk? ( x11-libs/gtk+:2 )
+	libcanberra? ( media-libs/libcanberra )
+	libproxy? ( net-libs/libproxy )
+	libnotify? ( x11-libs/libnotify )
+	lua? ( dev-lang/lua:= )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl )
+	plugin-sysinfo? ( sys-apps/pciutils )
+	python? ( ${PYTHON_DEPS} )
+	spell? ( app-text/iso-codes )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	theme-manager? ( dev-lang/mono )"
+RDEPEND="${COMMON_DEPEND}
+	spell? ( app-text/enchant )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	dev-util/intltool
+	theme-manager? ( dev-util/monodevelop )"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]]; then
+		eautoreconf
+	fi
+	default
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	if use theme-manager ; then
+		mono-env_pkg_setup
+		export XDG_CACHE_HOME="${T}/.cache"
+	fi
+}
+
+src_configure() {
+	econf \
+		--enable-plugin \
+		$(use_enable nls) \
+		$(use_enable ssl openssl) \
+		$(use_enable gtk gtkfe) \
+		$(use_enable !gtk textfe) \
+		$(use_enable python python "${EPYTHON}") \
+		$(use_enable perl) \
+		$(use_enable plugin-checksum checksum) \
+		$(use_enable plugin-doat doat) \
+		$(use_enable plugin-fishlim fishlim) \
+		$(use_enable plugin-sysinfo sysinfo) \
+		$(use_enable dbus) \
+		$(use_enable lua) \
+		$(use_enable libnotify) \
+		$(use_enable libcanberra) \
+		$(use_enable libproxy) \
+		$(use_enable spell isocodes) \
+		$(use_enable debug) \
+		$(use_with theme-manager)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		UPDATE_ICON_CACHE=true \
+		UPDATE_MIME_DATABASE=true \
+		UPDATE_DESKTOP_DATABASE=true \
+		install
+	dodoc readme.md
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	if use gtk ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gtk ; then
+		gnome2_icon_cache_update
+	else
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
+	fi
+
+	if use theme-manager ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		elog "Themes are available at:"
+		elog "  https://hexchat.github.io/themes.html"
+	fi
+
+	elog
+	elog "optional dependencies:"
+	elog "  media-sound/sox (sound playback if you don't have libcanberra"
+	elog "    enabled)"
+	elog "  x11-plugins/hexchat-javascript (javascript support)"
+	elog "  x11-themes/sound-theme-freedesktop (default BEEP sound,"
+	elog "    needs libcanberra enabled)"
+}
+
+pkg_postrm() {
+	if use gtk ; then
+		gnome2_icon_cache_update
+	fi
+
+	if use theme-manager ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+	fi
+}

diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index 3e10703..530b157 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -1,132 +1,89 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-inherit autotools eutils fdo-mime gnome2-utils mono-env multilib python-single-r1 git-2
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit autotools fdo-mime gnome2-utils mono-env python-single-r1
 
 DESCRIPTION="Graphical IRC client based on XChat"
-HOMEPAGE="http://hexchat.github.io/"
-SRC_URI=""
-EGIT_REPO_URI="git://github.com/hexchat/hexchat.git"
+HOMEPAGE="https://hexchat.github.io/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="git://github.com/hexchat/hexchat.git"
+else
+	SRC_URI="https://dl.hexchat.net/hexchat/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+fi
 
 LICENSE="GPL-2 plugin-fishlim? ( MIT )"
 SLOT="0"
-KEYWORDS=""
-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"
-REQUIRED_USE="plugins? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
+IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua nls perl plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo python spell ssl theme-manager"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-DEPEND="dev-libs/glib:2
-	dbus? ( >=dev-libs/dbus-glib-0.98 )
+COMMON_DEPEND="dev-libs/glib:2
+	dbus? ( sys-apps/dbus )
 	gtk? ( x11-libs/gtk+:2 )
 	libcanberra? ( media-libs/libcanberra )
 	libproxy? ( net-libs/libproxy )
 	libnotify? ( x11-libs/libnotify )
+	lua? ( dev-lang/lua:= )
 	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	plugins? (
-		perl? ( >=dev-lang/perl-5.8.0 )
-		plugin-sysinfo? ( sys-apps/pciutils )
-		python? ( ${PYTHON_DEPS} )
-	)
+	perl? ( dev-lang/perl )
+	plugin-sysinfo? ( sys-apps/pciutils )
+	python? ( ${PYTHON_DEPS} )
 	spell? ( app-text/iso-codes )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
 	)
 	theme-manager? ( dev-lang/mono )"
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	spell? ( app-text/enchant )"
-DEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
 	app-arch/xz-utils
 	virtual/pkgconfig
-	nls? ( dev-util/intltool )
+	dev-util/intltool
 	theme-manager? ( dev-util/monodevelop )"
 
+src_prepare() {
+	if [[ ${PV} == "9999" ]]; then
+		eautoreconf
+	fi
+	default
+}
+
 pkg_setup() {
-	use plugins && use python && python-single-r1_pkg_setup
+	use python && python-single-r1_pkg_setup
 	if use theme-manager ; then
 		mono-env_pkg_setup
 		export XDG_CACHE_HOME="${T}/.cache"
 	fi
-
-	if use !plugins ; then
-		local myplugins
-
-		use perl && myplugins+="perl\n"
-		use python && myplugins+="python\n"
-		use plugin-checksum && myplugins+="plugin-checksum\n"
-		use plugin-doat && myplugins+="plugin-doat\n"
-		use plugin-fishlim && myplugins+="plugin-fishlim\n"
-		use plugin-sysinfo && myplugins+="plugin-sysinfo\n"
-
-		if [[ ${myplugins} ]] ; then
-			ewarn "The following plugins/interfaces have been disabled, because"
-			ewarn "\"plugins\" USE flag is disabled. Check metadata.xml"
-			ewarn "to get more information or run \"equery u hexchat\"."
-			ewarn "\n${myplugins}"
-		fi
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e "/intl\/Makefile/d" \
-		-e "/po\/Makefile.in/d" \
-		configure.ac || die
-	sed -i -e "/SUBDIRS/s/intl//" Makefile.am || die
-	epatch -p1 \
-		"${FILESDIR}"/${PN}-2.9.5-autoconf-missing-macros.patch
-	epatch_user
-	cp $(type -p gettextize) "${T}"/ || die
-	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" || die
-	einfo "Running gettextize -f --no-changelog..."
-	"${T}"/gettextize -f --no-changelog > /dev/null || die "gettexize failed"
-	AT_M4DIR="m4" eautoreconf
 }
 
 src_configure() {
 	econf \
+		--enable-plugin \
 		$(use_enable nls) \
-		$(use_enable libproxy socks) \
-		$(use_enable ipv6) \
 		$(use_enable ssl openssl) \
 		$(use_enable gtk gtkfe) \
 		$(use_enable !gtk textfe) \
-		$(usex plugins \
-			"$(usex python "--enable-python=${EPYTHON}" "--disable-python")" \
-			"--disable-python" \
-			) \
-		$(usex plugins \
-			"$(use_enable perl)" \
-			"--disable-perl" \
-			) \
-		$(use_enable plugins plugin) \
-		$(usex plugins \
-			"$(use_enable plugin-checksum checksum)" \
-			"--disable-checksum" \
-			) \
-		$(usex plugins \
-			"$(use_enable plugin-doat doat)" \
-			"--disable-doat" \
-			) \
-		$(usex plugins \
-			"$(use_enable plugin-fishlim fishlim)" \
-			"--disable-fishlim" \
-			) \
-		$(usex plugins \
-			"$(use_enable plugin-sysinfo sysinfo)" \
-			"--disable-sysinfo" \
-			) \
+		$(use_enable python python "${EPYTHON}") \
+		$(use_enable perl) \
+		$(use_enable plugin-checksum checksum) \
+		$(use_enable plugin-doat doat) \
+		$(use_enable plugin-fishlim fishlim) \
+		$(use_enable plugin-sysinfo sysinfo) \
 		$(use_enable dbus) \
+		$(use_enable lua) \
 		$(use_enable libnotify) \
 		$(use_enable libcanberra) \
-		$(use_enable ntlm) \
 		$(use_enable libproxy) \
 		$(use_enable spell isocodes) \
-		--enable-minimal-flags \
+		$(use_enable debug) \
 		$(use_with theme-manager)
 }
 
@@ -137,7 +94,7 @@ src_install() {
 		UPDATE_DESKTOP_DATABASE=true \
 		install
 	dodoc readme.md
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_preinst() {
@@ -149,30 +106,25 @@ pkg_preinst() {
 pkg_postinst() {
 	if use gtk ; then
 		gnome2_icon_cache_update
-		einfo
 	else
-		einfo
 		elog "You have disabled the gtk USE flag. This means you don't have"
 		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
-		elog
 	fi
 
 	if use theme-manager ; then
 		fdo-mime_desktop_database_update
 		fdo-mime_mime_database_update
 		elog "Themes are available at:"
-		elog "  http://hexchat.org/themes.html"
-		elog
+		elog "  https://hexchat.github.io/themes.html"
 	fi
 
-	einfo
+	elog
 	elog "optional dependencies:"
 	elog "  media-sound/sox (sound playback if you don't have libcanberra"
 	elog "    enabled)"
 	elog "  x11-plugins/hexchat-javascript (javascript support)"
 	elog "  x11-themes/sound-theme-freedesktop (default BEEP sound,"
 	elog "    needs libcanberra enabled)"
-	einfo
 }
 
 pkg_postrm() {