From baf8ad2dcad03f8b520870f3316fea5b1a27ab4a Mon Sep 17 00:00:00 2001 From: Fabian Fingerle Date: Tue, 16 Jun 2009 06:18:30 +0200 Subject: [PATCH] net-im/gajim: remove --- net-im/gajim/ChangeLog | 7 -- net-im/gajim/Manifest | 7 -- .../files/0.12.1-roster_window.py_r10934.patch | 23 ----- net-im/gajim/files/0.12.1-sound-path-fix.patch | 50 ----------- ....1_autotools_install_pyfiles_in_pkglibdir.patch | 62 -------------- net-im/gajim/gajim-0.12.3.ebuild | 99 ---------------------- net-im/gajim/metadata.xml | 18 ---- 7 files changed, 266 deletions(-) delete mode 100644 net-im/gajim/ChangeLog delete mode 100644 net-im/gajim/Manifest delete mode 100644 net-im/gajim/files/0.12.1-roster_window.py_r10934.patch delete mode 100644 net-im/gajim/files/0.12.1-sound-path-fix.patch delete mode 100644 net-im/gajim/files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch delete mode 100644 net-im/gajim/gajim-0.12.3.ebuild delete mode 100644 net-im/gajim/metadata.xml diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog deleted file mode 100644 index 34c1464..0000000 --- a/net-im/gajim/ChangeLog +++ /dev/null @@ -1,7 +0,0 @@ -# ChangeLog for net-im/gajim -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 16 Jun 2009, Fabian Fingerle - +gajim-0.12.3.ebuild, +files/* - Initial add diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest deleted file mode 100644 index 7b91b96..0000000 --- a/net-im/gajim/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX 0.12.1-roster_window.py_r10934.patch 995 RMD160 237c4bb523eebb4ac097ce5eb5b54c6d0f6051f0 SHA1 29e3110da5597b8c031db591f333dbb6bbfdec15 SHA256 531f161e8000a22226802fa872cd5d0c018fc975b39162ecf00ead3afcf7617c -AUX 0.12.1-sound-path-fix.patch 2479 RMD160 86391d9ec6898d075e6c5376d15897271468f0ae SHA1 51af706c53a4469973bac4dd0053550ec965b4f8 SHA256 a8d791ddeb37fdf95e0e8ec7f3fb4e66e0d97a8731cfd57ab602243678b17ce1 -AUX 0.12.1_autotools_install_pyfiles_in_pkglibdir.patch 1961 RMD160 1021c7bb94c84a87f08719943379666b9fdfdeae SHA1 75463339fece000cc1cd18291f1c7ec1f6b77dbd SHA256 a216b93bb44839d483dcb70f6ae9ab81c1e030c745385134f6674a223fc0750b -DIST gajim-0.12.3.tar.gz 4667331 RMD160 15c3e974dc3ad25c50b64c253be313357741dc9b SHA1 a4a90ee58808fe448d6ae161bdd00fcf9942b137 SHA256 396487c1bd4abe5575a29a9d7c6032314c2196438545f47f2e05a32ceaf4e6c9 -EBUILD gajim-0.12.3.ebuild 2554 RMD160 dd75c40efa76fe8ce19bae85f3e4e6b165d8646a SHA1 e020966ce1a49b50caa6453d61e1693eefc3eab8 SHA256 10f9b7b940e2b4e92096ac23fca531dd53fd4113ed2447625857925b1aa87bfc -MISC ChangeLog 214 RMD160 606d52728575b481e5b4d46f062ea0babae0b5b3 SHA1 bcbfbaa7c860f56816a77cde1fdc69ee2dbd453e SHA256 a2e31d1f1ec9d897a907a89c5aa38447990c79765d16fbb3d5607463abc69b41 -MISC metadata.xml 587 RMD160 435dc08a9b0d827903d81b170ee20dccde5aa0c5 SHA1 f9d25817432e3deeb02b3701634272cb5c9ce72a SHA256 c9a3b2f0eede4d68da57a15a0749b2f573024acce8991778db362803033141c0 diff --git a/net-im/gajim/files/0.12.1-roster_window.py_r10934.patch b/net-im/gajim/files/0.12.1-roster_window.py_r10934.patch deleted file mode 100644 index 5ea2cad..0000000 --- a/net-im/gajim/files/0.12.1-roster_window.py_r10934.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: trunk/src/roster_window.py -=================================================================== ---- trunk/src/roster_window.py (revision 10772) -+++ trunk/src/roster_window.py (revision 10934) -@@ -1000,7 +1000,7 @@ - and ('artist' in gajim.connections[account].tune \ - or 'title' in gajim.connections[account].tune): -+ path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png') - self.model[child_iter][C_TUNE_PIXBUF] = \ -- gtk.gdk.pixbuf_new_from_file( -- '../data/emoticons/static/music.png') -+ gtk.gdk.pixbuf_new_from_file(path) - else: - self.model[child_iter][C_TUNE_PIXBUF] = None -@@ -1263,6 +1263,6 @@ - contact = gajim.contacts.get_contact(account, jid) - if 'artist' in contact.tune or 'title' in contact.tune: -- pixbuf = gtk.gdk.pixbuf_new_from_file( -- '../data/emoticons/static/music.png') -+ path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png') -+ pixbuf = gtk.gdk.pixbuf_new_from_file(path) - else: - pixbuf = None diff --git a/net-im/gajim/files/0.12.1-sound-path-fix.patch b/net-im/gajim/files/0.12.1-sound-path-fix.patch deleted file mode 100644 index b9bf23b..0000000 --- a/net-im/gajim/files/0.12.1-sound-path-fix.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -r 955cd2eb2893 data/defs.py.in ---- a/data/defs.py.in Tue Feb 03 21:39:50 2009 +0100 -+++ b/data/defs.py.in Mon Feb 16 02:05:18 2009 +0100 -@@ -2,7 +2,7 @@ - # do not edit it! - docdir = "@DOCDIR@" - --datadir = "@DATADIR@" -+datadir = "@DATADIR@/gajim" - - localedir = "@LOCALEDIR@" - -diff -r 955cd2eb2893 src/common/config.py ---- a/src/common/config.py Tue Feb 03 21:39:50 2009 +0100 -+++ b/src/common/config.py Mon Feb 16 02:05:18 2009 +0100 -@@ -447,15 +447,15 @@ - } - - soundevents_default = { -- 'first_message_received': [ True, '../data/sounds/message1.wav' ], -- 'next_message_received_focused': [ True, '../data/sounds/message2.wav' ], -- 'next_message_received_unfocused': [ True, '../data/sounds/message2.wav' ], -- 'contact_connected': [ True, '../data/sounds/connected.wav' ], -- 'contact_disconnected': [ True, '../data/sounds/disconnected.wav' ], -- 'message_sent': [ True, '../data/sounds/sent.wav' ], -- 'muc_message_highlight': [ True, '../data/sounds/gc_message1.wav', _('Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname.')], -- 'muc_message_received': [ False, '../data/sounds/gc_message2.wav', _('Sound to play when any MUC message arrives.') ], -- 'gmail_received': [ False, '../data/sounds/message1.wav' ], -+ 'first_message_received': [ True, 'message1.wav' ], -+ 'next_message_received_focused': [ True, 'message2.wav' ], -+ 'next_message_received_unfocused': [ True, 'message2.wav' ], -+ 'contact_connected': [ True, 'connected.wav' ], -+ 'contact_disconnected': [ True, 'disconnected.wav' ], -+ 'message_sent': [ True, 'sent.wav' ], -+ 'muc_message_highlight': [ True, 'gc_message1.wav', _('Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname.')], -+ 'muc_message_received': [ False, 'gc_message2.wav', _('Sound to play when any MUC message arrives.') ], -+ 'gmail_received': [ False, 'message1.wav' ], - } - - themes_default = { -@@ -696,7 +696,8 @@ - default = self.soundevents_default[event] - self.add_per('soundevents', event) - self.set_per('soundevents', event, 'enabled', default[0]) -- self.set_per('soundevents', event, 'path', default[1]) -+ self.set_per('soundevents', event, 'path', '%s/data/sounds/%s' % -+ (defs.datadir, default[1])) - - for status in self.defaultstatusmsg_default: - default = self.defaultstatusmsg_default[status] diff --git a/net-im/gajim/files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch b/net-im/gajim/files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch deleted file mode 100644 index 7c61f13..0000000 --- a/net-im/gajim/files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch +++ /dev/null @@ -1,62 +0,0 @@ -autotools: install *.py in $(pkglibdir), ie $prefix/lib/gajim - -diff -r 2c6ac74dd0e2 data/Makefile.am ---- a/data/Makefile.am Tue Feb 03 15:52:16 2009 +0100 -+++ b/data/Makefile.am Tue Feb 03 16:52:41 2009 +0100 -@@ -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 = $(pkglibdir)/common - installdefs_DATA = defs.py - - soundsdir = $(pkgdatadir)/data/sounds -diff -r 2c6ac74dd0e2 scripts/gajim-remote.in ---- a/scripts/gajim-remote.in Tue Feb 03 15:52:16 2009 +0100 -+++ b/scripts/gajim-remote.in Tue Feb 03 16:52:41 2009 +0100 -@@ -27,6 +27,6 @@ - datadir=@DATADIR@ - PYTHON_EXEC=@PYTHON@ - --cd ${datadir}/gajim/src -+cd @LIBDIR@/gajim - export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim" - exec ${PYTHON_EXEC} -OO gajim-remote.py "$@" -diff -r 2c6ac74dd0e2 scripts/gajim.in ---- a/scripts/gajim.in Tue Feb 03 15:52:16 2009 +0100 -+++ b/scripts/gajim.in Tue Feb 03 16:52:41 2009 +0100 -@@ -29,6 +29,6 @@ - datadir=@DATADIR@ - PYTHON_EXEC=@PYTHON@ - --cd ${datadir}/gajim/src -+cd @LIBDIR@/gajim - export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim" - exec ${PYTHON_EXEC} -OO gajim.py $@ -diff -r 2c6ac74dd0e2 src/Makefile.am ---- a/src/Makefile.am Tue Feb 03 15:52:16 2009 +0100 -+++ b/src/Makefile.am Tue Feb 03 16:52:41 2009 +0100 -@@ -43,18 +43,18 @@ - --override $(srcdir)/trayicon.override \ - $(srcdir)/trayicon.defs > $@ - endif --gajimsrcdir = $(pkgdatadir)/src -+gajimsrcdir = $(pkglibdir) - gajimsrc_PYTHON = $(srcdir)/*.py - --gajimsrc1dir = $(pkgdatadir)/src/common -+gajimsrc1dir = $(pkglibdir)/common - gajimsrc1_PYTHON = \ - $(srcdir)/common/*.py - --gajimsrc2dir = $(pkgdatadir)/src/common/xmpp -+gajimsrc2dir = $(pkglibdir)/common/xmpp - gajimsrc2_PYTHON = \ - $(srcdir)/common/xmpp/*.py - --gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf -+gajimsrc3dir = $(pkglibdir)/common/zeroconf - gajimsrc3_PYTHON = \ - $(srcdir)/common/zeroconf/*.py - diff --git a/net-im/gajim/gajim-0.12.3.ebuild b/net-im/gajim/gajim-0.12.3.ebuild deleted file mode 100644 index 2c08821..0000000 --- a/net-im/gajim/gajim-0.12.3.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.12.1.ebuild,v 1.4 2009/05/31 23:59:52 ranger Exp $ - -EAPI="2" - -inherit multilib python eutils autotools - -DESCRIPTION="Jabber client written in PyGTK" -HOMEPAGE="http://www.gajim.org/" -SRC_URI="http://www.gajim.org/downloads/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="avahi dbus gnome idle libnotify nls spell srv trayicon X xhtml" - -DEPEND="|| ( - ( =dev-lang/python-2.5[sqlite] - ) - dev-python/pygtk - sys-devel/gettext - dev-util/intltool - dev-util/pkgconfig" - -RDEPEND="gnome? ( dev-python/gnome-python-extras - dev-python/gnome-python-desktop - ) - dbus? ( dev-python/dbus-python dev-libs/dbus-glib ) - libnotify? ( x11-libs/libnotify ) - xhtml? ( dev-python/docutils ) - srv? ( net-dns/bind-tools ) - idle? ( x11-libs/libXScrnSaver ) - spell? ( app-text/gtkspell ) - avahi? ( net-dns/avahi[dbus,gtk,python] ) - dev-python/pyopenssl - dev-python/sexy-python - dev-python/pycrypto" - -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 -} - -src_prepare() { - # not upstream: - epatch "${FILESDIR}/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch" - # sound paths: - epatch "${FILESDIR}/0.12.1-sound-path-fix.patch" - # small fix from upstream - epatch "${FILESDIR}/0.12.1-roster_window.py_r10934.patch" - - # fix datadir path (trunk use an env var for config this) - sed -i "s|'DATA',.*|'DATA', '/usr/share/gajim/data')|" \ - "src/common/configpaths.py" || die 'sed failed' - - eautoreconf -} - -src_configure() { - local myconf - - if ! use gnome; then - myconf="${myconf} $(use_enable trayicon)" - myconf="${myconf} $(use_enable idle)" - fi - - econf $(use_enable nls) \ - $(use_enable spell gtkspell) \ - $(use_enable dbus remote) \ - $(use_with X x) \ - --docdir="/usr/share/doc/${PF}" \ - --libdir="$(python_get_sitedir)" \ - ${myconf} || die "econf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - rm "${D}/usr/share/doc/${PF}/README.html" - dohtml README.html -} - -pkg_postinst() { - python_mod_optimize $(python_get_sitedir)/gajim/ -} - -pkg_postrm() { - python_mod_cleanup $(python_get_sitedir)/gajim/ -} diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml deleted file mode 100644 index 825be0e..0000000 --- a/net-im/gajim/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - net-im - - welp@gentoo.org - Peter Weller - - - A fully featured and easy to use GTK+ Jabber client written in PyGTK. - - - Enable idle module - SRV capabilities - Enable support for trayicon - Enable XHTML support - - -- 2.11.4.GIT