From 41511965fd61d37cdc822f91f0e40b98fd414c26 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 29 Oct 2010 15:21:16 +0000 Subject: Remove multi ABI support again as it sucks Package-Manager: portage-2.2.0_alpha2/cvs/Linux x86_64 --- net-im/gajim/ChangeLog | 8 ++- net-im/gajim/Manifest | 10 +-- net-im/gajim/gajim-0.14.1-r1.ebuild | 118 ------------------------------------ net-im/gajim/gajim-0.14.1-r2.ebuild | 106 ++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+), 124 deletions(-) delete mode 100644 net-im/gajim/gajim-0.14.1-r1.ebuild create mode 100644 net-im/gajim/gajim-0.14.1-r2.ebuild diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog index 7754c494c856..35d65a473e87 100644 --- a/net-im/gajim/ChangeLog +++ b/net-im/gajim/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/gajim # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.107 2010/10/29 14:32:11 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.108 2010/10/29 15:21:16 jlec Exp $ + +*gajim-0.14.1-r2 (29 Oct 2010) + + 29 Oct 2010; Justin Lecher -gajim-0.14.1-r1.ebuild, + +gajim-0.14.1-r2.ebuild: + Remove multi ABI support again as it doesn't work for this package *gajim-0.14.1-r1 (29 Oct 2010) diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest index 2f560f7c22ce..5e26646618f0 100644 --- a/net-im/gajim/Manifest +++ b/net-im/gajim/Manifest @@ -12,14 +12,14 @@ DIST gajim-0.14.tar.bz2 4142326 RMD160 93c1fc53225a48216efdbdcd38a5b22a289f317c EBUILD gajim-0.13.3.ebuild 2310 RMD160 4a442f5012871657f1893bb3f39a4d6f6e477f13 SHA1 644e8b0f527e76f72470eac6a2c23b77fdc5d185 SHA256 0870a98fc2d217994ce3e9be53bdd03596d99e39cf058ed6dbc8b11a0b5e0bdf EBUILD gajim-0.13.4-r1.ebuild 2605 RMD160 c115075802ae815127e24010ec11e04a21e67833 SHA1 f619932717680e8da3ff76e06c253b2be2809ae8 SHA256 8c4bcf42820274ca45894a30e6a1e5ab49babb210c80a665032a678d14804913 EBUILD gajim-0.13.4.ebuild 2337 RMD160 8ec6f71031ab33bc494d82787681cb578376dfaf SHA1 c41938fb7b2a69c88eacf8bfc2f6417b364311b4 SHA256 af5d9714e0b28e4bcffd06bd23c126d4473510cf9d370a49bb4bde1b16c00edd -EBUILD gajim-0.14.1-r1.ebuild 2682 RMD160 d1f4c40f23afc0a539a7e32136080d81a07f6c1f SHA1 7da748cd4b80ffa0054b1b75026d379e9e98645f SHA256 97bc60bd4292ebc3297d0f113fd251c1facbe0c4817650dcd1db0fc6ae39aa4c +EBUILD gajim-0.14.1-r2.ebuild 2522 RMD160 a6de0d1175e901f632c301324bc82dad7c417a67 SHA1 b1ad4899201c7f87e20635d4ec2d1ce9d5389b27 SHA256 52b1f33a73399366372c0efe0d12f05449d90f9fdd90d98fd356401e341fa714 EBUILD gajim-0.14.ebuild 2457 RMD160 a789433cf20e16560b141b6a1fefc74bc8db99f1 SHA1 598fecdce3a14d6de4d3a2165f17576d577e3856 SHA256 18f44c8809b115ff6ff9e9cd0e9b560abdf66aa0bfc1272ff647da0fee578645 -MISC ChangeLog 15220 RMD160 551315a57ecd5987fedd691d387c913a2b290b45 SHA1 2708ff1d584bdcc2bd4c0f91fde1605d42ed9ff3 SHA256 06907429d7d056ec31afd2422a79e868be398a0ab41d47a9893e11ded3a348ba +MISC ChangeLog 15421 RMD160 a63ddfb21b838da08d28a662cd4c131a4331c5eb SHA1 e080d4a5a71e61a87dda7fec3d6fbbc3bfd43f9f SHA256 da8710f9d6fe195fed4435c5b4adbed154c9cc288dc598be396139520499d801 MISC metadata.xml 553 RMD160 b4780201449d6f310007285b642aaccb6c350d50 SHA1 f9751ca146c518a6f31f1c4f802044e9e3c08013 SHA256 1353489c91efdd5bb461c63152d259504c3aedcb2a3cd69847994c9b17314d9f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkzK2vEACgkQgAnW8HDreRbv1gCgnD4Rpq6ew0Xbuv2nWHMfZXvi -7q4AniKnwgGKc6QjaaQH7R8aMaucBA/F -=gYGm +iEYEARECAAYFAkzK5nEACgkQgAnW8HDreRY8zQCgwGaOtc14VN6yHvjXRysetw/N +/sMAoJnm74NeBdb2LjMFiAgNwWZ+Y5rf +=2mmq -----END PGP SIGNATURE----- diff --git a/net-im/gajim/gajim-0.14.1-r1.ebuild b/net-im/gajim/gajim-0.14.1-r1.ebuild deleted file mode 100644 index fa19e6247c47..000000000000 --- a/net-im/gajim/gajim-0.14.1-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.1-r1.ebuild,v 1.1 2010/10/29 14:32:11 jlec Exp $ - -EAPI="2" - -PYTHON_DEPEND="2" -PYTHON_USE_WITH="sqlite xml" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -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}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="avahi crypt dbus gnome idle jingle libnotify networkmanager nls spell srv X xhtml" - -COMMON_DEPEND=" - x11-libs/gtk+:2 - >=dev-python/pygtk-2.16.0" - -DEPEND="${COMMON_DEPEND} - >=sys-devel/gettext-0.17-r1 - >=dev-util/intltool-0.40.1 - dev-util/pkgconfig" - -RDEPEND="${COMMON_DEPEND} - dev-python/pyopenssl - dev-python/sexy-python - 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] ) - ) - gnome? ( - dev-python/libgnome-python - dev-python/gnome-keyring-python - dev-python/egg-python - ) - idle? ( x11-libs/libXScrnSaver ) - jingle? ( net-libs/farsight2[python] ) - networkmanager? ( - dev-python/dbus-python - || ( >=net-misc/networkmanager-0.7.1 net-misc/networkmanager[gnome] ) - ) - srv? ( - || ( - dev-python/libasyncns-python - net-dns/bind-tools ) - ) - spell? ( app-text/gtkspell ) - xhtml? ( dev-python/docutils )" - -pkg_setup() { - if ! use dbus; then - if use libnotify; then - eerror "The dbus USE flag is required for libnotify support" - die "USE=\"dbus\" needed for libnotify support" - fi - if use avahi; then - eerror "The dbus USE flag is required for avahi support" - die "USE=\"dbus\" needed for avahi support" - fi - fi - 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}" \ - --enable-site-packages -} - -src_test() { - testing() { - emake \ - GENTOOPY="$(PYTHON)" \ - test || die - } -# not implemented -# python_execute_function testing -} - -src_install() { - installation() { - emake \ - GAJIM_SRCDIR="$(python_get_sitedir)"/${PN} \ - pythondir="$(python_get_sitedir)" \ - pyexecdir="$(python_get_sitedir)" \ - DESTDIR="${D}" \ - install || die - } - - python_execute_function installation - - rm "${D}/usr/share/doc/${PF}/"{README.html,COPYING} || die - dohtml README.html || die -} diff --git a/net-im/gajim/gajim-0.14.1-r2.ebuild b/net-im/gajim/gajim-0.14.1-r2.ebuild new file mode 100644 index 000000000000..8c3b6c6b9c5b --- /dev/null +++ b/net-im/gajim/gajim-0.14.1-r2.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.1-r2.ebuild,v 1.1 2010/10/29 15:21:16 jlec Exp $ + +EAPI="2" + +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}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="avahi crypt dbus gnome idle jingle libnotify networkmanager nls spell srv X xhtml" + +COMMON_DEPEND=" + x11-libs/gtk+:2 + >=dev-python/pygtk-2.16.0" + +DEPEND="${COMMON_DEPEND} + >=sys-devel/gettext-0.17-r1 + >=dev-util/intltool-0.40.1 + dev-util/pkgconfig" + +RDEPEND="${COMMON_DEPEND} + dev-python/pyopenssl + dev-python/sexy-python + 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] ) + ) + gnome? ( + dev-python/libgnome-python + dev-python/gnome-keyring-python + dev-python/egg-python + ) + idle? ( x11-libs/libXScrnSaver ) + jingle? ( net-libs/farsight2[python] ) + networkmanager? ( + dev-python/dbus-python + || ( >=net-misc/networkmanager-0.7.1 net-misc/networkmanager[gnome] ) + ) + srv? ( + || ( + dev-python/libasyncns-python + net-dns/bind-tools ) + ) + spell? ( app-text/gtkspell ) + xhtml? ( dev-python/docutils )" + +pkg_setup() { + if ! use dbus; then + if use libnotify; then + eerror "The dbus USE flag is required for libnotify support" + die "USE=\"dbus\" needed for libnotify support" + fi + if use avahi; then + eerror "The dbus USE flag is required for avahi support" + die "USE=\"dbus\" needed for avahi support" + fi + fi + python_pkg_setup + python_set_active_version 2 +} + +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() { + emake DESTDIR="${D}" install || die "emake install failed" + + rm "${D}/usr/share/doc/${PF}/"{README.html,COPYING} || die + dohtml README.html || die +} + +pkg_postinst() { + python_mod_optimize $(python_get_sitedir)/${PN} +} + +pkg_postrm() { + python_mod_cleanup $(python_get_sitedir)/${PN} +} -- cgit v1.2.3-65-gdbad