removed beta1 ebuilds and fixed IUSE on beta2
authorKathryn Kulick <gothgirl@gentoo.org>
Fri, 17 Feb 2006 12:16:09 +0000 (12:16 +0000)
committerKathryn Kulick <gothgirl@gentoo.org>
Fri, 17 Feb 2006 12:16:09 +0000 (12:16 +0000)
Package-Manager: portage-2.1_pre4-r1

net-im/gaim/ChangeLog
net-im/gaim/Manifest
net-im/gaim/files/digest-gaim-2.0.0_beta2 [deleted file]
net-im/gaim/gaim-2.0.0_beta1.ebuild [deleted file]
net-im/gaim/gaim-2.0.0_beta2-r1.ebuild
net-im/gaim/gaim-2.0.0_beta2.ebuild [deleted file]

index 54ab9430786c1ae3c28af6f5ca2e92159a0c2355..9fb216a7d7c87e3af1f783232a6ddb487ec792f1 100644 (file)
@@ -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)
 
index 7b0da7d4275718d298f9d686c74d977e785d30db..254f9b82160e6906b183e395b241337913cffc31 100644 (file)
@@ -1,21 +1,9 @@
-MD5 6e7f504f879d700790873c6f05a45124 ChangeLog 55409
-RMD160 f51b26a182fc4236e60a9b36cd887751aa47347a ChangeLog 55409
-SHA256 3dcff193aa4bd382f3cabdff4f7f6f16232f6bc384488394a32c059f426851be ChangeLog 55409
+MD5 f51679f91a48f9bce39e7f782458ec9c ChangeLog 55586
+RMD160 9222796009bbb20b8838e0874c0e8dcb6e8d41ed ChangeLog 55586
+SHA256 2633f79507e1f0d8824bbb3955b302cf754123c731ea27c40c79740b34c3d2c6 ChangeLog 55586
 MD5 55807d838af0375bc41eabe3534fdda8 files/digest-gaim-1.5.0 64
 RMD160 35345ec4b0fe16f5f1862974ba20bef7b54bfdbb files/digest-gaim-1.5.0 64
 SHA256 6d0d6a97397284c18dd881305d135a634f77b01c762cd8232f8b626d97841036 files/digest-gaim-1.5.0 64
-MD5 2c4a27af96f02fda96088c16ba7391e2 files/digest-gaim-2.0.0_beta1 69
-RMD160 41af85e79e0d123db94bd5479e5544bcec87eaa4 files/digest-gaim-2.0.0_beta1 69
-SHA256 9ddf811139ab1606a1c44a00b174def9f55a63a47acfcf39d8e0a7da0bfc462e files/digest-gaim-2.0.0_beta1 69
-MD5 2c4a27af96f02fda96088c16ba7391e2 files/digest-gaim-2.0.0_beta1-r2 69
-RMD160 41af85e79e0d123db94bd5479e5544bcec87eaa4 files/digest-gaim-2.0.0_beta1-r2 69
-SHA256 9ddf811139ab1606a1c44a00b174def9f55a63a47acfcf39d8e0a7da0bfc462e files/digest-gaim-2.0.0_beta1-r2 69
-MD5 2c4a27af96f02fda96088c16ba7391e2 files/digest-gaim-2.0.0_beta1-r3 69
-RMD160 41af85e79e0d123db94bd5479e5544bcec87eaa4 files/digest-gaim-2.0.0_beta1-r3 69
-SHA256 9ddf811139ab1606a1c44a00b174def9f55a63a47acfcf39d8e0a7da0bfc462e files/digest-gaim-2.0.0_beta1-r3 69
-MD5 1feea9b517bc90de84f841bf8a26f18f files/digest-gaim-2.0.0_beta2 69
-RMD160 2cdbc4480432d0cb204651a2ea35601774b1876c files/digest-gaim-2.0.0_beta2 69
-SHA256 6b2acddee43e46216735c56e6e1cabf161aea81b2e465264126590752b39095d files/digest-gaim-2.0.0_beta2 69
 MD5 5447214c866d2701435a0b84e7280d71 files/digest-gaim-2.0.0_beta2-r1 253
 RMD160 3c53d5682c6d05cfd6c0f48b162c5eb673c4b6cf files/digest-gaim-2.0.0_beta2-r1 253
 SHA256 ccf624a4c27f49a823a5e988cfe639813ddcddb99efcea971b6cf79f8d3f484c files/digest-gaim-2.0.0_beta2-r1 253
@@ -31,15 +19,9 @@ SHA256 2ea398683c63cfb99404be239eb7977ca5d0d063412d52ad33d17a5d12cc319c gaim-2.0
 MD5 9b6693ba4f48fff6ea644ac0eec0d008 gaim-2.0.0_beta1-r3.ebuild 5352
 RMD160 ba12b0fd9e7e8692568ae9d39276eb9ac58b0682 gaim-2.0.0_beta1-r3.ebuild 5352
 SHA256 69392365bbdb45e99c4c73f91e5f740149f214a2fc1c1fe205cc9f1ae4104548 gaim-2.0.0_beta1-r3.ebuild 5352
-MD5 12626653ef7113ed485dee81da7dd8e1 gaim-2.0.0_beta1.ebuild 4595
-RMD160 098e72888c0f3f5202557b7fb9dabd2952ffb9be gaim-2.0.0_beta1.ebuild 4595
-SHA256 61a855e199c61234a53632c88fd58f7f6e9dedb8293305fc49d1d0cd02be85ea gaim-2.0.0_beta1.ebuild 4595
-MD5 e3ecc8935f7819a0cdec349ddaef848e gaim-2.0.0_beta2-r1.ebuild 5478
-RMD160 c0d79254094f1d59834ded0c5b0a2912edcf3fea gaim-2.0.0_beta2-r1.ebuild 5478
-SHA256 6630f2ace437b310473c84696a8a2ce9f317c959595747c938d5d63b0f1e328b gaim-2.0.0_beta2-r1.ebuild 5478
-MD5 49a069d9da8c3cb8455e85dbc6af39e1 gaim-2.0.0_beta2.ebuild 5477
-RMD160 be12b0fca566824c14f21efb86874d3e05aa16ec gaim-2.0.0_beta2.ebuild 5477
-SHA256 1199b367ad1e49f124010be6fc2e6b19c9bc3a1d0d644a17e547edba2e76ed16 gaim-2.0.0_beta2.ebuild 5477
+MD5 291f88ed70209e4471f344505fa52416 gaim-2.0.0_beta2-r1.ebuild 5499
+RMD160 af2268447a27bde1326407033f6b7168253b07bb gaim-2.0.0_beta2-r1.ebuild 5499
+SHA256 6ee3cff128a3d60d44d860b1b665f8b0bdbfc03801801995736376553a7ddb10 gaim-2.0.0_beta2-r1.ebuild 5499
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f metadata.xml 414
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 (file)
index 88ade5d..0000000
+++ /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 (file)
index 9511ce5..0000000
+++ /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
-}
index 0563cb2560dc3bc60e84629f61dc8d4d06a6f584..08481d872d265f27faba28d6238e2c429f4e562f 100644 (file)
@@ -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 (file)
index 6a2042c..0000000
+++ /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
-}