version bump, remove old

Package-Manager: portage-2.2.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

3 files changed, 64 insertions, 53 deletions

diff --git a/net-irc/hexchat/ChangeLog b/net-irc/hexchat/ChangeLog
index 516f483221ca..cf7169fbe2bd 100644
--- a/net-irc/hexchat/ChangeLog
+++ b/net-irc/hexchat/ChangeLog
@@ -1,6 +1,12 @@
 # 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.75 2013/09/11 23:21:02 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.76 2013/09/11 23:23:49 hasufell Exp $
+
+*hexchat-2.9.6 (11 Sep 2013)
+
+  11 Sep 2013; Julian Ospald <hasufell@gentoo.org>
+  -hexchat-2.9.5_p20130525.ebuild, +hexchat-2.9.6.ebuild:
+  version bump, remove old
 
   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:
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index efa9f89da5bd..8120e917cbcf 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -8,20 +8,20 @@ AUX hexchat-2.9.5-fix_leftclick_opens_menu.patch 1430 SHA256 37179c473bc3deb1740
 AUX hexchat-2.9.5-gettextize.patch 604 SHA256 b2ec1dafd439c8661aacebee78b4ea52d13955affbf536ee9f149510a299e48c SHA512 ca31a000ff96a1a30758d3d26ef8df88886b53453231e6b187f6eeaf88fc8bdb43eae349169872af8d8b2efcd72472760c1a1d2c4fa8651140c2b30b95d5bd40 WHIRLPOOL 47d838826a005f6d588ac78991be3791873f07aced5aad70820dc0e36122d80e378ae127e8475b8d382e69add922fe31116bc13601bc400c20d22816c405f20c
 AUX hexchat-2.9.5-gobject.patch 906 SHA256 53a810d814893455f81cb0777fce5f0f6f2e47b944677a5ffd5deb4dff676cca SHA512 1b34cb76373fbd9874a0666c37edae60e6b9a39b6cdff4e71b31f62ebaa1afb410b3d0246be38c2984352c4d020c5c7a3b699019cb8363e6e9b685c62372cadd WHIRLPOOL 44d8564c27e3b09bb85535e76ecc1aa9d801bcf05f913cd1db8359d7b0903b4d8862667aac6394c7f54086bd4229bd4b36d762a08317b7a20e195a50367352ca
 DIST hexchat-2.9.5.tar.xz 1309112 SHA256 11dfd0fbfb88d8dbb38f631fab8a7dffbb179f7f7dafe316953ed6f513ac623d SHA512 67eee124b6d0b690d3a43b921826af11730f995de5a697bbcac0d9dca13d44df6e33f3f2273ff1f7f86cc7dca34c091e70c4c481de49a83688522648e3252b9e WHIRLPOOL 8c3a402e030466aa79974c38901e2030cd2dc6fba6bff1eb18ecdd614541c43aaf6187e3d99cd931b3d334e671ebbdb9ce36d763a2fb1a23f60f53ac0cc54dab
-DIST hexchat-2.9.5_p20130525.tar.xz 1223400 SHA256 26591e56153d2d254ff28740fe7ece370b9f9e6d8ea0d7c30dcf0c20dc361b5f SHA512 82003b3bc3a0568aa387805f3a4e613a80f5bba0cf6d85ff002c5a15997cb6ff95a9641499a1c05d8fb2e054598eaf7f760365c3cce559dd549420a6abd161a1 WHIRLPOOL aaeebfbb7c245a26f2279c0e1e1b0a3a97f8fc5e78a7a1eff0ea9e94ebf5727297847a8c8b2dd67b0bf2c56b23d5fb770832a80e395cf00fdc0310b0776de3aa
+DIST hexchat-2.9.6.tar.xz 1704868 SHA256 eaefc07867a6e546cd9e19a4ccc976b4736c759ba3f946020eeae3cd6f4684b0 SHA512 b7ec6901527321390ecc78b03f2cc141b09d45c0e49e389081c56507aeaaa84710474f6eee62d48c95292e382f93039cada8950b3545174bab2a35fceff9a392 WHIRLPOOL d21d9d110e83ed4021bb7f8fa2018f7a3776dbd94eb226d15eec30296950267a2d5d1ac84249a0bd727d84d3b53289e048779558bc8512b33254a80ce398934c
 EBUILD hexchat-2.9.5-r1.ebuild 3980 SHA256 e5973468377ded6598bb0b2c63f269bba8eb3308fe34d66c58eb150b768a9de1 SHA512 c4c9b4d295798d6bdad8acee36701a884a5df56167ee09af73ee4d81694ab60f44b663af040cf8fb13a3426f7885a683ca33857737ba49e8dd20b18aa44b51d4 WHIRLPOOL 78956fa0139c8ee6bf426242492a7a1bfebd3f44d713e4aa42c827c51b8d36479e57038eca761df32f4da03e9c75e6787e892943e4b09e591a749a8c01faeeaa
