diff options
-rw-r--r-- | net-im/gaim/ChangeLog | 6 | ||||
-rw-r--r-- | net-im/gaim/files/digest-gaim-2.0.0_beta2 | 1 | ||||
-rw-r--r-- | net-im/gaim/gaim-2.0.0_beta1.ebuild | 155 | ||||
-rw-r--r-- | net-im/gaim/gaim-2.0.0_beta2-r1.ebuild | 4 | ||||
-rw-r--r-- | net-im/gaim/gaim-2.0.0_beta2.ebuild | 166 |
5 files changed, 7 insertions, 325 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog index 54ab9430786c..9fb216a7d7c8 100644 --- a/net-im/gaim/ChangeLog +++ b/net-im/gaim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/gaim # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.382 2006/02/14 23:02:35 gothgirl Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.383 2006/02/17 12:16:08 gothgirl Exp $ + + 17 Feb 2006; kathryn <gothgirl@gentoo.org> -gaim-2.0.0_beta1.ebuild, + -gaim-2.0.0_beta2.ebuild, gaim-2.0.0_beta2-r1.ebuild: + removed beta1 ebuilds and fixed IUSE for beta2 *gaim-2.0.0_beta2-r1 (14 Feb 2006) diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta2 b/net-im/gaim/files/digest-gaim-2.0.0_beta2 deleted file mode 100644 index 88ade5d0c3ed..000000000000 --- a/net-im/gaim/files/digest-gaim-2.0.0_beta2 +++ /dev/null @@ -1 +0,0 @@ -MD5 f01c99b4556bde703a81d8ac16ebe6ab gaim-2.0.0beta2.tar.bz2 7353162 diff --git a/net-im/gaim/gaim-2.0.0_beta1.ebuild b/net-im/gaim/gaim-2.0.0_beta1.ebuild deleted file mode 100644 index 9511ce59b9f2..000000000000 --- a/net-im/gaim/gaim-2.0.0_beta1.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta1.ebuild,v 1.5 2005/12/20 14:05:54 tester Exp $ - -inherit flag-o-matic eutils toolchain-funcs debug multilib mono - -MY_P=${P/_beta/beta} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="GTK Instant Messenger client" -HOMEPAGE="http://gaim.sourceforge.net/" -SRC_URI="mirror://sourceforge/gaim/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="nls perl spell nas cjk gnutls silc eds krb4 tcltk debug dbus mono" - -RDEPEND=">=x11-libs/gtk+-2.0 - >=dev-libs/glib-2.0 - nas? ( >=media-libs/nas-1.4.1-r1 ) - media-libs/libao - >=media-libs/audiofile-0.2.0 - mono? ( dev-lang/mono ) - dbus? ( sys-apps/dbus ) - perl? ( >=dev-lang/perl-5.8.2-r1 - !<perl-core/ExtUtils-MakeMaker-6.17 ) - spell? ( >=app-text/gtkspell-2.0.2 ) - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/nss-3.9.2-r2 ) - silc? ( >=net-im/silc-toolkit-0.9.12-r3 ) - eds? ( gnome-extra/evolution-data-server ) - krb4? ( >=app-crypt/mit-krb5-1.3.6-r1 ) - tcltk? ( dev-lang/tcl - dev-lang/tk )" - -#Voice video support for when it is added from upstream -# vv? ( media-libs/speex -# net-libs/ortp -# dev-libs/ilbc-rfc3951 ) -# x11-libs/startup-notifi3cation" - -DEPEND="$RDEPEND - dev-util/pkgconfig - nls? ( sys-devel/gettext )" - -# List of plugins -# app-accessibility/festival-gaim -# net-im/gaim-blogger -# net-im/gaim-bnet -# net-im/gaim-meanwhile -# net-im/gaim-snpp -# x11-plugins/autoprofile -# x11-plugins/gaim-assistant -# x11-plugins/gaim-encryption -# x11-plugins/gaim-extprefs -# x11-plugins/gaim-latex -# x11-plugins/gaim-otr -# x11-plugins/gaim-rhythmbox -# x11-plugins/gaim-xmms-remote -# x11-plugins/gaimosd -# x11-plugins/guifications - - -print_gaim_warning() { - ewarn - ewarn "If you are merging ${P} from an earlier version, you may need" - ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp." - ewarn - ewarn "If you experience problems with gaim, file them as bugs with" - ewarn "Gentoo's bugzilla, http://bugs.gentoo.org. DO NOT report them" - ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT" - ewarn "seek help in #gaim." - ewarn - ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg" - ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on" - ewarn "backtraces." - ewarn - ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php" - ewarn - ewarn "Please note some plugins will not build properly with 2.0_beta1" - ewarn - einfo - einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS." - einfo - ebeep 5 - epause 3 -} - -pkg_setup() { - print_gaim_warning - if use krb4 && ! built_with_use app-crypt/mit-krb5 krb4 ; then - eerror - eerror You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to - eerror enable krb4 support for the zephyr protocol in gaim. - eerror - die "Configure failed" - fi -} - -src_unpack() { - unpack ${A} - cd ${S} - use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch -} - -src_compile() { - # Stabilize things, for your own good - strip-flags - replace-flags -O? -O2 - - # -msse2 doesn't play nice on gcc 3.2 - [ "`gcc-version`" == "3.2" ] && filter-flags -msse2 - - local myconf - use debug && myconf="${myconf} --enable-debug" - use perl || myconf="${myconf} --disable-perl" - use spell || myconf="${myconf} --disable-gtkspell" - use nls || myconf="${myconf} --disable-nls" - use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas" - use eds || myconf="${myconf} --disable-gevolution" - use krb4 && myconf="${myconf} --with-krb4" - use mono && myconf="${myconf} --enable-mono" - use dbus && myconf="${myconf} --enable-dbus" - #use vv && myconf="${myconf} --enable-vv" - use tcltk || myconf="${myconf} --disable-tcl --disable-tk" - - if use gnutls ; then - einfo "Disabling NSS, using GnuTLS" - myconf="${myconf} --enable-nss=no" - myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls" - myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)" - else - einfo "Disabling GnuTLS, using NSS" - myconf="${myconf} --enable-gnutls=no" - myconf="${myconf} --with-nspr-includes=/usr/include/nspr" - myconf="${myconf} --with-nss-includes=/usr/include/nss" - myconf="${myconf} --with-nspr-libs=/usr/$(get_libdir)/nspr" - myconf="${myconf} --with-nss-libs=/usr/$(get_libdir)/nss" - fi - - - econf ${myconf} || die "Configuration failed" - - emake -j1 || die "Make failed" -} - -src_install() { - make install DESTDIR=${D} || die "Install failed" - dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION -} - -pkg_postinst() { - print_gaim_warning -} diff --git a/net-im/gaim/gaim-2.0.0_beta2-r1.ebuild b/net-im/gaim/gaim-2.0.0_beta2-r1.ebuild index 0563cb2560dc..08481d872d26 100644 --- a/net-im/gaim/gaim-2.0.0_beta2-r1.ebuild +++ b/net-im/gaim/gaim-2.0.0_beta2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta2-r1.ebuild,v 1.1 2006/02/14 23:02:35 gothgirl Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta2-r1.ebuild,v 1.2 2006/02/17 12:16:09 gothgirl Exp $ inherit flag-o-matic eutils toolchain-funcs debug multilib mono @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/gaim/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="bonjour dbus nls perl spell nas cjk gnutls silc eds krb4 tcltk debug mono xscreensaver" +IUSE="bonjour dbus nls perl spell nas cjk gnutls silc eds krb4 tcltk debug mono xscreensaver startup-notification" RDEPEND="media-libs/libao media-libs/audiofile diff --git a/net-im/gaim/gaim-2.0.0_beta2.ebuild b/net-im/gaim/gaim-2.0.0_beta2.ebuild deleted file mode 100644 index 6a2042c2f54c..000000000000 --- a/net-im/gaim/gaim-2.0.0_beta2.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta2.ebuild,v 1.2 2006/01/30 17:46:36 dertobi123 Exp $ - -inherit flag-o-matic eutils toolchain-funcs debug multilib mono - -MY_PV=${PV/_beta/beta} -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK Instant Messenger client" -HOMEPAGE="http://gaim.sourceforge.net/" -SRC_URI="mirror://sourceforge/gaim/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="bonjour dbus nls perl spell nas cjk gnutls silc eds krb4 tcltk debug mono xscreensaver" - -RDEPEND="media-libs/libao - media-libs/audiofile - bonjour? ( net-misc/howl ) - dbus? ( >=sys-apps/dbus-0.35 - >=dev-lang/python-2.4 ) - >=x11-libs/gtk+-2.0 - >=dev-libs/glib-2.0 - nas? ( >=media-libs/nas-1.4.1-r1 ) - perl? ( >=dev-lang/perl-5.8.2-r1 - !<perl-core/ExtUtils-MakeMaker-6.17 ) - spell? ( >=app-text/gtkspell-2.0.2 ) - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/nss-3.9.2-r2 ) - silc? ( >=net-im/silc-toolkit-0.9.12-r3 ) - eds? ( gnome-extra/evolution-data-server ) - krb4? ( >=app-crypt/mit-krb5-1.3.6-r1 ) - tcltk? ( dev-lang/tcl - dev-lang/tk ) - startup-notification? ( >=x11-libs/startup-notification-0.5 ) - mono? ( dev-lang/mono ) - xscreensaver? ( x11-misc/xscreensaver )" - -DEPEND="$RDEPEND - dev-util/pkgconfig - x11-libs/startup-notification - nls? ( sys-devel/gettext )" - -S="${WORKDIR}/${MY_P}" - -# List of plugins -# app-accessibility/festival-gaim -# net-im/gaim-blogger -# net-im/gaim-bnet -# net-im/gaim-meanwhile -# net-im/gaim-snpp -# x11-plugins/autoprofile -# x11-plugins/gaim-assistant -# x11-plugins/gaim-encryption -# x11-plugins/gaim-extprefs -# x11-plugins/gaim-latex -# x11-plugins/gaim-otr -# x11-plugins/gaim-rhythmbox -# x11-plugins/gaim-xmms-remote -# x11-plugins/gaimosd -# x11-plugins/guifications - - -print_gaim_warning() { - ewarn - ewarn "This is a beta release! Please back up everything in your .gaim" - ewarn "directory. We're looking for lots of feedback on this release" - ewarn "especially what you love about it and what you hate about it." - ewarn - ewarn "Again, this is a beta release and should not be used by those" - ewarn "with a heart condition, if you are pregnant, or if you are under" - ewarn "the age of 8. Side-effects include awesomeness, dumbfoundedness," - ewarn "dry mouth and lava. Consult your doctor to find out if" - ewarn "${MY_P} is right for you." - ewarn - ewarn "If you are merging ${MY_P} from an earlier version, you may need" - ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp." - ewarn - ewarn "If you experience problems with gaim, file them as bugs with" - ewarn "Gentoo's bugzilla, http://bugs.gentoo.org. DO NOT report them" - ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT" - ewarn "seek help in #gaim." - ewarn - ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg" - ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on" - ewarn "backtraces." - ewarn - ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php" - ewarn - einfo - einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS." - einfo - ebeep 5 - epause 3 -} - -pkg_setup() { - print_gaim_warning - if use krb4 && ! built_with_use app-crypt/mit-krb5 krb4 ; then - eerror - eerror You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to - eerror enable krb4 support for the zephyr protocol in gaim. - eerror - die "Configure failed" - fi -} - -src_unpack() { - unpack ${A} - cd ${S} -} - -src_compile() { - # Stabilize things, for your own good - strip-flags - replace-flags -O? -O2 - - # -msse2 doesn't play nice on gcc 3.2 - [ "`gcc-version`" == "3.2" ] && filter-flags -msse2 - - local myconf - use truespeech && myconf="${myconf} --enable-truespeech" - use ao || use audiofile || myconf="${myconf} --disable-audio" - use dbus && myconf="${myconf} --enable-dbus" - use debug && myconf="${myconf} --enable-debug" - use perl || myconf="${myconf} --disable-perl" - use spell || myconf="${myconf} --disable-gtkspell" - use nls || myconf="${myconf} --disable-nls" - use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas" - use eds || myconf="${myconf} --disable-gevolution" - use krb4 && myconf="${myconf} --with-krb4" - use tcltk || myconf="${myconf} --disable-tcl --disable-tk" - use xscreensaver || myconf="${myconf} --disable-screensaver" - use startup-notification || myconf="${myconf} --disable-startup-notification" - use mono && myconf="${myconf} --enable-mono" - use silc && myconf="${myconf} --with-slic-includes=$(get_includedir)/silc-toolkit --with-silc-libs=$(get_libdir)/silc-toolkit" - - if use gnutls ; then - einfo "Disabling NSS, using GnuTLS" - myconf="${myconf} --enable-nss=no" - myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls" - myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)" - else - einfo "Disabling GnuTLS, using NSS" - myconf="${myconf} --enable-gnutls=no" - myconf="${myconf} --with-nspr-includes=/usr/include/nspr" - myconf="${myconf} --with-nss-includes=/usr/include/nss" - myconf="${myconf} --with-nspr-libs=/usr/$(get_libdir)/nspr" - myconf="${myconf} --with-nss-libs=/usr/$(get_libdir)/nss" - fi - - econf ${myconf} || die "Configuration failed" - - emake -j1 || die "Make failed" -} - -src_install() { - make install DESTDIR=${D} || die "Install failed" - dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION -} - -pkg_postinst() { - print_gaim_warning -} |