fix openssl dep, remove old

(Portage version: 2.2.2/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

5 files changed, 11 insertions, 154 deletions

diff --git a/net-irc/hexchat/ChangeLog b/net-irc/hexchat/ChangeLog
index dd3b516783bf..516f483221ca 100644
--- a/net-irc/hexchat/ChangeLog
+++ b/net-irc/hexchat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/hexchat
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.74 2013/09/11 22:53:49 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.75 2013/09/11 23:21:02 hasufell Exp $
+
+  11 Sep 2013; Julian Ospald <hasufell@gentoo.org> -hexchat-2.9.5.ebuild,
+  hexchat-2.9.5-r1.ebuild, hexchat-2.9.5_p20130525.ebuild, hexchat-9999.ebuild:
+  fix openssl dep, remove old
 
   11 Sep 2013; Julian Ospald <hasufell@gentoo.org> hexchat-9999.ebuild:
   use minimal flags
diff --git a/net-irc/hexchat/hexchat-2.9.5-r1.ebuild b/net-irc/hexchat/hexchat-2.9.5-r1.ebuild
index f84e9af5369c..8dd353856fa3 100644
--- a/net-irc/hexchat/hexchat-2.9.5-r1.ebuild
+++ b/net-irc/hexchat/hexchat-2.9.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5-r1.ebuild,v 1.12 2013/09/05 19:44:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5-r1.ebuild,v 1.13 2013/09/11 23:21:02 hasufell Exp $
 
 EAPI=5
 
@@ -36,7 +36,7 @@ RDEPEND="dev-libs/glib:2
 		app-text/enchant
 		dev-libs/libxml2
 	)
-	ssl? ( >=dev-libs/openssl-0.9.8u )
+	ssl? ( dev-libs/openssl:0 )
 	theme-manager? ( dev-lang/mono )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/net-irc/hexchat/hexchat-2.9.5.ebuild b/net-irc/hexchat/hexchat-2.9.5.ebuild
deleted file mode 100644
index 680744d72230..000000000000
--- a/net-irc/hexchat/hexchat-2.9.5.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5.ebuild,v 1.16 2013/09/05 19:44:53 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_6 python2_7 )
-inherit autotools eutils gnome2-utils mono multilib python-single-r1
-
-DESCRIPTION="Graphical IRC client based on XChat"
-SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.xz"
-HOMEPAGE="http://hexchat.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux"
-IUSE="dbus fastscroll +gtk ipv6 libnotify libproxy nls ntlm perl +plugins plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo python spell ssl theme-manager"
-REQUIRED_USE="plugin-checksum? ( plugins )
-	plugin-doat? ( plugins )
-	plugin-fishlim? ( plugins )
-	plugin-sysinfo? ( plugins )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/glib:2
-	dbus? ( >=dev-libs/dbus-glib-0.98 )
-	fastscroll? ( x11-libs/libXft )
-	gtk? ( x11-libs/gtk+:2 )
-	libproxy? ( net-libs/libproxy )
-	libnotify? ( x11-libs/libnotify )
-	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	perl? ( >=dev-lang/perl-5.8.0 )
-	plugin-sysinfo? ( sys-apps/pciutils )
-	python? ( ${PYTHON_DEPS} )
-	spell? (
-		app-text/enchant
-		dev-libs/libxml2
-	)
-	ssl? ( >=dev-libs/openssl-0.9.8u )
-	theme-manager? ( dev-lang/mono )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	theme-manager? ( dev-util/monodevelop )"
-
-DOCS=""
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	mkdir m4 || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-2.9.1-input-box.patch \
-		"${FILESDIR}"/${PN}-2.9.5-cflags.patch \
-		"${FILESDIR}"/${PN}-2.9.5-gettextize.patch \
-		"${FILESDIR}"/${PN}-2.9.5-gobject.patch
-	epatch -p1 \
-		"${FILESDIR}"/${PN}-2.9.5-autoconf-missing-macros.patch
-
-	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 \
-		$(use_enable nls) \
-		$(use_enable libproxy socks) \
-		$(use_enable ipv6) \
-		$(use_enable fastscroll xft) \
-		$(use_enable ssl openssl) \
-		$(use_enable gtk gtkfe) \
-		$(use_enable !gtk textfe) \
-		$(usex python "--enable-python=${EPYTHON}" "--disable-python") \
-		$(use_enable perl) \
-		$(use_enable plugins plugin) \
-		$(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 libnotify) \
-		--enable-shm \
-		$(use_enable spell spell static) \
-		$(use_enable ntlm) \
-		$(use_enable libproxy)
-}
-
-src_compile() {
-	default
-	if use theme-manager ; then
-		export XDG_CACHE_HOME="${T}/.cache"
-		cd src/htm || die
-		mdtool --verbose build htm-mono.csproj || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
-	dodoc share/doc/{readme,hacking}.md
-	use plugin-fishlim && dodoc share/doc/fishlim.md
-	if use theme-manager ; then
-		dobin src/htm/thememan.exe
-		make_wrapper thememan "mono /usr/bin/thememan.exe"
-	fi
-	prune_libtool_files --all
-}
-
-pkg_preinst() {
-	if use gtk ; then
-		gnome2_icon_savelist
-		gnome2_gconf_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use !gtk ; then
-		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\"."
-	else
-		gnome2_icon_cache_update
-		gnome2_gconf_install
-	fi
-
-	if use theme-manager ; then
-		einfo
-		elog "Themes are available at:"
-		elog "  http://hexchat.org/themes.html"
-	fi
-
-	ewarn
-	ewarn "If you're upgrading from hexchat <=2.9.3 remember to rename"
-	ewarn "the xchat.conf file found in ~/.config/hexchat/ to hexchat.conf"
-	ewarn
-}
-
-pkg_postrm() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/net-irc/hexchat/hexchat-2.9.5_p20130525.ebuild b/net-irc/hexchat/hexchat-2.9.5_p20130525.ebuild
index 8775a02e368a..23615ae8b6bd 100644
--- a/net-irc/hexchat/hexchat-2.9.5_p20130525.ebuild
+++ b/net-irc/hexchat/hexchat-2.9.5_p20130525.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5_p20130525.ebuild,v 1.5 2013/07/11 20:19:46 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5_p20130525.ebuild,v 1.6 2013/09/11 23:21:02 hasufell Exp $
 
 EAPI=5
 
@@ -37,7 +37,7 @@ RDEPEND="dev-libs/glib:2
 		app-text/enchant
 		dev-libs/libxml2
 	)
-	ssl? ( >=dev-libs/openssl-0.9.8u )
+	ssl? ( dev-libs/openssl:0 )
 	theme-manager? ( dev-lang/mono )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index aa3d99815065..5e05f1cb4393 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-9999.ebuild,v 1.6 2013/09/11 22:53:49 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-9999.ebuild,v 1.7 2013/09/11 23:21:02 hasufell Exp $
 
 EAPI=5
 
@@ -43,7 +43,7 @@ RDEPEND="dev-libs/glib:2
 		sexy? ( x11-libs/libsexy )
 		!gtkspell? ( !sexy? ( dev-libs/libxml2 ) )
 	)
-	ssl? ( >=dev-libs/openssl-0.9.8u )
+	ssl? ( dev-libs/openssl:0 )
 	theme-manager? ( dev-lang/mono )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig