[gentoo-commits] gentoo-x86 commit in net-irc/hexchat: ChangeLog hexchat-9999.ebuild metadata.xml

[Julian Ospald (hasufell)]

hasufell    13/08/27 09:22:44

  Modified:             ChangeLog hexchat-9999.ebuild metadata.xml
  Log:
  update live-ebuild
  
  (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

Revision  Changes    Path
1.69                 net-irc/hexchat/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/hexchat/ChangeLog?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/hexchat/ChangeLog?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/hexchat/ChangeLog?r1=1.68&r2=1.69

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ChangeLog	26 Aug 2013 12:31:34 -0000	1.68
+++ ChangeLog	27 Aug 2013 09:22:44 -0000	1.69
@@ -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.68 2013/08/26 12:31:34 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.69 2013/08/27 09:22:44 hasufell Exp $
+
+  27 Aug 2013; Julian Ospald <hasufell@g.o> hexchat-9999.ebuild,
+  metadata.xml:
+  update live-ebuild
 
 *hexchat-9999 (26 Aug 2013)
 



1.2                  net-irc/hexchat/hexchat-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/hexchat/hexchat-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/hexchat/hexchat-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/hexchat/hexchat-9999.ebuild?r1=1.1&r2=1.2

Index: hexchat-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hexchat-9999.ebuild	26 Aug 2013 12:31:34 -0000	1.1
+++ hexchat-9999.ebuild	27 Aug 2013 09:22:44 -0000	1.2
@@ -1,11 +1,11 @@
 # 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.1 2013/08/26 12:31:34 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-9999.ebuild,v 1.2 2013/08/27 09:22:44 hasufell Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_6 python2_7 )
-inherit autotools eutils gnome2-utils mono-env multilib python-single-r1 git-2
+PYTHON_COMPAT=( python2_7 python3_3 )
+inherit autotools eutils fdo-mime gnome2-utils mono-env multilib python-single-r1 git-2
 
 DESCRIPTION="Graphical IRC client based on XChat"
 HOMEPAGE="http://hexchat.github.io/"
@@ -15,12 +15,15 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-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 )
@@ -36,7 +39,9 @@
 	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.9.8u )
 	theme-manager? ( dev-lang/mono )"
@@ -59,6 +64,7 @@
 		-e "/po\/Makefile.in/d" \
 		configure.ac || die
 	sed -i -e "/SUBDIRS/s/intl//" Makefile.am || die
+	sed -i -e 's/Exec=.*$/Exec=thememan %f/' share/misc/htm.desktop || die
 	epatch -p1 \
 		"${FILESDIR}"/${PN}-2.9.5-autoconf-missing-macros.patch
 	epatch_user
@@ -70,6 +76,19 @@
 }
 
 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) \
@@ -89,7 +108,7 @@
 		$(use_enable libnotify) \
 		$(use_enable libcanberra) \
 		--enable-shm \
-		$(use_enable spell spell static) \
+		${myspellconf} \
 		$(use_enable ntlm) \
 		$(use_enable libproxy)
 }
@@ -110,6 +129,9 @@
 	if use theme-manager ; then
 		dobin src/htm/thememan.exe
 		make_wrapper thememan "mono /usr/bin/thememan.exe"
+		domenu share/misc/htm.desktop
+		insinto /usr/share/mime/packages
+		newins share/misc/htm-mime.xml htm.xml
 	fi
 	prune_libtool_files --all
 }
@@ -118,6 +140,11 @@
 	if use gtk ; then
 		gnome2_icon_savelist
 	fi
+
+	if use theme-manager ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+	fi
 }
 
 pkg_postinst() {
@@ -132,6 +159,8 @@
 	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



1.8                  net-irc/hexchat/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/hexchat/metadata.xml?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/hexchat/metadata.xml?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/hexchat/metadata.xml?r1=1.7&r2=1.8

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/hexchat/metadata.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- metadata.xml	4 Aug 2013 17:40:37 -0000	1.7
+++ metadata.xml	27 Aug 2013 09:22:44 -0000	1.8
@@ -13,16 +13,26 @@
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
 	<use>
-		<flag name='fastscroll'>Make scrolling of large text buffers faster by
-		circumventing some of pango's overhead</flag>
+		<flag name='fastscroll'>Make scrolling of large text buffers
+			faster by
+			circumventing some of pango's overhead</flag>
+		<flag name='gtkspell'>Use <pkg>app-text/gtkspell</pkg> for spell
+			checking instead of static method</flag>
 		<flag name='ntlm'>Enable NTLM authentication</flag>
-		<flag name='libcanberra'>Enable sound event support using <pkg>media-libs/libcanberra</pkg></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='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)</flag>
+		<flag name='plugin-fishlim'>Build FiSHLiM plugin (needs plugins
+			)</flag>
+		<flag name='plugin-sysinfo'>Build SysInfo plugin (needs plugins)
+		</flag>
+		<flag name='sexy'>Use <pkg>x11-libs/libsexy</pkg> for spell
+			checking instead of static method</flag>
 		<flag name='theme-manager'>Build the theme manager (mono)</flag>
 	</use>
 	<upstream>