-EBUILD hexchat-2.9.5_p20130525.ebuild 4359 SHA256 3f77657025a0c1ef57667137a822a58e2fa8a9b5786dc97b46b934b084f9f209 SHA512 81abd5d43ad49d1c51acde6cda384b1148b573bc5832f1e431d516590dd9c3648697c1878dc5319b76903f30e43f0ca722be584b28ec730d6dba89f3c1740af9 WHIRLPOOL 109c6576c5544f476b8aa382d8cfe556b7a8bf55fc668b8180b3bd65eb21d821b86b7a1efe9b325dfaf79ace39577cce0ea31f3a3f60526448da6908f21144ae
+EBUILD hexchat-2.9.6.ebuild 4337 SHA256 87a73f0c75e47fb7dc7166bb2b5cbf68e247ff25dc1f326d1918c3afebf37711 SHA512 0da04808a55edb2e7052252d107a04aa4fc5cb489eb1dcd9d6e12d115e18aa930f6270df96775d5c508e2e6b2a0df65e48eef06cbd824545e43b03c5900c7b45 WHIRLPOOL c7fff6ce651062c65baa0bf171cf1a292210af24131c53cdc3bb88f125d113fd5518da8624746cec9a06672a7592285f9eb00eec8d28b7119d41526720d3c7c0
 EBUILD hexchat-9999.ebuild 4751 SHA256 2b9ea3d6f5ba5c117e7873f04832bcd674ed4a01002a168f6b00c2a74476628b SHA512 b45f89956080a31c189ca82dcdace05174d87551a671220e7a185730ab643e72eb90cf862962e2f3e9cd01a01e5053c0d09d7ef0578b84214e856fd98fa4ad1b WHIRLPOOL 4f8b90ef6757d93f19daff0102cb832007ed6bd6f1187831fb8cd38ee80297bd27aa78e105a41257df75ca0b372961963429e0a34e37783aef8375c9b24a11f9
-MISC ChangeLog 10154 SHA256 c4240eacebb85a81e57cb14493f583823bd52241d2ef3d4bab229a1b41e80c23 SHA512 0f7525477e7c0e5b5b09adbc88f3f1a51799ff8be6b89ba8ad46322ffb0f2907cb6c3f3572f4e73730d01030f88742f669f1effc60cb16b70dbecb65e5afec1b WHIRLPOOL 34b9f5d9be8af34eaed77c14ad87bfe117e41d5a8a501e69adcac7092f657580123689514f43849381330269c4787d5f8c00fe521bf1341a3562c4756006b0e0
+MISC ChangeLog 10321 SHA256 a2996889cf919ba7b3c7c90a349488612e3c1515480122cde4a9deb1553e4b1c SHA512 4e7b01f01f348ae9c3bbaa09d6e6830f1d4ce47b25ea4750ebd0d8c3d5dc9baf2b86e3d98372616f1e9a9622a370d54c4ecdda14044c6a397c35093652144a88 WHIRLPOOL 912671979ce77a60986c58b60fad1634bb7bac69035e71af6d87cfbdafd28b555b390c19a07fafa20da3364103c804f5157a4bd3c4b8d18bd0aeeb3b39c24b55
 MISC metadata.xml 1857 SHA256 bd8a041c30ade7b290d349fc58ee71943e3441a1fe9e67931bc184de24c14e22 SHA512 5159b41ff8b1ee416c34bf73ea0270b304ec1e65519a41d794e12492a0ddd4cc07fca6ce83827c49e50746393c552485ef39ce5992081108127f9e6311505c7f WHIRLPOOL 442064cee2f98013d3b2d7b1f3f326592202872326d2ef6b2380b5e3906ac7db89b3f29fe062c1045a39b18db628505405cf84a777d67ba733b88076139dea4e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSMPrkAAoJEFpvPKfnPDWzZc4IAIzyugi6JzOs+wTXkvfWjwiD
-KM3qQ6gSbtjGoOtvkYjOSVLD6AzY0j9eZVk6Bi6gsKpLXTHJuIH4j5aO4CAGM38G
-dUDT6px/37xahV9GCqewvInTX4RYZIz91XEeWLpnNksTyLM2ZFNXyLaCjYlRBQ2Q
-QSd/IC+yl1+r7X54YytNXgLB0FnyQuia2/eTEaGPhuOi5gmol3MylCSuX2GFr9vR
-elWJHlhcMawWDLS1G/qCTNvmYcQiqKf43Y4CsvJfcIWwakVyo74bcnSNuhbrQl3u
-zBhGOUwg9594ZSRDbu/qp0kxFoN7/IlbDpp/vf3mNZpOG4j7xrw4yHC4I77jhbw=
-=Z2md
+iQEcBAEBCAAGBQJSMPuGAAoJEFpvPKfnPDWzLc0H/Am8bw9GpnpRsS8hb2nOLBhQ
+DgaJ4YlDXr3JqiPMsv4mD+2cF8EvZi6cJnwkXcmSjythBzGaeu63yv30ITQsLOVN
+NwJn0RUKOjv/Wz7gvyW5OjwyAZFkPXhZpui3zvnJyv7iwkUL+DLPqzqSQul6c5Bj
+L1k2CymhmCtK5ZVIeUeJIcgBM4uB7vmPM3I0ZjIY9NzoGWHDI3EwzU0r3CmyLms+
+Ot768s8cUG1lpLYDQZPgO1v8G2ihNDyrQLwb+qV+/a9BR91AwGsKLj6+1PFfMW3A
+KPqwGxUDFtZ8W9gJfJ7NuvIH14qrsGEr9RhwrsgYQYoWwEpAPALo93xqIunP3Bc=
+=zZK/
 -----END PGP SIGNATURE-----
