net-im/gajim: Backport upstream commit 13748 to fix plugin dir location, #411253

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 132 insertions, 17 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index d4f6eaa2a86d..84e0ee1f8ccf 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.134 2012/03/26 23:13:11 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.135 2012/04/23 19:50:08 jlec Exp $
+
+*gajim-0.15-r1 (23 Apr 2012)
+
+  23 Apr 2012; Justin Lecher <jlec@gentoo.org> +gajim-0.15-r1.ebuild,
+  +files/gajim-0.15-plugin.patch:
+  Backport upstream commit 13748 to fix plugin dir location, #411253
 
   26 Mar 2012; Naohiro Aota <naota@gentoo.org> gajim-0.15.ebuild:
   Add ~x86-fbsd. #408687
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index b2a7e2b38e7d..20208e29854e 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,33 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.14-python-version.patch 316 RMD160 0866674b1e3499e8f215f0b042e15f28a54e2676 SHA1 bc360f052a46f97d1c36ec485e692080ab7a7581 SHA256 b4aba8ebc6241442f9eb1c335ba22c2eb5a3b3a24533cb2f944f3f812e06b687
 AUX 0.14.1-testing.patch 237 RMD160 a0fec65b49dc987d259a1b1df7f56ccac1813d19 SHA1 a95e49f7e0efcf207dd04da420749283630f7826 SHA256 128da6d0a8ae48132df78f9027dc5ef5d8167e561fe12b1d774c628a5fc33638
 AUX 0.14.4-unicode.patch 671 RMD160 5a1f41e2694051efac82c155399cb19b8d92051c SHA1 96cbd80d6e6fcde39f7e5cb4549b2e37f136901e SHA256 d27b8f3ca5323200b3151ec9a580bab62722ce2e8be403b0c8395b64b603726b
 AUX gajim-0.14.4-debian_patches_unicode.patch 3590 RMD160 9fbf20005ef6f605bda540dfb6a4ed96b294ad8b SHA1 5515d29ebe502315c85b59c392fa379cf85a3910 SHA256 b9a95103317d9ed543ecfe0dc8ca8b680fbd600e494ba71888bd662937a40492
+AUX gajim-0.15-plugin.patch 383 RMD160 bd2cc6b2c3ab3b2c75d5e87bcc40499b51b12c43 SHA1 83116cdc58f8a7162de5da9fb9d8791dc931178d SHA256 6003e53ca42b3efda9f132fd9253e5577f128ae596ce458ac7c2ce5a29c1759d
 DIST gajim-0.14.1.tar.bz2 4144916 RMD160 859cbd4a9f190adfc6b84c23ef03e3c3cab09d8d SHA1 d2fdf32ded4a5fb3c7a277a765f84a5453931f34 SHA256 5c8a10e7b06f362844ff70c6f49bd92a170b9d6e4c24e878f604032e31254d3b
 DIST gajim-0.14.4.tar.bz2 4173732 RMD160 e9c6d14328ca1c13cb1152fde79dd3b5e5204e64 SHA1 0343af3c4bae39aa49e547b641caac197a887bb4 SHA256 24a1c6ac8d8e489f9ea377f1b68707d1b3f55ccdf55131c16cb8e6128ca3e941
 DIST gajim-0.15.tar.bz2 4332305 RMD160 d16345dc19bfa94d657f531af63600809c6fdeb5 SHA1 68934aa40090d21b2937df551373e454f5aa6bb6 SHA256 1a999aa4ca64a8d048babfc6aa590171191966c342fa7091fc9035b9fc6de8d8
 EBUILD gajim-0.14.1-r2.ebuild 2434 RMD160 6d1066d07a6272f956e21425c6f0d84d56e615be SHA1 89c3789b4acba865b5aad1b3947808f4f6b92907 SHA256 de26ba938e2f4201c02e13ae6df24d3b3dd79cc6b279f68f6219a349058bd5d6
 EBUILD gajim-0.14.4-r1.ebuild 2169 RMD160 784175ac29df8633d821f6d39c466549651ecbab SHA1 c43415b7a4fa0dda3abc88b3c4f1119d247fcee5 SHA256 ac4e2067297f82e9f732e5f10afbe3df008af1278158629a494beef6053bb79b
 EBUILD gajim-0.14.4-r2.ebuild 2311 RMD160 13df45a1c8b93b71d351b604ecfde51bac9924d6 SHA1 87f835efddfecbf1d5994e21dd84da08acf6bed8 SHA256 7c87be6fecc1c037cc10c567a78561447628aa28b7a400ae52a15779f14df035
+EBUILD gajim-0.15-r1.ebuild 2227 RMD160 c24739afa785153ba63738f1fb8e5e1afc78f03f SHA1 88d25cf987e0e1e6d72670bf403021240f0ad2e0 SHA256 d5e8ab674c47f977dab6890d9e11583c438678d375d06582941cdab974c3bbbf
 EBUILD gajim-0.15.ebuild 2166 RMD160 2a3c96edf878aea3f49e607770beff4889ba938a SHA1 f9325b463976a7e54fbc11481c9d7ecdfea7c31a SHA256 56c980c4559f031680c4462953c4b642c6023300aa0f3039ffbf36c38e59a24b
