revbump: rework, add theme-manager, fix deps, convert to plugin-<..> syntax, use python-single-r1, fix build system instead of sedding it, use eautoreconf rather than autogen.sh, remove obsolete sed, update icon cache and gconf schemas properly

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

4 files changed, 300 insertions, 1 deletions

diff --git a/net-irc/hexchat/ChangeLog b/net-irc/hexchat/ChangeLog
index 38dfd0db1a9f..c5b0414ab4ab 100644
--- a/net-irc/hexchat/ChangeLog
+++ b/net-irc/hexchat/ChangeLog
@@ -1,6 +1,15 @@
 # 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.34 2013/03/31 02:39:23 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.35 2013/03/31 14:29:27 hasufell Exp $
+
+*hexchat-2.9.4-r1 (31 Mar 2013)
+
+  31 Mar 2013; Julian Ospald <hasufell@gentoo.org> +hexchat-2.9.4-r1.ebuild,
+  +files/hexchat-2.9.4-build.patch, metadata.xml:
+  revbump: rework, add theme-manager, fix deps, convert to plugin-<..> syntax,
+  use python-single-r1, fix build system instead of sedding it, use eautoreconf
+  rather than autogen.sh, remove obsolete sed, update icon cache and gconf
+  schemas properly
 
   31 Mar 2013; Julian Ospald <hasufell@gentoo.org> metadata.xml:
   add myself to metadata.xml
