Drop old files, bump to latest beta release

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

6 files changed, 113 insertions, 148 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 70f0af6c9e7f..47e8bffe48a6 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.130 2012/03/18 08:58:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.131 2012/03/18 09:35:51 jlec Exp $
+
+*gajim-0.15_beta4 (18 Mar 2012)
+
+  18 Mar 2012; Justin Lecher <jlec@gentoo.org>
+  -files/0.13.4-python-version.patch,
+  -files/gajim-0.13-autotools-enable-site-packages_option.patch,
+  gajim-0.14.4-r2.ebuild, +gajim-0.15_beta4.ebuild, -files/0.14.1-link.patch:
+  Drop old files, bump to latest beta release
 
   18 Mar 2012; Justin Lecher <jlec@gentoo.org> -gajim-0.14.4.ebuild,
   gajim-0.14.4-r1.ebuild, gajim-0.14.4-r2.ebuild:
diff --git a/net-im/gajim/files/0.13.4-python-version.patch b/net-im/gajim/files/0.13.4-python-version.patch
deleted file mode 100644
index 1fbc503e244a..000000000000
--- a/net-im/gajim/files/0.13.4-python-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/scripts/gajim.in b/scripts/gajim.in
-index 711ddac..0098b9e 100644
---- a/scripts/gajim.in
-+++ b/scripts/gajim.in
-@@ -30,7 +30,7 @@ fi
- [ "$APP" = "gajim-history-manager" ] && APP="history_manager"
- 
- export datadir=@DATADIR@/gajim
--PYTHON_EXEC=@PYTHON@
-+PYTHON_EXEC=@PYTHON@@PYTHON_VERSION@
- 
- cd ${datadir}/src
- export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
diff --git a/net-im/gajim/files/0.14.1-link.patch b/net-im/gajim/files/0.14.1-link.patch
deleted file mode 100644
index 9f4bb6ee5936..000000000000
--- a/net-im/gajim/files/0.14.1-link.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/chat_control.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/chat_control.py b/src/chat_control.py
-index e59a871..c34f86a 100644
---- a/src/chat_control.py
-+++ b/src/chat_control.py
-@@ -1912,7 +1912,7 @@ class ChatControl(ChatControlBase):
- 
-         if status_escaped:
-             status_text = self.urlfinder.sub(self.make_href, status_escaped)
--            status_text = '<span %s>%s</span>' % (font_attrs_small, status_escaped)
-+            status_text = '<span %s>%s</span>' % (font_attrs_small, status_text)
-             self.banner_status_label.set_tooltip_text(status)
-             self.banner_status_label.set_no_show_all(False)
-             self.banner_status_label.show()
diff --git a/net-im/gajim/files/gajim-0.13-autotools-enable-site-packages_option.patch b/net-im/gajim/files/gajim-0.13-autotools-enable-site-packages_option.patch
deleted file mode 100644
index ad683913e923..000000000000
--- a/net-im/gajim/files/gajim-0.13-autotools-enable-site-packages_option.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-autotools: add --enable-site-packages option
-
-This option allows the installation of pyfiles in PYTHON/site-packages/gajim
-instead of DATADIR/gajim/src.
-
-partial backport of upstream version (http://trac.gajim.org/ticket/5460).
-
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -65,6 +65,20 @@
- AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
- AC_SUBST([PYTHON_INCLUDES])
- 
-+dnl ****
-+dnl enable installation in python-2.x/site-packages/gajim
-+dnl ****
-+AC_ARG_ENABLE(site-packages,
-+  [AS_HELP_STRING([--enable-site-packages],
-+	[install gajim sources in PYTHONDIR/site-packages/gajim
-+instead of DATADIR/gajim/src.])]
-+,
-+AC_SUBST([gajim_srcdir], [\${pkgpythondir}])
-+,
-+AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src])
-+)
-+
-+AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}")
- AS_AC_EXPAND(DATADIR, "${datadir}")
- AS_AC_EXPAND(LIBDIR, "${libdir}")
- AS_AC_EXPAND(DOCDIR, "${docdir}")
-@@ -95,4 +109,11 @@
- ***************************** 
-   Build features:
-     trayicon ......... ${have_trayicon}
-+
-+  Installation:
-+    Prefix ........... ${prefix}
-+    Python modules ... ${GAJIM_SRCDIR}
-+    C modules ........ ${LIBDIR}/gajim
-+    Documentation .... ${DOCDIR}
-+    Others............ ${DATADIR}/gajim
- *****************************"
-diff --git a/data/Makefile.am b/data/Makefile.am
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -5,7 +5,7 @@
- desktop_in_files = gajim.desktop.in.in 
- desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
- 
--installdefsdir = $(pkgdatadir)/src/common
-+installdefsdir = $(gajim_srcdir)/common
- installdefs_DATA = defs.py
- 
- soundsdir = $(pkgdatadir)/data/sounds
-diff --git a/scripts/gajim.in b/scripts/gajim.in
---- a/scripts/gajim.in
-+++ b/scripts/gajim.in
-@@ -32,6 +32,6 @@
- export datadir=@DATADIR@/gajim
- PYTHON_EXEC=@PYTHON@
- 
--cd ${datadir}/src
-+cd "@GAJIM_SRCDIR@"
- export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
- exec ${PYTHON_EXEC} -OO $APP.py "$@"
-diff --git a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -26,37 +26,16 @@
- 		    --override $(srcdir)/trayicon.override \
- 		    $(srcdir)/trayicon.defs > $@
- endif
--gajimsrcdir = $(pkgdatadir)/src
--gajimsrc_PYTHON = $(srcdir)/*.py
-+gajimsrcdir = $(gajim_srcdir)
-+nobase_dist_gajimsrc_PYTHON = \
-+	$(srcdir)/*.py \
-+	$(srcdir)/common/*.py \
-+	$(srcdir)/common/xmpp/*.py \
-+	$(srcdir)/common/zeroconf/*.py \
-+	$(srcdir)/command_system/*.py \
-+	$(srcdir)/command_system/implementation/*.py
- 
--gajimsrc1dir = $(pkgdatadir)/src/common
--gajimsrc1_PYTHON = \
--				$(srcdir)/common/*.py
--
--gajimsrc2dir = $(pkgdatadir)/src/common/xmpp
--gajimsrc2_PYTHON = \
--				$(srcdir)/common/xmpp/*.py
--
--gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf
--gajimsrc3_PYTHON = \
--				$(srcdir)/common/zeroconf/*.py
--
--gajimsrc4dir = $(pkgdatadir)/src/command_system
--gajimsrc4_PYTHON = \
--				   $(srcdir)/command_system/*.py
--
--gajimsrc5dir = $(pkgdatadir)/src/command_system/implementation
--gajimsrc5_PYTHON = \
--				   $(srcdir)/command_system/implementation/*.py
--
--DISTCLEANFILES =
--
--EXTRA_DIST = $(gajimsrc_PYTHON) \
--			$(gajimsrc1_PYTHON) \
--			$(gajimsrc2_PYTHON) \
--			$(gajimsrc3_PYTHON) \
--			$(gajimsrc4_PYTHON) \
--			$(gajimsrc5_PYTHON) \
-+EXTRA_DIST = \
- 			eggtrayicon.c \
- 			trayiconmodule.c \
- 			eggtrayicon.h \
diff --git a/net-im/gajim/gajim-0.14.4-r2.ebuild b/net-im/gajim/gajim-0.14.4-r2.ebuild
index ba520dd22a12..a6795ad96430 100644
--- a/net-im/gajim/gajim-0.14.4-r2.ebuild
+++ b/net-im/gajim/gajim-0.14.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.4-r2.ebuild,v 1.2 2012/03/18 08:58:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.4-r2.ebuild,v 1.3 2012/03/18 09:35:51 jlec Exp $
 
 EAPI=4
 
@@ -92,7 +92,7 @@ src_install() {
 	default
 
 	rm "${D}/usr/share/doc/${PF}/"{README.html,COPYING} || die
-	dohtml README.html || die
+	dohtml README.html
 }
 
 pkg_postinst() {
diff --git a/net-im/gajim/gajim-0.15_beta4.ebuild b/net-im/gajim/gajim-0.15_beta4.ebuild
new file mode 100644
index 000000000000..abfa282e5379
--- /dev/null
+++ b/net-im/gajim/gajim-0.15_beta4.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15_beta4.ebuild,v 1.1 2012/03/18 09:35:51 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="sqlite xml"
+
+inherit eutils python versionator
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="http://www.gajim.org/"
+SRC_URI="http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P/_beta/-beta}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="avahi crypt dbus gmail gnome kde idle jingle libnotify networkmanager nls spell srv X xhtml"
+
+REQUIRED_USE="
+	libnotify? ( dbus )
+	avahi? ( dbus )"
+
+COMMON_DEPEND="
+	dev-python/pygtk:2
+	x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.1
+	dev-util/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pyasn1
+	dev-python/pyopenssl
+	crypt? (
+		app-crypt/gnupg
+		dev-python/pycrypto
+		)
+	dbus? (
+		dev-python/dbus-python
+		dev-libs/dbus-glib
+		libnotify? ( dev-python/notify-python )
+		avahi? ( net-dns/avahi[dbus,gtk,python] )
+		)
+	gmail? ( net-dns/bind-tools )
+	gnome? (
+		dev-python/libgnome-python
+		dev-python/gnome-keyring-python
+		dev-python/egg-python
+		)
+	idle? ( x11-libs/libXScrnSaver )
+	jingle? ( net-libs/farsight2[python] )
+	kde? ( kde-base/kwallet )
+	networkmanager? (
+			dev-python/dbus-python
+			net-misc/networkmanager
+		)
+	srv? (
+		|| (
+			dev-python/libasyncns-python
+			net-dns/bind-tools )
+		)
+	spell? ( app-text/gtkspell:2 )
+	xhtml? ( dev-python/docutils )"
+
+S="${WORKDIR}"/${P/_beta/-beta}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/0.14-python-version.patch \
+		"${FILESDIR}"/0.14.1-testing.patch
+	echo '#!/bin/sh' > config/py-compile
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with X x) \
+		--docdir="/usr/share/doc/${PF}" \
+		--libdir="$(python_get_sitedir)" \
+		--enable-site-packages
+}
+
+src_install() {
+	default
+
+	rm "${D}/usr/share/doc/${PF}/COPYING" || die
+	dohtml README.html
+}
+
+pkg_postinst() {
+	python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${PN}
+}