-MISC ChangeLog 19639 RMD160 d3a2e8a79516646831726201312e6d26d5dcd525 SHA1 5c8be08a4c94aa9fba9b7f312ce0fa78c00e20ed SHA256 302d9075c42a4f97deb8157ca5dd1927f491d006a23ee4ab29eec38cf76bb9f8
+MISC ChangeLog 19842 RMD160 95ff93fb3ef7db278614609a3f005ba1a8da4307 SHA1 7bb8c0076215c8aae4ee35cf81cd8d99b2154190 SHA256 0b6ed6a3acd71d6f7ebe254f88199b2cae9cc95995154347b814d5b47bc1d271
 MISC metadata.xml 573 RMD160 dc721373fb3fd62f6880046dae4636883f227fcb SHA1 85cba4d5f576b219ece32f59461a57575309fe99 SHA256 cdbbf751d0c4736aceae69a53fddb805be8f9daa2fb5ef1929be06814d79de69
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPcPgMAAoJEDYO1FT4VRUUQwAP/3mDoF1QRcUEEbeQ6Grx8T2n
-inYldeZDQE4doRWohzO6TSJF8CGISJ1XtizsponrZlqVnzgT4eqJ7Ow8DxCD+1+I
-lOa7vFpiVvYVJt/gVjDolbwFDgNouVFpPmLqvk98A4t0y/fWYpJdry15DQUwtZeL
-OQNxrPypcza6Ak54djd0xxQGbjDoGggyLtQLQ4al4Wj335Q5hr4LKWUpnNBIrChE
-MUe3Ura01YNMctriZOHmLv3AkNGw/kx0o89g8CU9GDs3f6zGxOihnBwBBNudLyfX
-mBJ1f2UgHYFoBTN1FBnuVeiso2X2zhupCFjYM0yEInwPEFkOMV+k+sfsGb1ZJ0ff
-eCZWkX+lRLFR0dz8E0cltoYLUCY2yjCOFlo96zjNU3/tqWNuPFNoqAn8ZXX+95WU
-Iay7XS8OZ4RidTF0kdNtTe9NvkY8YSZzy4g0WlZJWADBfOTuysrl/BZvXxBgsbiY
-yxb5X0NFa4GaPVdlUkQhjQbhBCaN4faDWNWm9Wntc5biCSNkyhiMQtWrXVNmRBAO
-+KHMAhKBV93VoCNXD3hCPxm4v95pYDSqJ5CwR+h0ifP8nCI0B+kNi7/W+yO861Qx
-g5COS0+WXqB3HQPhiwCgobh2cE9waeWOMKF7lzozZ+yvhkoSNYnkFcF5L03LX/z+
-7MxMPlB7C3vHXYj5yTgd
-=jmMz
+iEYEAREKAAYFAk+VspAACgkQgAnW8HDreRZ42wCfSalN/uQtRU3+iOoQ2qiAt8ZQ
+RdgAnA+iBrMktTLQiAfEJbPecib3CFax
+=LKk2
 -----END PGP SIGNATURE-----
diff --git a/net-im/gajim/files/gajim-0.15-plugin.patch b/net-im/gajim/files/gajim-0.15-plugin.patch
new file mode 100644
index 000000000000..fa52ddac24c5
--- /dev/null
+++ b/net-im/gajim/files/gajim-0.15-plugin.patch
@@ -0,0 +1,15 @@
+--- configure.ac	(revision 13405)

++++ configure.ac	(revision 13748)

+@@ -48,9 +48,9 @@

+ ,

+ AC_SUBST([gajim_srcdir], [\${pkgpythondir}])

+-AC_SUBST([gajim_pluginsdir], [\${pkgpythondir}])

+ ,

+ AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src])

++)

++

+ AC_SUBST([gajim_pluginsdir], [\${datadir}/\${PACKAGE}/plugins])

+-)

+ 

+ AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}")

+

diff --git a/net-im/gajim/gajim-0.15-r1.ebuild b/net-im/gajim/gajim-0.15-r1.ebuild
new file mode 100644
index 000000000000..a79bf354824a
--- /dev/null
+++ b/net-im/gajim/gajim-0.15-r1.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-r1.ebuild,v 1.1 2012/04/23 19:50:08 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="sqlite xml"
+
+inherit autotools 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}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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 )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-plugin.patch \
+		"${FILESDIR}"/0.14-python-version.patch \
+		"${FILESDIR}"/0.14.1-testing.patch
+	echo '#!/bin/sh' > config/py-compile
+	eautoreconf
+}
+
+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}/README.html" || die
+	dohtml README.html
+}
+
+pkg_postinst() {
+	python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${PN}
+}