diff --git a/net-irc/hexchat/files/hexchat-2.9.4-build.patch b/net-irc/hexchat/files/hexchat-2.9.4-build.patch
new file mode 100644
index 000000000000..423c225a28a3
--- /dev/null
+++ b/net-irc/hexchat/files/hexchat-2.9.4-build.patch
@@ -0,0 +1,142 @@
+* not having gtk installed will lead to undefined macro
+* not an intltool package, remove references
+* po/Makefile.in will be generated by gettextize
+* use modern icon destination
+* don't install icons when gtk is disabled
+* disable gconf when gtk is disabled
+* install plugin header
+* allow to pass specific python version
+
+--- hexchat-2.9.4/configure.ac
++++ hexchat-2.9.4/configure.ac
+@@ -115,8 +115,8 @@
+         xlib=$enableval, xlib=yes)
+ 
+ AC_ARG_ENABLE(python,
+-	[AS_HELP_STRING([--disable-python],[don't build the python plugin])],
+-        python=$enableval, python=yes)
++	[AS_HELP_STRING([--enable-python=pythonversion],[build the python plugin (default on, python2)])],
++        python=$enableval, python=python2)
+ 
+ AC_ARG_ENABLE(perl,
+ 	[AS_HELP_STRING([--disable-perl],[don't build the perl plugin])],
+@@ -200,13 +200,16 @@
+ dnl ** GTK **************************************************************
+ dnl *********************************************************************
+ 
+-AM_PATH_GTK_2_0(2.10.0, havegtk=yes, havegtk=no)
+-
+-if test "$havegtk" = no; then
+-	gtkfe=no
+-	echo
+-	echo Cannot find GTK\! Not building GTK FrontEnd.
+-	echo
++# we might get undefined macro without this test
++if test "$gtkfe" = yes ; then
++	AM_PATH_GTK_2_0(2.10.0, havegtk=yes, havegtk=no)
++
++	if test "$havegtk" = no; then
++		gtkfe=no
++		echo
++		echo Cannot find GTK\! Not building GTK FrontEnd.
++		echo
++	fi
+ fi
+ 
+ if test "$gtkfe" != yes; then
+@@ -222,7 +225,6 @@
+ GUI_LIBS="$GUI_LIBS $GTK_LIBS"
+ GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS"
+ 
+-gnome=no
+ #if test "$gnome" = yes; then
+ #	AC_PATH_PROG(pkgconfigpath, pkg-config)
+ #	AC_MSG_CHECKING(Gnome2 compile flags)
+@@ -240,7 +242,11 @@
+ #fi
+ 
+ # GConf
+-AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
++if test "$gnome" != no ; then
++	AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
++else
++	GCONFTOOL=no
++fi
+ 
+ dnl *********************************************************************
+ dnl ** XFT **************************************************************
+@@ -329,9 +335,13 @@
+ dnl ** PYTHON ***********************************************************
+ dnl *********************************************************************
+ 
+-if test "$python" = yes; then
+-        AC_PATH_PROG(pythonpath, python2)
+-        if test "_$pythonpath" = _ ; then
++if test "x$python" != xno ; then
++	if test "$python" = yes ; then
++		# default
++		python="python2"
++	fi
++        AC_PATH_PROG(pythonpath, $python)
++       	if test "_$pythonpath" = _ ; then
+                 AC_PATH_PROG(pythonpath, python)
+         fi
+         if test "_$pythonpath" = _ ; then
+@@ -358,7 +368,7 @@
+                                 AC_MSG_RESULT([Can't find Python.h])
+                         fi
+                 else
+-                        echo "Python too old. Only 2.2 or above is supported."
++                        echo "Python is too old or too new. Only 2.2-2.7 are supported."
+                         python=no
+                 fi
+         fi
+@@ -691,7 +701,7 @@
+ AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes")
+ AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes")
+ AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes")
+-AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes")
++AM_CONDITIONAL(DO_PYTHON, test "x$python" != "xno")
+ AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes")
+ AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes")
+ AM_CONDITIONAL(DO_CHECKSUM, test "x$checksum" = "xyes")
+@@ -964,8 +974,6 @@
+ plugins/doat/Makefile
+ plugins/fishlim/Makefile
+ plugins/sysinfo/Makefile
+-intl/Makefile
+-po/Makefile.in
+ man/Makefile
+ ])
+ dnl plugins/sasl/Makefile
+--- hexchat-2.9.4/Makefile.am
++++ hexchat-2.9.4/Makefile.am
+@@ -1,13 +1,15 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS = po intl src plugins man
++SUBDIRS = po src plugins man
+ 
+ EXTRA_DIST = autogen.sh
+ 
++if DO_GTK
+ icon_DATA = src/pixmaps/hexchat.png
+-icondir = $(datadir)/pixmaps
++icondir = $(datadir)/icons/hicolor/48x48/apps
+ 
+ util_DATA = share/misc/hexchat.desktop
+ utildir = $(datadir)/applications
++endif
+ 
+ ACLOCAL_AMFLAGS = -I m4
+--- hexchat-2.9.4/src/common/Makefile.am
++++ hexchat-2.9.4/src/common/Makefile.am
+@@ -52,6 +52,8 @@
+ endif
+ SUBDIRS = $(dbusdir) .
+ 
++include_HEADERS = hexchat-plugin.h
++
+ libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c hexchat.c \
+ 	history.c ignore.c inbound.c modes.c msproxy.c network.c notify.c \
+ 	outbound.c plugin.c plugin-timer.c proto-irc.c server.c servlist.c \
diff --git a/net-irc/hexchat/hexchat-2.9.4-r1.ebuild b/net-irc/hexchat/hexchat-2.9.4-r1.ebuild
new file mode 100644
index 000000000000..03d2eb2456d0
--- /dev/null
+++ b/net-irc/hexchat/hexchat-2.9.4-r1.ebuild
@@ -0,0 +1,143 @@
+# 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.4-r1.ebuild,v 1.1 2013/03/31 14:29:27 hasufell Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+inherit autotools eutils gnome2-utils mono multilib flag-o-matic python-single-r1
+
+DESCRIPTION="Graphical IRC client based on XChat"
+SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.xz"
+HOMEPAGE="http://www.hexchat.org/"
+
+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 threads"
+REQUIRED_USE="plugin-checksum? ( plugins )
+	plugin-doat? ( plugins )
+	plugin-fishlim? ( plugins )
+	plugin-sysinfo? ( plugins )"
+
+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? ( 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="share/doc/changelog.md share/doc/readme.md"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	# Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
+	if [[ ${ARCH} = sparc ]] ; then
+		replace-flags "-O[3-9]" "-O2"
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.9.1-input-box.patch \
+		"${FILESDIR}"/${PN}-2.9.3-cflags.patch \
+		"${FILESDIR}"/${PN}-2.9.4-build.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"
+	eautoreconf
+}
+
+src_configure() {
+	# tcl is deprecated/unsupported
+	econf \
+		--disable-tcl \
+		--enable-shm \
+		$(use_enable dbus) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable ntlm) \
+		$(use_enable perl) \
+		$(usex python "--enable-python=${EPYTHON}" "--disable-python") \
+		$(use_enable spell spell static) \
+		$(use_enable ssl openssl) \
+		$(use_enable gtk gtkfe) \
+		$(use_enable !gtk textfe) \
+		$(use_enable fastscroll xft) \
+		$(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 libproxy) \
+		$(use_enable libproxy socks) \
+		$(use_enable threads)
+}
+
+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() {
+	default
+	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/metadata.xml b/net-irc/hexchat/metadata.xml
index 315570d6c79d..3ef713460668 100644
--- a/net-irc/hexchat/metadata.xml
+++ b/net-irc/hexchat/metadata.xml
@@ -17,5 +17,10 @@
 		<flag name='ntlm'>Enable NTLM authentication</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)</flag>
+		<flag name='theme-manager'>Build the theme manager (mono)</flag>
   </use>
 </pkgmetadata>