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

[Lars Wendler]

commit:     27ff1000382449f4d75ff876985ae4a3d6d4957e
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  5 17:27:07 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 17:27:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27ff1000

net-irc/hexchat: Security cleanup (bug #606496).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-irc/hexchat/Manifest                 |   2 -
 net-irc/hexchat/hexchat-2.10.2.ebuild    | 171 -------------------------------
 net-irc/hexchat/hexchat-2.12.2-r1.ebuild | 147 --------------------------
 net-irc/hexchat/metadata.xml             |   4 -
 4 files changed, 324 deletions(-)

diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index f9d2ae0..ee65720 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -1,3 +1 @@
-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
 DIST hexchat-2.12.4.tar.xz 1451468 SHA256 fa35913158bbc7d0d99de79371b6df3e8d21802f1d2c7c92f0e5db694acf2c3a SHA512 48d30c23973a19efc7a8e6d00a3e9675e8556a6fa9da046175b3d87bdab0bebbc6caf58970d654e270421d0d49c2cd9f498b425b7e3a49dd81670dc4825fca40 WHIRLPOOL f0e48900c9cf048ad6238338630788197865bf649d4d373a3905b7dffd0076cbdeffc6bd14602fdb5924f6da5bb422739cde7f05b844482735157bb0ba39e712

diff --git a/net-irc/hexchat/hexchat-2.10.2.ebuild b/net-irc/hexchat/hexchat-2.10.2.ebuild
deleted file mode 100644
index efc5be9..00000000
--- a/net-irc/hexchat/hexchat-2.10.2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-inherit eutils fdo-mime gnome2-utils mono-env multilib python-single-r1
-
-DESCRIPTION="Graphical IRC client based on XChat"
-HOMEPAGE="http://hexchat.github.io/"
-SRC_URI="https://dl.hexchat.net/hexchat/${P}.tar.xz"
-
-LICENSE="GPL-2 plugin-fishlim? ( MIT )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux"
-IUSE="dbus +gtk ipv6 libcanberra libnotify libproxy nls ntlm perl +plugins plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo python spell ssl theme-manager"
-REQUIRED_USE="plugins? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
-
-DEPEND="dev-libs/glib:2
-	dbus? ( >=dev-libs/dbus-glib-0.98 )
-	gtk? ( x11-libs/gtk+:2 )
-	libcanberra? ( media-libs/libcanberra )
-	libproxy? ( net-libs/libproxy )
-	libnotify? ( x11-libs/libnotify )
-	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	plugins? (
-		perl? ( >=dev-lang/perl-5.8.0 )
-		plugin-sysinfo? ( sys-apps/pciutils )
-		python? ( ${PYTHON_DEPS} )
-	)
-	spell? ( app-text/iso-codes )
-	ssl? ( dev-libs/openssl:0 )
-	theme-manager? ( dev-lang/mono )"
-RDEPEND="${DEPEND}
-	spell? ( app-text/enchant )"
-DEPEND="${DEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-	theme-manager? ( dev-util/monodevelop )"
-
-pkg_setup() {
-	use plugins && 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() {
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		$(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 dbus) \
-		$(use_enable libnotify) \
-		$(use_enable libcanberra) \
-		$(use_enable ntlm) \
-		$(use_enable libproxy) \
-		$(use_enable spell isocodes) \
-		--enable-minimal-flags \
-		$(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
-	prune_libtool_files --all
-}
-
-pkg_preinst() {
-	if use gtk ; then
-		gnome2_icon_savelist
-	fi
-}
-
-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
-	fi
-
-	einfo
-	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() {
-	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-2.12.2-r1.ebuild b/net-irc/hexchat/hexchat-2.12.2-r1.ebuild
deleted file mode 100644
index 0b74edb..00000000
--- a/net-irc/hexchat/hexchat-2.12.2-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# 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[minimal] dev-dotnet/libgdiplus )
-			dev-lang/mono[-minimal]
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	spell? ( app-text/enchant )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	dev-util/intltool
-	theme-manager? ( dev-util/monodevelop )"
-
-PATCHES=(
-	"${FILESDIR}/hexchat-2.12.2-configure.ac-remove-werror.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-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/metadata.xml b/net-irc/hexchat/metadata.xml
index c058b0b..93c94f8 100644
--- a/net-irc/hexchat/metadata.xml
+++ b/net-irc/hexchat/metadata.xml
@@ -21,15 +21,11 @@
 		<description>Proxy maintainer for Nicholas and Anthony</description>
 	</maintainer>
 	<use>
-		<flag name="ntlm">Enable NTLM authentication</flag>
 		<flag name="libcanberra">Enable sound event support using
 			<pkg>media-libs/libcanberra</pkg></flag>
 		<flag name="libproxy">Enable proxy support.</flag>
-		<flag name="plugins">Enable plugin support and installs some
-			built-in plugins</flag>
 		<flag name="plugin-checksum">Build Checksum plugin
 			(needs plugins)</flag>
-	    <flag name="plugin-doat">Build Do At plugin (needs plugins)</flag>
 		<flag name="plugin-fishlim">Build FiSHLiM plugin (needs plugins
 			)</flag>
 		<flag name="plugin-sysinfo">Build SysInfo plugin (needs plugins)