Fix multilib-nosymlink support for USE=tcl. Fix automagic dependency on dev-libs/openssl.

(Portage version: 2.2.0_alpha30-r1/cvs/Linux x86_64)

4 files changed, 179 insertions, 1 deletions

diff --git a/net-irc/xchat-gnome/ChangeLog b/net-irc/xchat-gnome/ChangeLog
index 79072f7f9752..d1114b8d8983 100644
--- a/net-irc/xchat-gnome/ChangeLog
+++ b/net-irc/xchat-gnome/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/xchat-gnome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.62 2011/03/09 16:18:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.63 2011/05/12 21:26:12 binki Exp $
+
+*xchat-gnome-0.26.1-r2 (12 May 2011)
+
+  12 May 2011; Nathan Phillip Brink <binki@gentoo.org>
+  +xchat-gnome-0.26.1-r2.ebuild, +files/xchat-gnome-0.26.1-multilib.patch,
+  +files/xchat-gnome-0.26.1-ssl-automagic.patch:
+  Fix multilib-nosymlink support for USE=tcl. Fix automagic dependency on
+  dev-libs/openssl.
 
   09 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
   xchat-gnome-0.26.1-r1.ebuild, +files/xchat-gnome-0.26.1-libnotify-0.7.patch:
diff --git a/net-irc/xchat-gnome/files/xchat-gnome-0.26.1-multilib.patch b/net-irc/xchat-gnome/files/xchat-gnome-0.26.1-multilib.patch
new file mode 100644
index 000000000000..0618921bed58
--- /dev/null
+++ b/net-irc/xchat-gnome/files/xchat-gnome-0.26.1-multilib.patch
@@ -0,0 +1,32 @@
+From d2cefae726e1db63fb578a144d7440a7826034b5 Mon Sep 17 00:00:00 2001
+From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
+Date: Mon, 9 May 2011 21:46:37 -0400
+Subject: [PATCH] Respect the value passed to --enable-tcl (which is supposed to be a directory containing tclConfig.sh).
+
+The current ./configure script will suggest to the user to specify
+``--enable-tcl=/path/to'' but it corrently completely ignores anything
+passed to --enable-tcl.
+---
+ configure.ac |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ff9ea95..62c0d8f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -260,9 +260,9 @@ AC_MSG_RESULT([$enable_tcl])
+ if test "x$have_tcl" != "xno"; then
+ 	have_tcl=no
+ 	AC_MSG_CHECKING([for tclConfig.sh])
+-	for dir in $tcl /lib /usr/lib /usr/lib/tcl8.4 /usr/tcl/lib /usr/local/lib /usr/local/tcl-8.4/lib /usr/local/tcl/lib /opt/lib; do
+-		if test -f $dir/tclConfig.sh; then
+-			. $dir/tclConfig.sh
++	for dir in "$enable_tcl" /lib /usr/lib /usr/lib/tcl8.4 /usr/tcl/lib /usr/local/lib /usr/local/tcl-8.4/lib /usr/local/tcl/lib /opt/lib; do
++		if test -f "$dir/tclConfig.sh"; then
++			. "$dir/tclConfig.sh"
+ 			TCL_LIBS="$TCL_LIB_SPEC $TCL_LIBS"
+ 			TCL_CFLAGS="-I${TCL_PREFIX}/include $TCL_INCLUDE_SPEC"
+ 			AC_SUBST([TCL_LIBS])
+-- 
+1.7.3.4
+
diff --git a/net-irc/xchat-gnome/files/xchat-gnome-0.26.1-ssl-automagic.patch b/net-irc/xchat-gnome/files/xchat-gnome-0.26.1-ssl-automagic.patch
new file mode 100644
index 000000000000..89ab752babf1
--- /dev/null
+++ b/net-irc/xchat-gnome/files/xchat-gnome-0.26.1-ssl-automagic.patch
@@ -0,0 +1,47 @@
+From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
+Date: Thu, 12 May 2011 02:34:49 -0400
+Subject: [PATCH] Add --without-openssl to ./configure
+
+Make dependency on openssl not necessarily automagic. Now
+--with-openssl will cause ./configure to die if openssl cannot be
+found. --with-openssl=auto or no argument uses the old automagic
+behavior. (Backported to xchat-gnome-0.26.1).
+---
+ configure.ac |   22 +++++++++++++++-------
+ 1 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 62c0d8f..e2fed71 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -283,15 +283,21 @@ if test "x$have_tcl" != "xno"; then
+ fi
+ 
+ # openssl
+-PKG_CHECK_MODULES([OPENSSL], [openssl], openssl=yes, openssl=no)
+-if test "x$openssl" = xyes; then
+-	AC_SUBST([OPENSSL_CFLAGS])
+-	AC_SUBST([OPENSSL_LIBS])
+-	AC_DEFINE(USE_OPENSSL, [], [Whether to use OpenSSL])
+-else
+-	AC_MSG_WARN([Library requirements (openssl) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.])
+-fi
+-AM_CONDITIONAL(USE_OPENSSL, test "x$openssl" = "xyes")
++AC_ARG_WITH([openssl], [AS_HELP_STRING([--without-openssl], [Disable SSL support using openssl])],
++	[], [with_openssl=auto])
++AS_IF([test "x$with_openssl" != "xno"],
++	[PKG_CHECK_MODULES([OPENSSL], [openssl],
++		[AC_DEFINE([USE_OPENSSL], [], [Whether to use OpenSSL])
++		with_openssl=yes
++		],
++		[openssl_not_found_msg="Library requirements (openssl) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them."
++		AS_IF([test "x$with_openssl" != "xauto"],
++			[AC_MSG_ERROR([$openssl_not_found_msg (An error because --with-openssl was specified).])],
++			[AC_MSG_WARN([$openssl_not_found_msg])])
++		with_openssl=no
++		])
++	])
++AM_CONDITIONAL([USE_OPENSSL], [test "x$with_openssl" = "xyes"])
+ 
+ # i18n
+ IT_PROG_INTLTOOL([0.40.0])
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.26.1-r2.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.26.1-r2.ebuild
new file mode 100644
index 000000000000..6e03f0e9b4a8
--- /dev/null
+++ b/net-irc/xchat-gnome/xchat-gnome-0.26.1-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.26.1-r2.ebuild,v 1.1 2011/05/12 21:26:12 binki Exp $
+
+EAPI=3
+GCONF_DEBUG="yes"
+PYTHON_DEPEND="python? 2"
+
+inherit autotools eutils multilib gnome2 python
+
+DESCRIPTION="GNOME frontend for the popular X-Chat IRC client"
+HOMEPAGE="http://xchat-gnome.navi.cx/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus libnotify mmx nls perl python spell ssl tcl"
+
+RDEPEND=">=dev-libs/glib-2.18:2
+	>=gnome-base/libgnome-2.16.0
+	>=gnome-base/gconf-2.8.0
+	>=gnome-base/libgnomeui-2.16.0
+	>=gnome-base/libglade-2.3.2
+	>=media-libs/libcanberra-0.3[gtk]
+	>=x11-libs/gtk+-2.14:2
+	>=x11-libs/libsexy-0.1.11
+	x11-libs/libX11
+	spell? ( app-text/enchant )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	perl? ( >=dev-lang/perl-5.6.1 )
+	tcl? ( dev-lang/tcl )
+	dbus? ( >=sys-apps/dbus-0.60 )
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.7
+	>=app-text/gnome-doc-utils-0.3.2
+	nls? ( sys-devel/gettext )"
+
+# gnome-base/gnome-common needed when doing eautoreconf
+
+pkg_setup() {
+	# Per configure.ac, shm is disable because of upstream bug #565958
+	# --enable-shm
+	G2CONF="${G2CONF}
+		--enable-gnomefe
+		--enable-canberra
+		--disable-schemas-install
+		--disable-scrollkeeper
+		--disable-static
+		--disable-maintainer-mode
+		$(use_with ssl openssl)
+		$(use_enable perl)
+		$(use_enable python)
+		$(use_enable tcl tcl=/usr/$(get_libdir))
+		$(use_enable mmx)
+		$(use_enable dbus)
+		$(use_enable nls)
+		$(use_enable libnotify notification)"
+
+	DOCS="AUTHORS ChangeLog NEWS"
+
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=649844
+	epatch "${FILESDIR}"/${P}-multilib.patch
+	# https://bugzilla.gnome.org/show_bug.cgi?id=650008
+	epatch "${FILESDIR}"/${P}-ssl-automagic.patch
+
+	eautoconf
+
+	gnome2_src_prepare
+
+	# Fix build with it documentation, bug #341173
+	epatch "${FILESDIR}/${PN}-0.26.1-fix-it-help.patch"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# install plugin development header
+	insinto /usr/include/xchat-gnome
+	doins src/common/xchat-plugin.h || die
+
+	# Not needed for plugins
+	find "${D}" -type f -name "*.la" -delete || die "la files removal failed"
+}