diff --git a/net-irc/hexchat/hexchat-2.9.5_p20130525.ebuild b/net-irc/hexchat/hexchat-2.9.6.ebuild
index 23615ae8b6bd..30e0de47162b 100644
--- a/net-irc/hexchat/hexchat-2.9.5_p20130525.ebuild
+++ b/net-irc/hexchat/hexchat-2.9.6.ebuild
@@ -1,25 +1,28 @@
 # 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.6 2013/09/11 23:21:02 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.6.ebuild,v 1.1 2013/09/11 23:23:49 hasufell Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_6 python2_7 )
-inherit autotools eutils gnome2-utils mono-env multilib python-single-r1
+PYTHON_COMPAT=( python2_7 python3_3 )
+inherit eutils fdo-mime gnome2-utils mono-env multilib python-single-r1
 
 DESCRIPTION="Graphical IRC client based on XChat"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
 HOMEPAGE="http://hexchat.github.io/"
+SRC_URI="http://dl.hexchat.org/hexchat/hexchat-2.9.6.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="dbus fastscroll +gtk ipv6 libcanberra libnotify libproxy nls ntlm perl +plugins plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo python spell ssl theme-manager"
-REQUIRED_USE="plugin-checksum? ( plugins )
+IUSE="dbus fastscroll +gtk gtkspell ipv6 libcanberra libnotify libproxy nls ntlm perl +plugins plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo python sexy spell ssl theme-manager"
+REQUIRED_USE="gtkspell? ( spell )
+	plugin-checksum? ( plugins )
 	plugin-doat? ( plugins )
 	plugin-fishlim? ( plugins )
 	plugin-sysinfo? ( plugins )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+	python? ( ${PYTHON_REQUIRED_USE} )
+	sexy? ( spell )
+	?? ( gtkspell sexy )"
 
 RDEPEND="dev-libs/glib:2
 	dbus? ( >=dev-libs/dbus-glib-0.98 )
@@ -35,42 +38,44 @@ RDEPEND="dev-libs/glib:2
 	python? ( ${PYTHON_DEPS} )
 	spell? (
 		app-text/enchant
-		dev-libs/libxml2
+		gtkspell? ( app-text/gtkspell:2 )
+		sexy? ( x11-libs/libsexy )
+		!gtkspell? ( !sexy? ( dev-libs/libxml2 ) )
 	)
 	ssl? ( dev-libs/openssl:0 )
 	theme-manager? ( dev-lang/mono )"
 DEPEND="${RDEPEND}
+	app-arch/xz-utils
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	theme-manager? ( dev-util/monodevelop )"
 
-DOCS=""
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
-	use theme-manager && mono-env_pkg_setup
+	if use theme-manager ; then
+		mono-env_pkg_setup
+		export XDG_CACHE_HOME="${T}/.cache"
+	fi
 }
 
 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
-	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() {
+	local myspellconf
+	if use spell ; then
+		if use gtkspell ; then
+			myspellconf="--enable-spell=gtkspell"
+		elif use sexy ; then
+			myspellconf="--enable-spell=libsexy"
+		else
+			myspellconf="--enable-spell=static"
+		fi
+	else
+		myspellconf="--disable-spell"
+	fi
+
 	econf \
 		$(use_enable nls) \
 		$(use_enable libproxy socks) \
@@ -90,28 +95,21 @@ src_configure() {
 		$(use_enable libnotify) \
 		$(use_enable libcanberra) \
 		--enable-shm \
-		$(use_enable spell spell static) \
+		${myspellconf} \
 		$(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
+		$(use_enable libproxy) \
+		--enable-minimal-flags \
+		$(use_with theme-manager)
 }
 
 src_install() {
-	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
+	emake DESTDIR="${D}" \
+		UPDATE_ICON_CACHE=true \
+		UPDATE_MIME_DATABASE=true \
+		UPDATE_DESKTOP_DATABASE=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
 }
 
@@ -133,6 +131,8 @@ pkg_postinst() {
 	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
@@ -154,4 +154,9 @@ 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
 }