From 698a18055e60c7bedf66092564cfbefec8aa98d5 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 11 Jul 2010 14:49:45 +0000 Subject: [PATCH] Cleaned old version, #285663 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- net-im/gajim/ChangeLog | 14 ++- net-im/gajim/Manifest | 32 +++-- net-im/gajim/files/0.11.3-misc-fixes.patch | 35 ------ .../0.12.1-roster_window.py_r10934.patch | 23 ---- .../gajim/files/0.12.1-sound-path-fix.patch | 50 -------- ...totools_install_pyfiles_in_pkglibdir.patch | 62 ---------- .../files/fix_autotools_and_search_dirs.patch | 114 ------------------ .../gajim/files/gajim-0.11.4-test_fix.patch | 19 --- ...totools-enable-site-packages_option.patch} | 0 net-im/gajim/gajim-0.11.4.ebuild | 88 -------------- net-im/gajim/gajim-0.12.1.ebuild | 98 --------------- net-im/gajim/gajim-0.13.2.ebuild | 90 -------------- net-im/gajim/gajim-0.13.3.ebuild | 4 +- net-im/gajim/gajim-0.13.4-r1.ebuild | 4 +- net-im/gajim/gajim-0.13.4.ebuild | 4 +- 15 files changed, 34 insertions(+), 603 deletions(-) delete mode 100644 net-im/gajim/files/0.11.3-misc-fixes.patch 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/files/fix_autotools_and_search_dirs.patch delete mode 100644 net-im/gajim/files/gajim-0.11.4-test_fix.patch rename net-im/gajim/files/{gajim-0.13-autotools--enable-site-packages_option.patch => gajim-0.13-autotools-enable-site-packages_option.patch} (100%) delete mode 100644 net-im/gajim/gajim-0.11.4.ebuild delete mode 100644 net-im/gajim/gajim-0.12.1.ebuild delete mode 100644 net-im/gajim/gajim-0.13.2.ebuild diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog index 458859ab38c9..be8857b9cd25 100644 --- a/net-im/gajim/ChangeLog +++ b/net-im/gajim/ChangeLog @@ -1,6 +1,18 @@ # 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.97 2010/07/09 20:52:03 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.98 2010/07/11 14:49:45 jlec Exp $ + + 11 Jul 2010; Justin Lecher + -files/0.11.3-misc-fixes.patch, -gajim-0.11.4.ebuild, + -files/gajim-0.11.4-test_fix.patch, -gajim-0.12.1.ebuild, + -files/0.12.1-roster_window.py_r10934.patch, -gajim-0.13.2.ebuild, + gajim-0.13.3.ebuild, gajim-0.13.4.ebuild, gajim-0.13.4-r1.ebuild, + -files/gajim-0.13-autotools--enable-site-packages_option.patch, + -files/0.12.1-sound-path-fix.patch, + +files/gajim-0.13-autotools-enable-site-packages_option.patch, + -files/0.12.1_autotools_install_pyfiles_in_pkglibdir.patch, + -files/fix_autotools_and_search_dirs.patch: + Cleaned old version, #285663 09 Jul 2010; Samuli Suominen gajim-0.13.3.ebuild: ppc64 stable wrt #307425 diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest index 0e453febc0d0..6da1ff747059 100644 --- a/net-im/gajim/Manifest +++ b/net-im/gajim/Manifest @@ -1,21 +1,19 @@ -AUX 0.11.3-misc-fixes.patch 1401 RMD160 7bef42ecd6505b46fa4392fc72565c64ac17c0b1 SHA1 a83d21691e8631391fcc6b48f53cc021bbb32a83 SHA256 9fdde00cd7236b2fe1074f8697d122b6783d7a8a27c3d285ee8a3ead518a2c37 -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 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 0.13.4-python-version.patch 372 RMD160 19ca9bca4a00eac318f5641de4bf93d1b6c0978b SHA1 7e40dcc6e3bdc8bbbe87f84052d68108ab341ecd SHA256 81978f728540946ab58b936d01e2ac6160dcbdc387453722e062008a15b93e11 -AUX fix_autotools_and_search_dirs.patch 3464 RMD160 b2d10ebbc8873c10f6ad154e07067154e37485d0 SHA1 5f1f5a81efaccb66e0648bbe681147b732102ea6 SHA256 cde913835bda04ebc0c4f74c28681b9a6ca5ac0f2bf9d106939ed06e5d9dade8 -AUX gajim-0.11.4-test_fix.patch 866 RMD160 951dfebf5983949e620479d9453d353ae00cfe6b SHA1 513cbedbac5fae49f2ebce41f6bda3a81b744185 SHA256 d3e4eb0deea89f7b9e6cf47e3ca7c919189879b4d19b518ee60c2c0728489202 -AUX gajim-0.13-autotools--enable-site-packages_option.patch 3306 RMD160 9490bde83855a72a9ad92824a082657613a60c50 SHA1 49b6c710fdd0124617ef5f5745584c47eca0313e SHA256 61d761c2eb3934c0257624dd0fe791ece5f980a312cecc4ff54e6bb7515c37ea -DIST gajim-0.11.4.tar.gz 3935309 RMD160 a8b212fab21fa717de33bda2b0a1ab1342b599a1 SHA1 fa3b60d935ee11a1b1f18be784344adfd7363c87 SHA256 a805d288a5bf59f7f6452d14e1d7202bd0c18f31364b87641e595e3a2eb697a8 -DIST gajim-0.12.1.tar.gz 4611614 RMD160 8d17d8083cbccff601b6583cedda93ec0d480316 SHA1 c5421a995842505d5143cacefa2b10a18ee2487e SHA256 7b5d590b548bf23ca395017bdf957d12fef59b17dbaf293152a1a6802280f4c5 -DIST gajim-0.13.2.tar.bz2 3935203 RMD160 691308b67ac7d31f3843b4740982d26432ff2d46 SHA1 ee3eaa33828d862208656e3862fd80846e5b9b31 SHA256 54125083d23fc5dcfcc61c26fc9c3f04007638aae17d209a4676637427eea4a5 +AUX gajim-0.13-autotools-enable-site-packages_option.patch 3306 RMD160 9490bde83855a72a9ad92824a082657613a60c50 SHA1 49b6c710fdd0124617ef5f5745584c47eca0313e SHA256 61d761c2eb3934c0257624dd0fe791ece5f980a312cecc4ff54e6bb7515c37ea DIST gajim-0.13.3.tar.bz2 3931080 RMD160 c3352499ef8dd64ecb1382cb277c1201590345be SHA1 44006e13ae17dd52ef35c233706b6f4d7ad9cb89 SHA256 9ceee5212b274ed293ba6188559e33c995944a9e8e5d5cd9105eef6377d52bd4 DIST gajim-0.13.4.tar.bz2 3973871 RMD160 0ce199a60fa3dcd8b10b0afae729ddd7b8ddcbce SHA1 87c37ea105543a437cf1d2bb93dd49a4f9be9343 SHA256 5ca12ba0309b681df74798128ab8b2c9160574646c00e61a3abeac98a56adee1 -EBUILD gajim-0.11.4.ebuild 2218 RMD160 adf7b3360d07cfc12f63e7c472cbe5862dfa9598 SHA1 febbff2b8e88ecbf66a3ef3ae266003a6c80d549 SHA256 b547e451b0a93bfd447cbb2849752d019efa82acca0bcb29a3d7c6e9bd6c0e8e -EBUILD gajim-0.12.1.ebuild 2646 RMD160 e17ce3e58f8c8d2ab12e4c0cab9f8910f7969adf SHA1 d1e2fd706b07d51367a3a532a7db003aba1a1b05 SHA256 5780495d6ef8303bc8111ac62a5d9f5a61ab037acfa0f636ba601d751c4577e0 -EBUILD gajim-0.13.2.ebuild 2312 RMD160 ccc229a9ab781a010914388ed22138955aec4897 SHA1 8ba3fb57b5b073e823dc7a23e414d31c4ed6a11e SHA256 144388ea01cfa6214177e7d4ae4f08ec32c26c4e9632bf47a95aad8b17841480 -EBUILD gajim-0.13.3.ebuild 2307 RMD160 ea7df3a897a1b15360322d66eea6d7b30d49e809 SHA1 6e631beaa7216e10aba9a60075d9d93e6b26e518 SHA256 79e67d7cac39aef2c658cd8e2b4d9a896f354d5fd23912fe40a01be64f1aa14d -EBUILD gajim-0.13.4-r1.ebuild 2597 RMD160 11fcec4cd02b35d4721e3bd5c391daafa2c4c61e SHA1 175d2c5e92aeeb7c9d8987eb1db89f83dc719d93 SHA256 aa2a5548daf258865240268b0069922451b57074dbd22bc66490eaec48549a5c -EBUILD gajim-0.13.4.ebuild 2333 RMD160 d0029d2bfe28063fd0d512aefb19b44aa7e91501 SHA1 fa2590a4ac602798490369c0ef04d7edb7042b1f SHA256 38f0fbcbae4db89e7b20f32c63b4c66f81a21cec17bcfc06c87437803f40d47e -MISC ChangeLog 13617 RMD160 45ceb638ea4d36e83dd7bae2deefe0435ae4b141 SHA1 2ac6c194886d46d7e4fed724a2e3083f4a894fd8 SHA256 b89f5a1b31d74650cf4b2d616bc3e40e0c8cc42d92a1bb2628b0a35aec6f548a +EBUILD gajim-0.13.3.ebuild 2302 RMD160 39d61103e089c745044f4505b6dd6825747afc11 SHA1 815e062f8026368aad2ab2676a2baeee69df98f7 SHA256 ab2c5e68f8238d0777a33525802ff377ca934406fa1ddf40db7f0f88b4b2c262 +EBUILD gajim-0.13.4-r1.ebuild 2596 RMD160 4ec920773138a86580bd1a54c5751c5679d5e378 SHA1 c3e09ce061256c1a27886c36564aae53836eb6ee SHA256 9c77285c18de438d569663184bbbe6f9074d77d0533817cea48a577836b4c4e1 +EBUILD gajim-0.13.4.ebuild 2328 RMD160 d00eeaeb57593e72c3f75854cefb086d76ea419a SHA1 9b209d6b2d2f3b288cd2c1988c0f0e8d8c674d95 SHA256 31937f79466f31ea39da59649485ee9a46baaa2a19d0c73442c4b7ff5761b921 +MISC ChangeLog 14221 RMD160 e0f6581bc83e9225d1b992a8673339352706e59c SHA1 00c5fa75af6edd29de28ac3e005b20b854fcfc44 SHA256 a5f89c19fd256f29eb9363201f4284631ff34ceb2840364f7e5edc8b294b7f1d MISC metadata.xml 553 RMD160 b4780201449d6f310007285b642aaccb6c350d50 SHA1 f9751ca146c518a6f31f1c4f802044e9e3c08013 SHA256 1353489c91efdd5bb461c63152d259504c3aedcb2a3cd69847994c9b17314d9f +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkw52g8ACgkQgAnW8HDreRbjEgCeK5tZ5uUbEdvw+j+47FoU2h5I +BOsAnR5hD3yKQVW2pZbhfwc8iHr+g3Bd +=4T0G +-----END PGP SIGNATURE----- diff --git a/net-im/gajim/files/0.11.3-misc-fixes.patch b/net-im/gajim/files/0.11.3-misc-fixes.patch deleted file mode 100644 index 3a29cc312647..000000000000 --- a/net-im/gajim/files/0.11.3-misc-fixes.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ur gajim-0.11.3.orig/src/common/contacts.py gajim-0.11.3/src/common/contacts.py ---- gajim-0.11.3.orig/src/common/contacts.py 2007-11-04 20:52:21.000000000 +0000 -+++ gajim-0.11.3/src/common/contacts.py 2007-12-02 15:46:27.000000000 +0000 -@@ -420,6 +420,13 @@ - return 1 - if jid2 > jid1: - return -1 -+ #If all is the same, compare accounts, they can't be the same -+ account1 = data1['account'] -+ account2 = data2['account'] -+ if account1 > account2: -+ return 1 -+ if account2 > account1: -+ return -1 - return 0 - - def get_metacontacts_big_brother(self, family): -diff -ur gajim-0.11.3.orig/src/message_window.py gajim-0.11.3/src/message_window.py ---- gajim-0.11.3.orig/src/message_window.py 2007-12-02 15:42:13.000000000 +0000 -+++ gajim-0.11.3/src/message_window.py 2007-12-02 15:43:18.000000000 +0000 -@@ -576,9 +576,12 @@ - - def _on_notebook_key_press(self, widget, event): - control = self.get_active_control() -- #when we get a key press event in conversation textview, -+ # Ctrl+PageUP / DOWN has to be handled by notebook -+ if event.state & gtk.gdk.CONTROL_MASK and event.keyval in ( -+ gtk.keysyms.Page_Down, gtk.keysyms.Page_Up): -+ return False - if isinstance(control, ChatControlBase): -- #we forwarded it to message textview -+ # we forwarded it to message textview - control.msg_textview.emit('key_press_event', event) - control.msg_textview.grab_focus() - 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 5ea2cadb37a1..000000000000 --- 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 b9bf23bfb024..000000000000 --- 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 7c61f13fe133..000000000000 --- 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/files/fix_autotools_and_search_dirs.patch b/net-im/gajim/files/fix_autotools_and_search_dirs.patch deleted file mode 100644 index dea30dcfb545..000000000000 --- a/net-im/gajim/files/fix_autotools_and_search_dirs.patch +++ /dev/null @@ -1,114 +0,0 @@ -upstream: http://trac.gajim.org/ticket/4770 - -diff -r 15ddf05b958b -r 6c0f28cde899 configure.ac ---- a/configure.ac Tue Feb 03 21:18:37 2009 +0100 -+++ b/configure.ac Tue Feb 03 21:39:50 2009 +0100 -@@ -174,18 +174,12 @@ - AC_SUBST([PYTHON_INCLUDES]) - - AS_AC_EXPAND(DATADIR, "${datadir}") -- --AS_AC_EXPAND(LIBDIR, ${libdir}) -- -+AS_AC_EXPAND(LIBDIR, "${libdir}") - AS_AC_EXPAND(DOCDIR, "${docdir}") -+AS_AC_EXPAND(LOCALEDIR, "${localedir}") - - AC_SUBST(VERSION) - AC_SUBST(PACKAGE) --AC_SUBST(DATADIR) --AC_SUBST(LIBDIR) --AS_AC_EXPAND(DATADIR, "${DATADIR}") --AC_SUBST(DOCDIR) --AS_AC_EXPAND(DOCDIR, "${DOCDIR}") - - AC_CONFIG_FILES([ - Makefile -diff -r 15ddf05b958b -r 6c0f28cde899 data/defs.py.in ---- a/data/defs.py.in Tue Feb 03 21:18:37 2009 +0100 -+++ b/data/defs.py.in Tue Feb 03 21:39:50 2009 +0100 -@@ -4,4 +4,6 @@ - - datadir = "@DATADIR@" - -+localedir = "@LOCALEDIR@" -+ - version = "@VERSION@" -diff -r 15ddf05b958b -r 6c0f28cde899 m4/acinclude.m4 ---- a/m4/acinclude.m4 Tue Feb 03 21:18:37 2009 +0100 -+++ b/m4/acinclude.m4 Tue Feb 03 21:39:50 2009 +0100 -@@ -1,6 +1,15 @@ -+dnl as-ac-expand.m4 0.2.0 -*- autoconf -*- -+dnl autostars m4 macro for expanding directories using configure's prefix -+ -+dnl (C) 2003, 2004, 2005 Thomas Vander Stichele -+ -+dnl Copying and distribution of this file, with or without modification, -+dnl are permitted in any medium without royalty provided the copyright -+dnl notice and this notice are preserved. -+ - dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) --dnl --dnl example -+ -+dnl example: - dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) - dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local - -@@ -15,7 +24,7 @@ - - dnl if no prefix given, then use /usr/local, the default prefix - if test "x$prefix" = "xNONE"; then -- prefix=$ac_default_prefix -+ prefix="$ac_default_prefix" - fi - dnl if no exec_prefix given, then use prefix - if test "x$exec_prefix" = "xNONE"; then -@@ -26,7 +35,7 @@ - dnl loop until it doesn't change anymore - while true; do - new_full_var="`eval echo $full_var`" -- if test "x$new_full_var"="x$full_var"; then break; fi -+ if test "x$new_full_var" = "x$full_var"; then break; fi - full_var=$new_full_var - done - -diff -r 15ddf05b958b -r 6c0f28cde899 src/common/defs.py ---- a/src/common/defs.py Tue Feb 03 21:18:37 2009 +0100 -+++ b/src/common/defs.py Tue Feb 03 21:39:50 2009 +0100 -@@ -25,6 +25,7 @@ - - docdir = '../' - datadir = '../' -+localedir = '../po' - - version = '0.12.1.2-svn' - -diff -r 15ddf05b958b -r 6c0f28cde899 src/common/i18n.py ---- a/src/common/i18n.py Tue Feb 03 21:18:37 2009 +0100 -+++ b/src/common/i18n.py Tue Feb 03 21:39:50 2009 +0100 -@@ -26,10 +26,8 @@ - import os - - APP = 'gajim' --if os.path.isdir('../po'): -- DIR = '../po' --else: -- DIR = '../../locale' -+import defs -+DIR = defs.localedir - - # set '' so each part of the locale that should be modified is set - # according to the environment variables -diff -r 15ddf05b958b -r 6c0f28cde899 src/gtkgui_helpers.py ---- a/src/gtkgui_helpers.py Tue Feb 03 21:18:37 2009 +0100 -+++ b/src/gtkgui_helpers.py Tue Feb 03 21:39:50 2009 +0100 -@@ -61,7 +61,7 @@ - screen_w = gtk.gdk.screen_width() - screen_h = gtk.gdk.screen_height() - --GLADE_DIR = os.path.join('..', 'data', 'glade') -+GLADE_DIR = os.path.join(gajim.DATA_DIR, 'glade') - def get_glade(file_name, root = None): - file_path = os.path.join(GLADE_DIR, file_name) - return gtk.glade.XML(file_path, root=root, domain=i18n.APP) diff --git a/net-im/gajim/files/gajim-0.11.4-test_fix.patch b/net-im/gajim/files/gajim-0.11.4-test_fix.patch deleted file mode 100644 index 26abc0f63b0a..000000000000 --- a/net-im/gajim/files/gajim-0.11.4-test_fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ur gajim-0.11.4.orig/autogen.sh gajim-0.11.4/autogen.sh ---- gajim-0.11.4.orig/autogen.sh 2008-01-22 17:14:06.000000000 +0000 -+++ gajim-0.11.4/autogen.sh 2008-01-22 17:14:50.000000000 +0000 -@@ -1,7 +1,7 @@ - #!/usr/bin/env bash - echo "[encoding: UTF-8]" > po/POTFILES.in \ - && ls -1 -U data/gajim.desktop.in.in data/glade/*.glade \ -- src/*py src/common/*py src/common/zeroconf/*.py >> \ -+ src/*py src/common/*py src/common/zeroconf/*.py src/osx/*.py >> \ - po/POTFILES.in || exit 1 - if test -z `which pkg-config 2>/dev/null`;then - echo "***Error: pkg-config not found***" -diff -ur gajim-0.11.4.orig/po/POTFILES.skip gajim-0.11.4/po/POTFILES.skip ---- gajim-0.11.4.orig/po/POTFILES.skip 2008-01-22 17:14:06.000000000 +0000 -+++ gajim-0.11.4/po/POTFILES.skip 2008-01-22 17:15:27.000000000 +0000 -@@ -1 +1,2 @@ -- -+data/gajim.desktop.in -+src/eggtrayicon.c diff --git a/net-im/gajim/files/gajim-0.13-autotools--enable-site-packages_option.patch b/net-im/gajim/files/gajim-0.13-autotools-enable-site-packages_option.patch similarity index 100% rename from net-im/gajim/files/gajim-0.13-autotools--enable-site-packages_option.patch rename to net-im/gajim/files/gajim-0.13-autotools-enable-site-packages_option.patch diff --git a/net-im/gajim/gajim-0.11.4.ebuild b/net-im/gajim/gajim-0.11.4.ebuild deleted file mode 100644 index 616dd60a36f2..000000000000 --- a/net-im/gajim/gajim-0.11.4.ebuild +++ /dev/null @@ -1,88 +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.11.4.ebuild,v 1.8 2009/07/21 11:34:22 ssuominen Exp $ - -EAPI=2 -inherit multilib python eutils - -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,xml] - 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" - -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 - else - if has_version " config/py-compile diff --git a/net-im/gajim/gajim-0.13.4.ebuild b/net-im/gajim/gajim-0.13.4.ebuild index 53f4076cbb55..119ed663eea9 100644 --- a/net-im/gajim/gajim-0.13.4.ebuild +++ b/net-im/gajim/gajim-0.13.4.ebuild @@ -1,6 +1,6 @@ # 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.13.4.ebuild,v 1.3 2010/07/06 16:04:23 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.13.4.ebuild,v 1.4 2010/07/11 14:49:45 jlec Exp $ EAPI="2" @@ -63,7 +63,7 @@ src_prepare() { # install pyfiles in /usr/lib/python2.x/site-packages/gajim # upstream: http://trac.gajim.org/ticket/5460 # Should be in 0.14 - epatch "${FILESDIR}/${PN}-0.13-autotools--enable-site-packages_option.patch" + epatch "${FILESDIR}/${PN}-0.13-autotools-enable-site-packages_option.patch" eautoreconf } -- 2.26.2