From f36a3f79148385f014810c55a8a5a0f2eb0f1e83 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Fri, 29 Jul 2016 13:34:59 +0200 Subject: net-im/pidgin: Fixed python_fix_shebang call (bug #578102). Thanks to wizardedit for tracking down and providing a fix. Removed old ebuilds. Package-Manager: portage-2.3.0 Signed-off-by: Lars Wendler --- net-im/pidgin/Manifest | 2 - net-im/pidgin/pidgin-2.10.11.ebuild | 248 ------------------------------- net-im/pidgin/pidgin-2.10.12-r2.ebuild | 258 --------------------------------- net-im/pidgin/pidgin-2.11.0.ebuild | 2 +- 4 files changed, 1 insertion(+), 509 deletions(-) delete mode 100644 net-im/pidgin/pidgin-2.10.11.ebuild delete mode 100644 net-im/pidgin/pidgin-2.10.12-r2.ebuild (limited to 'net-im') diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index 5467f6101d40..077e205c62a0 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -1,5 +1,3 @@ -DIST pidgin-2.10.11.tar.bz2 9458050 SHA256 f2ae211341fc77efb9945d40e9932aa535cdf3a6c8993fe7919fca8cc1c04007 SHA512 774710ab087cb56e349dc1d5e45dbfcbe06b9a8f792abe5d201b0860620d502009f31563cfe5316f4c815345427b6c273b8f9694deb600848957c825fd967029 WHIRLPOOL 24f31ee6ce40e69f644d55f2135644172e8314a64080384eb901ae2b7aba631fbde98cab6cb798f10dd870ecd96374b451cb3ad11d567dc48dcb25f5cf499223 -DIST pidgin-2.10.12.tar.bz2 9837598 SHA256 2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd SHA512 4756bed3ae78b48bfeaa586def3c7a0014db76ce14ae8c6773c96bdca24b65e92b2805270af43960e2a11a600aeac35e030faa3f79dbe3301084ca9d970a5f03 WHIRLPOOL 52f16cdd76b1aa3e76a877136070e3c4875827df621757d35656eb79e7d9921635f9373d33f9bc87275200e91c25a2763b4a64d90953322fd82d03860ce6a0da DIST pidgin-2.10.9-irc_join_sleep.patch 534 SHA256 ee061505d04c994a36ea1d5eef346b7cbb2512afafa4985a678205ea69d87857 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf WHIRLPOOL 7aa9aa9e5ee7d97445da2c330329c6bfd4ad21347f43220e8377b7ec40eb5eac417be08cddfcdd48c7f847aac00a0f9ab39d0add09f1bee519f96f7586bdf5c9 DIST pidgin-2.11.0.tar.bz2 10037480 SHA256 f72613440586da3bdba6d58e718dce1b2c310adf8946de66d8077823e57b3333 SHA512 d6a9bb8075b475e5204d730075b432ca0f1cb91b6337f98e506587132581e6928a826b47e0b94fb9eaedc79c5be0a8237c4671fc26dba97dedad1adb74c9abfa WHIRLPOOL e7f91d92bece8611986c35f17d3d263a197f8c7cf71d514d1f409fbe31fd57cf8a1beabab3d028a0882a79a115ae021b2e64dd2c6b3ec6c29a783a3df28af948 DIST pidgin-eds-3.6.patch.bz2 2352 SHA256 321185dd5f44e502f671b17e84fa1ca2e08a3f7c79ed211c0bb92710700bcc41 SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877 WHIRLPOOL 5c1d3e933bdfa4b1f20f98dbf8b5c1669eb857b9db60dacae488fa04331300618df2f1265e4fb2e58ed31b24229df0edb8c30970d8172fd65ca7fa03bc0e3805 diff --git a/net-im/pidgin/pidgin-2.10.11.ebuild b/net-im/pidgin/pidgin-2.10.11.ebuild deleted file mode 100644 index dedabe165758..000000000000 --- a/net-im/pidgin/pidgin-2.10.11.ebuild +++ /dev/null @@ -1,248 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python2_7 python3_{3,4} ) - -inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python-single-r1 - -DESCRIPTION="GTK Instant Messenger client" -HOMEPAGE="http://pidgin.im/" -SRC_URI=" - mirror://sourceforge/${PN}/${P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit" -IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses" -IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono" -IUSE+=" aqua" - -# dbus requires python to generate C code for dbus bindings (thus DEPEND only). -# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is -# no way to build dbus and avoid libgnt linkage with python. If you want this -# send patch upstream. -# purple-url-handler and purple-remote require dbus-python thus in reality we -# rdepend on python if dbus enabled. But it is possible to separate this dep. -RDEPEND=" - >=dev-libs/glib-2.16 - >=dev-libs/libxml2-2.6.18 - ncurses? ( sys-libs/ncurses[unicode] - dbus? ( ${PYTHON_DEPS} ) - python? ( ${PYTHON_DEPS} ) ) - gtk? ( - >=x11-libs/gtk+-2.10:2[aqua=] - x11-libs/libSM - xscreensaver? ( x11-libs/libXScrnSaver ) - spell? ( >=app-text/gtkspell-2.0.2:2 ) - eds? ( >=gnome-extra/evolution-data-server-3.6:= ) - prediction? ( >=dev-db/sqlite-3.3:3 ) ) - gstreamer? ( =media-libs/gstreamer-0.10* - =media-libs/gst-plugins-good-0.10* - net-libs/farstream:0.1 - media-plugins/gst-plugins-meta:0.10 - media-plugins/gst-plugins-gconf:0.10 ) - zeroconf? ( net-dns/avahi[dbus] ) - dbus? ( >=dev-libs/dbus-glib-0.71 - >=sys-apps/dbus-0.90 - dev-python/dbus-python ) - perl? ( >=dev-lang/perl-5.16:= ) - gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] - >=net-libs/libgadu-1.11.0[-ssl] ) ) - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/nss-3.15.4 ) - meanwhile? ( net-libs/meanwhile ) - silc? ( >=net-im/silc-toolkit-1.0.1 ) - tcl? ( dev-lang/tcl:0= ) - tk? ( dev-lang/tk:0= ) - sasl? ( dev-libs/cyrus-sasl:2 ) - networkmanager? ( net-misc/networkmanager ) - idn? ( net-dns/libidn ) - ! python is enabled - #REQUIRED_USE="gtk? ( nls ) dbus? ( python )" - if use gtk && ! use nls; then - ewarn "gtk build => nls is enabled!" - fi - if use dbus && ! use python; then - elog "dbus is enabled, no way to disable linkage with python => python is enabled" - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-2.10.0-gold.patch \ - "${WORKDIR}"/${PN}-eds-3.6.patch \ - "${FILESDIR}"/${PN}-2.10.9-fix-gtkmedia.patch \ - "${FILESDIR}"/${PN}-2.10.10-eds-3.6-configure.ac.patch \ - "${FILESDIR}"/${P}-tinfo.patch - epatch_user - - eautoreconf -} - -src_configure() { - # Stabilize things, for your own good - strip-flags - replace-flags -O? -O2 - - local myconf - - if use gadu; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg" - myconf="${myconf} --with-gadu-includes=." - myconf="${myconf} --with-gadu-libs=." - fi - - use groupwise && DYNAMIC_PRPLS+=",novell" - use silc && DYNAMIC_PRPLS+=",silc" - use meanwhile && DYNAMIC_PRPLS+=",sametime" - use mxit && DYNAMIC_PRPLS+=",mxit" - use zephyr && DYNAMIC_PRPLS+=",zephyr" - use zeroconf && DYNAMIC_PRPLS+=",bonjour" - - if use gnutls; then - einfo "Disabling NSS, using GnuTLS" - myconf+=" --enable-nss=no --enable-gnutls=yes" - myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls" - myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)" - else - einfo "Disabling GnuTLS, using NSS" - myconf+=" --enable-gnutls=no --enable-nss=yes" - fi - - if use dbus || { use ncurses && use python; }; then - myconf+=" --with-python=${PYTHON}" - else - myconf+=" --without-python" - fi - - econf \ - $(use_enable ncurses consoleui) \ - $(use_enable gtk gtkui) \ - $(use_enable gtk sm) \ - $(use gtk || use_enable nls) \ - $(use gtk && echo "--enable-nls") \ - $(use gtk && use_enable xscreensaver screensaver) \ - $(use gtk && use_enable prediction cap) \ - $(use gtk && use_enable eds gevolution) \ - $(use gtk && use_enable spell gtkspell) \ - $(use_enable perl) \ - $(use_enable tk) \ - $(use_enable tcl) \ - $(use_enable debug) \ - $(use_enable dbus) \ - $(use_enable meanwhile) \ - $(use_enable gstreamer) \ - $(use_enable gstreamer farstream) \ - $(use_enable gstreamer vv) \ - $(use_enable sasl cyrus-sasl ) \ - $(use_enable doc doxygen) \ - $(use_enable networkmanager nm) \ - $(use_enable zeroconf avahi) \ - $(use_enable idn) \ - --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \ - --with-dynamic-prpls="${DYNAMIC_PRPLS}" \ - --disable-mono \ - --x-includes="${EPREFIX}"/usr/include/X11 \ - ${myconf} - #$(use_enable mono) \ -} - -src_install() { - gnome2_src_install - if use gtk; then - # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other - # implementations that are not complient with new hicolor theme yet, #323355 - local pixmapdir - for d in 16 22 32 48; do - pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions - mkdir "${pixmapdir}" || die - pushd "${pixmapdir}" >/dev/null || die - for f in ../status/*; do - ln -s ${f} || die - done - popd >/dev/null - done - fi - use perl && perl_delete_localpod - - if use python || use dbus ; then - python_fix_shebang "${D}" - python_optimize - fi - - dodoc finch/plugins/pietray.py - docompress -x /usr/share/doc/${PF}/pietray.py - - prune_libtool_files --all -} diff --git a/net-im/pidgin/pidgin-2.10.12-r2.ebuild b/net-im/pidgin/pidgin-2.10.12-r2.ebuild deleted file mode 100644 index aa8dcdc4c6a0..000000000000 --- a/net-im/pidgin/pidgin-2.10.12-r2.ebuild +++ /dev/null @@ -1,258 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python2_7 python3_{3,4} ) - -inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-module python-single-r1 - -DESCRIPTION="GTK Instant Messenger client" -HOMEPAGE="http://pidgin.im/" -SRC_URI=" - mirror://sourceforge/${PN}/${P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2 - https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit pie" -IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses" -IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono" -IUSE+=" aqua" - -# dbus requires python to generate C code for dbus bindings (thus DEPEND only). -# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is -# no way to build dbus and avoid libgnt linkage with python. If you want this -# send patch upstream. -# purple-url-handler and purple-remote require dbus-python thus in reality we -# rdepend on python if dbus enabled. But it is possible to separate this dep. -RDEPEND=" - >=dev-libs/glib-2.16 - >=dev-libs/libxml2-2.6.18 - ncurses? ( sys-libs/ncurses:0=[unicode] - dbus? ( ${PYTHON_DEPS} ) - python? ( ${PYTHON_DEPS} ) ) - gtk? ( - >=x11-libs/gtk+-2.10:2[aqua=] - x11-libs/libSM - xscreensaver? ( x11-libs/libXScrnSaver ) - spell? ( >=app-text/gtkspell-2.0.2:2 ) - eds? ( >=gnome-extra/evolution-data-server-3.6:= ) - prediction? ( >=dev-db/sqlite-3.3:3 ) ) - gstreamer? ( media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - >=net-libs/farstream-0.2.7:0.2 ) - zeroconf? ( net-dns/avahi[dbus] ) - dbus? ( >=dev-libs/dbus-glib-0.71 - >=sys-apps/dbus-0.90 - dev-python/dbus-python ) - perl? ( >=dev-lang/perl-5.16:= ) - gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] - >=net-libs/libgadu-1.11.0[-ssl] ) ) - gnutls? ( net-libs/gnutls ) - !gnutls? ( - dev-libs/nspr - dev-libs/nss - ) - meanwhile? ( net-libs/meanwhile ) - silc? ( >=net-im/silc-toolkit-1.0.1 ) - tcl? ( dev-lang/tcl:0= ) - tk? ( dev-lang/tk:0= ) - sasl? ( dev-libs/cyrus-sasl:2 ) - networkmanager? ( net-misc/networkmanager ) - idn? ( net-dns/libidn ) - ! python is enabled - #REQUIRED_USE="gtk? ( nls ) dbus? ( python )" - if use gtk && ! use nls; then - ewarn "gtk build => nls is enabled!" - fi - if use dbus && ! use python; then - elog "dbus is enabled, no way to disable linkage with python => python is enabled" - fi -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - # Stabilize things, for your own good - strip-flags - replace-flags -O? -O2 - use pie && CFLAGS="${CFLAGS} -fPIE -pie" - - local myconf=() - - if use gadu; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg" - fi - - use groupwise && DYNAMIC_PRPLS+=",novell" - use silc && DYNAMIC_PRPLS+=",silc" - use meanwhile && DYNAMIC_PRPLS+=",sametime" - use mxit && DYNAMIC_PRPLS+=",mxit" - use zephyr && DYNAMIC_PRPLS+=",zephyr" - use zeroconf && DYNAMIC_PRPLS+=",bonjour" - - if use gnutls; then - einfo "Disabling NSS, using GnuTLS" - myconf+=( --enable-nss=no --enable-gnutls=yes ) - myconf+=( --with-gnutls-includes=${EPREFIX}/usr/include/gnutls ) - myconf+=( --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir) ) - else - einfo "Disabling GnuTLS, using NSS" - myconf+=( --enable-gnutls=no --enable-nss=yes ) - fi - - if use dbus || { use ncurses && use python; }; then - myconf+=( --with-python=${PYTHON} ) - else - myconf+=( --without-python ) - fi - - econf \ - $(use_enable ncurses consoleui) \ - $(use_enable gtk gtkui) \ - $(use_enable gtk sm) \ - $(use gtk || use_enable nls) \ - $(use gtk && echo "--enable-nls") \ - $(use gtk && use_enable xscreensaver screensaver) \ - $(use gtk && use_enable prediction cap) \ - $(use gtk && use_enable eds gevolution) \ - $(use gtk && use_enable spell gtkspell) \ - $(use_enable perl) \ - $(use_enable tk) \ - $(use_enable tcl) \ - $(use_enable debug) \ - $(use_enable dbus) \ - $(use_enable meanwhile) \ - $(use_enable gstreamer) \ - $(use_with gstreamer gstreamer 1.0) \ - $(use_enable gstreamer farstream) \ - $(use_enable gstreamer vv) \ - $(use_enable sasl cyrus-sasl ) \ - $(use_enable doc doxygen) \ - $(use_enable networkmanager nm) \ - $(use_enable zeroconf avahi) \ - $(use_enable idn) \ - --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \ - --with-dynamic-prpls="${DYNAMIC_PRPLS}" \ - --disable-mono \ - --x-includes="${EPREFIX}"/usr/include/X11 \ - ${myconf[@]} - #$(use_enable mono) \ -} - -src_install() { - # mimicking gnome2_src_install as that one is banned for >=EAPI-6 (*sigh*) - export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" - emake DESTDIR="${D}" install - unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL - - if use gtk; then - # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other - # implementations that are not complient with new hicolor theme yet, #323355 - local pixmapdir - for d in 16 22 32 48; do - pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions - mkdir "${pixmapdir}" || die - pushd "${pixmapdir}" >/dev/null || die - for f in ../status/*; do - ln -s ${f} || die - done - popd >/dev/null - done - fi - use perl && perl_delete_localpod - - if use python || use dbus ; then - python_fix_shebang "${D}" - python_optimize - fi - - dodoc ${DOCS} finch/plugins/pietray.py - docompress -x /usr/share/doc/${PF}/pietray.py - - prune_libtool_files --all -} diff --git a/net-im/pidgin/pidgin-2.11.0.ebuild b/net-im/pidgin/pidgin-2.11.0.ebuild index e95202763dac..9d574dbfdc94 100644 --- a/net-im/pidgin/pidgin-2.11.0.ebuild +++ b/net-im/pidgin/pidgin-2.11.0.ebuild @@ -247,7 +247,7 @@ src_install() { fi use perl && perl_delete_localpod - if use python || use dbus ; then + if use python && use dbus ; then python_fix_shebang "${D}" python_optimize fi -- cgit v1.2.3-65-gdbad