diff options
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/gajim/ChangeLog | 8 | ||||
| -rw-r--r-- | net-im/gajim/files/digest-gajim-0.10.1 | 3 | ||||
| -rw-r--r-- | net-im/gajim/files/digest-gajim-0.11-r3 | 3 | ||||
| -rw-r--r-- | net-im/gajim/files/gajim-10.1-FLAGS_noOverride.patch | 63 | ||||
| -rw-r--r-- | net-im/gajim/files/gajim-10.1-Makefile.patch | 13 | ||||
| -rw-r--r-- | net-im/gajim/gajim-0.10.1.ebuild | 83 | ||||
| -rw-r--r-- | net-im/gajim/gajim-0.11-r3.ebuild | 103 |
7 files changed, 7 insertions, 269 deletions
diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog index da333808108b..6b8fdc062d38 100644 --- a/net-im/gajim/ChangeLog +++ b/net-im/gajim/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/gajim # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.53 2007/06/19 13:09:36 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.54 2007/06/19 16:17:49 welp Exp $ + + 19 Jun 2007; Peter Weller <welp@gentoo.org> + -files/gajim-10.1-FLAGS_noOverride.patch, + -files/gajim-10.1-Makefile.patch, -gajim-0.10.1.ebuild, + -gajim-0.11-r3.ebuild: + Removed obsolete versions. 19 Jun 2007; Raúl Porcel <armin76@gentoo.org> gajim-0.11.1.ebuild: alpha stable diff --git a/net-im/gajim/files/digest-gajim-0.10.1 b/net-im/gajim/files/digest-gajim-0.10.1 deleted file mode 100644 index 967e1aea680a..000000000000 --- a/net-im/gajim/files/digest-gajim-0.10.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 392d9d1e06f6db49a892b9aea4a178c7 gajim-0.10.1.tar.bz2 2066396 -RMD160 405b813db9b7e4aa4c690a77108948886c61fc62 gajim-0.10.1.tar.bz2 2066396 -SHA256 b167a3405d8a5e9a3913fe711562a9cb8bb8dbfc78240dbb5b3c9c51a1610174 gajim-0.10.1.tar.bz2 2066396 diff --git a/net-im/gajim/files/digest-gajim-0.11-r3 b/net-im/gajim/files/digest-gajim-0.11-r3 deleted file mode 100644 index 3d9955948df8..000000000000 --- a/net-im/gajim/files/digest-gajim-0.11-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7ac7ac6fdfc515cb927adf21793856fa gajim-0.11.tar.bz2 2684957 -RMD160 ff92f3914eb14596f725a47efa04acb402053723 gajim-0.11.tar.bz2 2684957 -SHA256 1b660d2516b918fdba7533aab3dead8c222c98964ea459c5e4204c4949055422 gajim-0.11.tar.bz2 2684957 diff --git a/net-im/gajim/files/gajim-10.1-FLAGS_noOverride.patch b/net-im/gajim/files/gajim-10.1-FLAGS_noOverride.patch deleted file mode 100644 index c680fee26c9c..000000000000 --- a/net-im/gajim/files/gajim-10.1-FLAGS_noOverride.patch +++ /dev/null @@ -1,63 +0,0 @@ -Index: src/Makefile -=================================================================== ---- src/Makefile (revision 6612) -+++ src/Makefile (working copy) -@@ -1,21 +1,24 @@ - # Set the C flags to include the GTK+ and Python libraries - PYTHON ?= python - PYTHONVER = `$(PYTHON) -c 'import sys; print sys.version[:3]'` --CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fPIC -I/usr/include/python$(PYTHONVER) -I. --LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` -lpython$(PYTHONVER) -+gtk_CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fPIC -I/usr/include/python$(PYTHONVER) -I. -+gtk_LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` -lpython$(PYTHONVER) - - all: trayicon.so gtkspell.so - - # Build the shared objects - trayicon.so: trayicon.o eggtrayicon.o trayiconmodule.o -- $(CC) $(LDFLAGS) -shared $^ -o $@ -+ $(CC) -shared $^ -o $@ $(LDFLAGS) $(gtk_LDFLAGS) - - gtkspell.so: -- $(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) `pkg-config --libs --cflags gtkspell-2.0` -shared gtkspellmodule.c $^ -o $@ -+ $(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) $(gtk_CFLAGS) $(gtk_LDFLAGS) `pkg-config --libs --cflags gtkspell-2.0` -shared gtkspellmodule.c $^ -o $@ - - # The path to the GTK+ python types - DEFS=`pkg-config --variable=defsdir pygtk-2.0` - -+%.o: %.c -+ $(CC) -o $@ -c $< $(CFLAGS) $(gtk_CFLAGS) -+ - # Generate the C wrapper from the defs and our override file - trayicon.c: trayicon.defs trayicon.override - pygtk-codegen-2.0 --prefix trayicon \ -Index: src/common/Makefile -=================================================================== ---- src/common/Makefile (revision 6612) -+++ src/common/Makefile (working copy) -@@ -6,19 +6,19 @@ - - ifeq ($(HAVE_XSCRNSAVER),YES) - # We link with libXScrnsaver from modular X.Org X11 --CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0 xscrnsaver` -fpic -I/usr/include/python$(PYTHONVER) -I. --LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0 xscrnsaver` -lpython$(PYTHONVER) -+gtk_and_x_CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0 xscrnsaver` -fpic -I/usr/include/python$(PYTHONVER) -I. -+gtk_and_x_LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0 xscrnsaver` -lpython$(PYTHONVER) - else - # # We link with libXScrnsaver from monolithic X.Org X11 --CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fpic -I/usr/include/python$(PYTHONVER) -I. --LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` -L/usr/X11R6$(LIBDIR) -lX11 \ -- -lXss -lXext -lpython$(PYTHONVER) -+gtk_and_x_CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fpic -I/usr/include/python$(PYTHONVER) -I. -+gtk_and_x_LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` \ -+ -L/usr/X11R6$(LIBDIR) -lX11 -lXss -lXext -lpython$(PYTHONVER) - endif - - all: idle.so - - idle.so: -- $(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) -shared idle.c $^ -o $@ -+ $(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) $(gtk_and_x_CFLAGS) $(gtk_and_x_LDFLAGS) -shared idle.c $^ -o $@ - - clean: - rm -f *.so diff --git a/net-im/gajim/files/gajim-10.1-Makefile.patch b/net-im/gajim/files/gajim-10.1-Makefile.patch deleted file mode 100644 index 9fa724efe8b0..000000000000 --- a/net-im/gajim/files/gajim-10.1-Makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.orig 2006-07-07 12:35:52.000000000 +0300 -+++ Makefile 2006-07-07 13:00:35.000000000 +0300 -@@ -87,7 +87,9 @@ - mkdir -p "$(DESTDIR)$(PREFIX)/share/locale/$$d"; \ - fi; \ - done -- ${MAKE} -C po install PREFIX=$(PREFIX) -+ if [[ -n $$(find po -name *.mo) ]]; then \ -+ ${MAKE} -C po install PREFIX=$(PREFIX) ; \ -+ fi - cp COPYING "$(DESTDIR)$(PREFIX)/share/gajim/"; - cp THANKS "$(DESTDIR)$(PREFIX)/share/gajim/"; - mkdir -p "$(DESTDIR)$(PREFIX)/share/pixmaps"; diff --git a/net-im/gajim/gajim-0.10.1.ebuild b/net-im/gajim/gajim-0.10.1.ebuild deleted file mode 100644 index 7d9f78f016d3..000000000000 --- a/net-im/gajim/gajim-0.10.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.10.1.ebuild,v 1.15 2007/05/26 21:38:27 welp Exp $ - -inherit virtualx multilib eutils - -DESCRIPTION="Jabber client written in PyGTK" -HOMEPAGE="http://www.gajim.org/" -SRC_URI="http://www.gajim.org/downloads/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ppc sparc x86" -IUSE="dbus gnome libnotify nls spell srv" - -RDEPEND="!<=dev-python/gnome-python-2 - >=dev-python/pygtk-2.8.2 - >=dev-python/pysqlite-2.0.5 - dbus? ( - || ( - ( >=sys-apps/dbus-0.90 - dev-python/dbus-python - dev-libs/dbus-glib - ) - ( <sys-apps/dbus-0.90 ) - ) - ) - gnome? ( >=dev-python/gnome-python-extras-2.10 ) - libnotify? ( x11-libs/libnotify ) - srv? ( net-dns/bind-tools )" - -DEPEND="dev-util/intltool - dev-util/pkgconfig - !gnome? ( spell? ( >=app-text/gtkspell-2.0.11 ) ) - input_devices_keyboard? ( x11-libs/libXScrnSaver )" - -pkg_setup() { - if use dbus; then - if has_version "<sys-apps/dbus-0.90" && ! built_with_use sys-apps/dbus python; then - eerror "Please rebuild dbus with USE=\"python\"." - die "Python D-bus support missing." - fi - fi - if use libnotify && ! use dbus; then - eerror "With libnotify useflag, you must also enable dbus useflag." - die "Please enable dbus useflag." - fi -} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/gajim-10.1-Makefile.patch - epatch ${FILESDIR}/gajim-10.1-FLAGS_noOverride.patch -} - -src_compile() { - targets="idle gajim.desktop" - ! use gnome && targets="${targets} trayicon" - use nls && targets="${targets} translation" - ! use gnome && use spell && targets="${targets} gtkspell" - Xemake ${targets} || die "Xemake failed" -} - -src_install() { - Xemake PREFIX=/usr DESTDIR=${D} LIBDIR=/$(get_libdir) install || die - dodoc README AUTHORS COPYING Changelog -} - -pkg_postinst() { - if use amd64; then - ewarn - ewarn "Because of an unresolved segmentation fault," - ewarn "amd64 users must probably upgrade to gcc >= 4.0.2," - ewarn "and rebuild the following packages :" - ewarn " - x11-libs/gtk+" - ewarn " - dev-python/pygtk" - ewarn " - dev-lang/python" - ewarn - ewarn "Please see bug #109298." - ewarn - fi -} diff --git a/net-im/gajim/gajim-0.11-r3.ebuild b/net-im/gajim/gajim-0.11-r3.ebuild deleted file mode 100644 index d53d11d59474..000000000000 --- a/net-im/gajim/gajim-0.11-r3.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.11-r3.ebuild,v 1.12 2007/01/24 14:21:09 corsair Exp $ - -inherit multilib python eutils - -DESCRIPTION="Jabber client written in PyGTK" -HOMEPAGE="http://www.gajim.org/" -SRC_URI="http://www.gajim.org/downloads/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="avahi dbus gnome idle libnotify nls spell srv trayicon X xhtml" - -DEPEND="|| ( - ( <dev-lang/python-2.5 dev-python/pysqlite ) - >=dev-lang/python-2.5 - ) - 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? ( - || ( - ( >=sys-apps/dbus-0.90 - dev-python/dbus-python - dev-libs/dbus-glib - ) - ( <sys-apps/dbus-0.90 ) - ) - ) - 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 )" - -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 "<sys-apps/dbus-0.90" && ! built_with_use sys-apps/dbus python; then - eerror "Please rebuild dbus with USE=\"python\"" - die "USE=\"python\" needed for dbus" - fi - fi - - if use avahi; then - if ! built_with_use net-dns/avahi dbus gtk python; then - eerror "The following USE flags are required for correct avahi" - eerror "support: dbus gtk python" - die "Please rebuild avahi with these use flags enabled." - fi - fi -} - -src_compile() { - 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}" \ - --prefix="/usr" \ - --libdir="/usr/$(get_libdir)" \ - ${myconf} || die "econf failed" - - emake || die "emake 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 /usr/share/gajim/ -} - -pkg_postrm() { - python_mod_cleanup /usr/share/gajim/ -} |