diff options
author | Justin Lecher <jlec@gentoo.org> | 2011-08-15 17:23:08 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2011-08-15 17:23:08 +0000 |
commit | 4f48591fc708534f445a1685fae116675595e63c (patch) | |
tree | 8fdf11f4048940ff8d35625ed9d00a0b258fa615 /net-im | |
parent | Make multilib compatible, #378991; respect CFLAGS (diff) | |
download | gentoo-2-4f48591fc708534f445a1685fae116675595e63c.tar.gz gentoo-2-4f48591fc708534f445a1685fae116675595e63c.tar.bz2 gentoo-2-4f48591fc708534f445a1685fae116675595e63c.zip |
Corrected usage of python mod compilation and removed old
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/gajim/ChangeLog | 6 | ||||
-rw-r--r-- | net-im/gajim/gajim-0.14.1-r3.ebuild | 105 | ||||
-rw-r--r-- | net-im/gajim/gajim-0.14.3.ebuild | 104 | ||||
-rw-r--r-- | net-im/gajim/gajim-0.14.4.ebuild | 8 |
4 files changed, 9 insertions, 214 deletions
diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog index 6ff887074d7f..028a0bea7023 100644 --- a/net-im/gajim/ChangeLog +++ b/net-im/gajim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/gajim # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.119 2011/08/14 16:56:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.120 2011/08/15 17:23:08 jlec Exp $ + + 15 Aug 2011; Justin Lecher <jlec@gentoo.org> -gajim-0.14.1-r3.ebuild, + -gajim-0.14.3.ebuild, gajim-0.14.4.ebuild: + Corrected usage of python mod compilation and removed old *gajim-0.14.4 (14 Aug 2011) diff --git a/net-im/gajim/gajim-0.14.1-r3.ebuild b/net-im/gajim/gajim-0.14.1-r3.ebuild deleted file mode 100644 index 6fab7c142bb4..000000000000 --- a/net-im/gajim/gajim-0.14.1-r3.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2011 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-r3.ebuild,v 1.2 2011/06/20 12:19:50 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 gmail gnome idle jingle libnotify networkmanager nls spell srv X xhtml" - -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/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] ) - 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 \ - "${FILESDIR}"/0.14.1-link.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} -} diff --git a/net-im/gajim/gajim-0.14.3.ebuild b/net-im/gajim/gajim-0.14.3.ebuild deleted file mode 100644 index 49e8947618cb..000000000000 --- a/net-im/gajim/gajim-0.14.3.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.3.ebuild,v 1.1 2011/06/20 12:19:50 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 gmail gnome idle jingle libnotify networkmanager nls spell srv X xhtml" - -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/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] ) - 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} -} diff --git a/net-im/gajim/gajim-0.14.4.ebuild b/net-im/gajim/gajim-0.14.4.ebuild index e4eabee49d1d..b7e542a1d5e6 100644 --- a/net-im/gajim/gajim-0.14.4.ebuild +++ b/net-im/gajim/gajim-0.14.4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 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.ebuild,v 1.1 2011/08/14 16:56:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.4.ebuild,v 1.2 2011/08/15 17:23:08 jlec Exp $ -EAPI=2 +EAPI=3 PYTHON_DEPEND="2" PYTHON_USE_WITH="sqlite xml" @@ -96,9 +96,9 @@ src_install() { } pkg_postinst() { - python_mod_optimize $(python_get_sitedir)/${PN} + python_mod_optimize ${PN} } pkg_postrm() { - python_mod_cleanup $(python_get_sitedir)/${PN} + python_mod_cleanup ${PN} } |