diff options
author | Daniel Gryniewicz <dang@gentoo.org> | 2007-03-24 03:42:58 +0000 |
---|---|---|
committer | Daniel Gryniewicz <dang@gentoo.org> | 2007-03-24 03:42:58 +0000 |
commit | 3384aa03124bad387d98d0562e74363ae812d1b3 (patch) | |
tree | f9b12379be721e2675413843ef5cd288c258186c | |
parent | bump to 2.18.0 (diff) | |
download | user-3384aa03124bad387d98d0562e74363ae812d1b3.tar.gz user-3384aa03124bad387d98d0562e74363ae812d1b3.tar.bz2 user-3384aa03124bad387d98d0562e74363ae812d1b3.zip |
Don't need gaim anymore...
svn path=/user/; revision=41
-rw-r--r-- | net-im/gaim/Manifest | 27 | ||||
-rw-r--r-- | net-im/gaim/files/digest-gaim-2.0.0_beta3-r2 | 3 | ||||
-rw-r--r-- | net-im/gaim/files/gaim-2.0.0_beta3-as-needed.patch | 11 | ||||
-rw-r--r-- | net-im/gaim/files/gaim-2.0.0_beta3-avahi-compat.patch | 30 | ||||
-rw-r--r-- | net-im/gaim/files/gaim-2.0.0_beta3-remove-asserts.patch | 46 | ||||
-rw-r--r-- | net-im/gaim/gaim-2.0.0_beta3-r2.ebuild | 230 |
6 files changed, 0 insertions, 347 deletions
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest deleted file mode 100644 index eb28145..0000000 --- a/net-im/gaim/Manifest +++ /dev/null @@ -1,27 +0,0 @@ -AUX gaim-2.0.0_beta3-as-needed.patch 401 RMD160 5546fb8a00b774ee17e9e5d605f5b0ed620d75c1 SHA1 21416ead465dd22ae0c9b3005656ff4e00e3405e SHA256 5db944b244b6324b2e09b0d68ce672fd633043b33028030205465efddd24f855 -MD5 5b872a7214f3650a286c300a7511cc94 files/gaim-2.0.0_beta3-as-needed.patch 401 -RMD160 5546fb8a00b774ee17e9e5d605f5b0ed620d75c1 files/gaim-2.0.0_beta3-as-needed.patch 401 -SHA256 5db944b244b6324b2e09b0d68ce672fd633043b33028030205465efddd24f855 files/gaim-2.0.0_beta3-as-needed.patch 401 -AUX gaim-2.0.0_beta3-avahi-compat.patch 977 RMD160 0012a39e59134ea580958fe0c0d278dde65b0ab7 SHA1 a7e7117ce866fb1ef277fb6048bc8b27adf36c4d SHA256 e9e3a9a3d0a474e6325c5d205d6906032b9998a11df71c4cb8935102138e3a28 -MD5 ebb905b4a73583eaa4b68c022beb110f files/gaim-2.0.0_beta3-avahi-compat.patch 977 -RMD160 0012a39e59134ea580958fe0c0d278dde65b0ab7 files/gaim-2.0.0_beta3-avahi-compat.patch 977 -SHA256 e9e3a9a3d0a474e6325c5d205d6906032b9998a11df71c4cb8935102138e3a28 files/gaim-2.0.0_beta3-avahi-compat.patch 977 -AUX gaim-2.0.0_beta3-remove-asserts.patch 1542 RMD160 4d09f0c76e8f3297229dc4eec551ffee2828d0c8 SHA1 c8625910a68a9c4f9e67e8d59e98aa900ced9480 SHA256 6b36802e7ac1ab842fde34871cf5d9b320ce31958fb8a388c607c9d24bd4f51d -MD5 6b61448d39f6673487fccc1a817d249f files/gaim-2.0.0_beta3-remove-asserts.patch 1542 -RMD160 4d09f0c76e8f3297229dc4eec551ffee2828d0c8 files/gaim-2.0.0_beta3-remove-asserts.patch 1542 -SHA256 6b36802e7ac1ab842fde34871cf5d9b320ce31958fb8a388c607c9d24bd4f51d files/gaim-2.0.0_beta3-remove-asserts.patch 1542 -DIST gaim-2.0.0beta3.1.tar.bz2 5445059 RMD160 5987586fee212a5c5e9287a9dce55a35c30ea7b7 SHA1 5897cc8b89e0937645be21a0655a6ebb4fb3e626 SHA256 a282c56f32a37f7838c5332f182bdd920d4e80099b96313e503c6acc020931f4 -EBUILD gaim-2.0.0_beta3-r2.ebuild 6564 RMD160 0061d1bec17a28fa480fdae9e087974ada146721 SHA1 ecf5d1b62b7d9027a4ca7ecdef19943e0c26051d SHA256 dbb52266ac9bd36441b2b70675da39e7e786f09745f29469455cf1b3c061ddf6 -MD5 785f03d74872bdfdf50b2a977be63b0e gaim-2.0.0_beta3-r2.ebuild 6564 -RMD160 0061d1bec17a28fa480fdae9e087974ada146721 gaim-2.0.0_beta3-r2.ebuild 6564 -SHA256 dbb52266ac9bd36441b2b70675da39e7e786f09745f29469455cf1b3c061ddf6 gaim-2.0.0_beta3-r2.ebuild 6564 -EBUILD gaim-2.0.0_beta3-r3.ebuild 6301 RMD160 e0001f6fad1c55d41e05a981b945759cb4e8cf97 SHA1 9c1cfad1c72f698515b551b9703eeec69be7e962 SHA256 a3b4b6f2160248bba7bdf8b7cc6bd42808446329488f23aad99aaa385b2c9072 -MD5 b792ea128385b6e395b4dbe2e06a8c32 gaim-2.0.0_beta3-r3.ebuild 6301 -RMD160 e0001f6fad1c55d41e05a981b945759cb4e8cf97 gaim-2.0.0_beta3-r3.ebuild 6301 -SHA256 a3b4b6f2160248bba7bdf8b7cc6bd42808446329488f23aad99aaa385b2c9072 gaim-2.0.0_beta3-r3.ebuild 6301 -MD5 ffd99b34dae16b5b118de79bff8a948c files/digest-gaim-2.0.0_beta3-r2 259 -RMD160 53b88544cfe6ea127784fcb43fc82a24097dcf94 files/digest-gaim-2.0.0_beta3-r2 259 -SHA256 94f6c231a875fc84a7e98d49e9e32d31d19107375f600bbe357457d951fcc15d files/digest-gaim-2.0.0_beta3-r2 259 -MD5 ffd99b34dae16b5b118de79bff8a948c files/digest-gaim-2.0.0_beta3-r3 259 -RMD160 53b88544cfe6ea127784fcb43fc82a24097dcf94 files/digest-gaim-2.0.0_beta3-r3 259 -SHA256 94f6c231a875fc84a7e98d49e9e32d31d19107375f600bbe357457d951fcc15d files/digest-gaim-2.0.0_beta3-r3 259 diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta3-r2 b/net-im/gaim/files/digest-gaim-2.0.0_beta3-r2 deleted file mode 100644 index f020f44..0000000 --- a/net-im/gaim/files/digest-gaim-2.0.0_beta3-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 202b9e6ee5171da90de14230b3037dc1 gaim-2.0.0beta3.1.tar.bz2 5445059 -RMD160 5987586fee212a5c5e9287a9dce55a35c30ea7b7 gaim-2.0.0beta3.1.tar.bz2 5445059 -SHA256 a282c56f32a37f7838c5332f182bdd920d4e80099b96313e503c6acc020931f4 gaim-2.0.0beta3.1.tar.bz2 5445059 diff --git a/net-im/gaim/files/gaim-2.0.0_beta3-as-needed.patch b/net-im/gaim/files/gaim-2.0.0_beta3-as-needed.patch deleted file mode 100644 index 066e2c5..0000000 --- a/net-im/gaim/files/gaim-2.0.0_beta3-as-needed.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.am.org 2006-05-05 19:09:26.785534520 -0500 -+++ src/Makefile.am 2006-05-05 19:09:38.371773144 -0500 -@@ -199,6 +199,8 @@ - - libgaim_client_la_SOURCES = gaim-client.c gaim-client.h - -+libgaim_client_la_LIBADD = $(DBUS_LIBS) -+ - gaim-client-bindings.c: dbus-analyze-functions.py $(dbus_exported) - cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@ - diff --git a/net-im/gaim/files/gaim-2.0.0_beta3-avahi-compat.patch b/net-im/gaim/files/gaim-2.0.0_beta3-avahi-compat.patch deleted file mode 100644 index 2520e72..0000000 --- a/net-im/gaim/files/gaim-2.0.0_beta3-avahi-compat.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur gaim-2.0.0beta3/configure.ac gaim-2.0.0beta3-patched/configure.ac ---- gaim-2.0.0beta3/configure.ac 2006-03-26 07:45:35.000000000 +0000 -+++ gaim-2.0.0beta3-patched/configure.ac 2006-05-07 23:13:46.000000000 +0000 -@@ -183,15 +183,17 @@ - HOWL_CFLAGS="" - HOWL_LIBS="" - --dnl Attempt to autodetect Howl --PKG_CHECK_MODULES(HOWL, howl, [ -- howlincludes="yes" -- howllibs="yes" -- ], [ -- AC_MSG_RESULT(no) -- howlincludes="no" -- howllibs="no" -- ]) -+dnl First we attempt to use avahi-compat-howl -+PKG_CHECK_MODULES(HOWL, avahi-compat-howl, -+ [howlincludes="yes" howllibs="yes"], -+ [howlincludes="no" howllibs="no"]) -+ -+dnl If that fails, autodetect the "real" howl -+if test "$howlincludes" = "no" ; then -+ PKG_CHECK_MODULES(HOWL, howl, -+ [howlincludes="yes" howllibs="yes"], -+ [howlincludes="no" howllibs="no"]) -+fi - - dnl Override HOWL_CFLAGS if the user specified an include dir - if test "$ac_howl_includes" != "no"; then diff --git a/net-im/gaim/files/gaim-2.0.0_beta3-remove-asserts.patch b/net-im/gaim/files/gaim-2.0.0_beta3-remove-asserts.patch deleted file mode 100644 index 7ac8951..0000000 --- a/net-im/gaim/files/gaim-2.0.0_beta3-remove-asserts.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --exclude-from=/home/dang/.diffrc -u -ruN gaim-2.0.0beta3.orig/src/blist.c gaim-2.0.0beta3/src/blist.c ---- gaim-2.0.0beta3.orig/src/blist.c 2006-03-13 13:31:21.000000000 -0500 -+++ gaim-2.0.0beta3/src/blist.c 2006-08-15 16:30:12.000000000 -0400 -@@ -2493,7 +2493,8 @@ - if (value == NULL) - return FALSE; - -- g_return_val_if_fail(gaim_value_get_type(value) == GAIM_TYPE_BOOLEAN, FALSE); -+ if (!(gaim_value_get_type(value) == GAIM_TYPE_BOOLEAN)) -+ return (FALSE); - - return gaim_value_get_boolean(value); - } -@@ -2529,7 +2530,8 @@ - if (value == NULL) - return 0; - -- g_return_val_if_fail(gaim_value_get_type(value) == GAIM_TYPE_INT, 0); -+ if (!(gaim_value_get_type(value) == GAIM_TYPE_INT)) -+ return (0); - - return gaim_value_get_int(value); - } -@@ -2565,7 +2567,8 @@ - if (value == NULL) - return NULL; - -- g_return_val_if_fail(gaim_value_get_type(value) == GAIM_TYPE_STRING, NULL); -+ if (!(gaim_value_get_type(value) == GAIM_TYPE_STRING)) -+ return (NULL); - - return gaim_value_get_string(value); - } -diff --exclude-from=/home/dang/.diffrc -u -ruN gaim-2.0.0beta3.orig/src/dbus-server.c gaim-2.0.0beta3/src/dbus-server.c ---- gaim-2.0.0beta3.orig/src/dbus-server.c 2006-02-11 00:25:47.000000000 -0500 -+++ gaim-2.0.0beta3/src/dbus-server.c 2006-08-15 16:46:47.000000000 -0400 -@@ -96,7 +96,8 @@ - - gint gaim_dbus_pointer_to_id(gpointer node) { - gint id = GPOINTER_TO_INT(g_hash_table_lookup(map_node_id, node)); -- g_return_val_if_fail(id || node == NULL, 0); -+ if (!(id || node == NULL)) -+ return (0); - return id; - } - diff --git a/net-im/gaim/gaim-2.0.0_beta3-r2.ebuild b/net-im/gaim/gaim-2.0.0_beta3-r2.ebuild deleted file mode 100644 index ecbc2dc..0000000 --- a/net-im/gaim/gaim-2.0.0_beta3-r2.ebuild +++ /dev/null @@ -1,230 +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_beta3-r2.ebuild,v 1.1 2006/09/06 00:54:18 tester Exp $ - -inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app - -#MY_PV=${PV/_beta/beta} -MY_PV="2.0.0beta3.1" -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 ~ppc64 ~sparc ~x86" -IUSE="avahi audiofile bonjour cjk dbus debug doc eds gadu gnutls meanwhile mono nas nls perl silc spell startup-notification tcl tk xscreensaver custom-flags ssl msn" - -RDEPEND=" - audiofile? ( media-libs/libao - media-libs/audiofile ) - bonjour? ( !avahi? ( net-misc/howl ) - avahi? ( net-dns/avahi ) ) - 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 ) - spell? ( >=app-text/gtkspell-2.0.2 ) - gadu? ( net-libs/libgadu ) - ssl? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/nss-3.11 ) - ) - msn? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/nss-3.11 ) - ) - meanwhile? ( net-libs/meanwhile ) - silc? ( >=net-im/silc-toolkit-0.9.12-r3 ) - eds? ( gnome-extra/evolution-data-server ) - tcl? ( dev-lang/tcl ) - tk? ( dev-lang/tk ) - startup-notification? ( >=x11-libs/startup-notification-0.5 ) - mono? ( dev-lang/mono ) - doc? ( app-doc/doxygen ) - xscreensaver? ( x11-misc/xscreensaver - x11-libs/libXScrnSaver )" - -DEPEND="$RDEPEND - dev-util/pkgconfig - 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 - if use custom-flags; then - einfo "Note that you have chosen NOT TO FILTER UNSTABLE C[XX]FLAGS." - einfo "DO NOT file bugs with GENTOO or UPSTREAM while using custom-flags" - einfo - else - einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS." - einfo - fi - - if use silc; then - einfo "To be able to connect to silc network, you need to run" - einfo "\`usermod -c \"comment\"\` as user as which you are running gaim," - einfo "where \"comment\" is either your real name if you want show it" - einfo "on silc or any othe not empty string." - einfo - fi - ebeep 5 - epause 3 -} - -pkg_setup() { - print_gaim_warning - - if use avahi && ! built_with_use net-dns/avahi howl-compat ; then - eerror - eerror You need to rebuild net-dns/avavhi with USE=howl-compat in order - eerror to enable howl support for the bonjour protocol in gaim. - eerror - die "Configure failed" - fi - - if use gadu && built_with_use net-libs/libgadu ssl ; then - eerror - eerror You need to rebuild net-libs/libgadu with USE=-ssl in order - eerror enable gadu gadu support in gaim. - eerror - die "Configure failed" - fi -} - -src_unpack() { - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/${P}-as-needed.patch - epatch ${FILESDIR}/${P}-avahi-compat.patch - epatch ${FILESDIR}/${P}-remove-asserts.patch - - eautomake || die "Failed running eautomake" -} - -src_compile() { - # Stabilize things, for your own good - if ! use custom-flags; then - strip-flags - fi - #replace-flags -O? -O2 - - # -msse2 doesn't play nice on gcc 3.2 - [ "`gcc-version`" == "3.2" ] && filter-flags -msse2 - - local myconf - - if ! use bonjour ; then - myconf="${myconf} --with-howl-includes=." - myconf="${myconf} --with-howl-libs=." - fi - - if ! use silc; then - einfo "Disabling SILC protocol" - myconf="${myconf} --with-silc-includes=." - myconf="${myconf} --with-silc-libs=." - fi - - if ! use gadu ; then - myconf="${myconf} --with-gadu-includes=." - myconf="${myconf} --with-gadu-libs=." - fi - - if use ssl || use msn ; then - if use gnutls ; then - einfo "Disabling NSS, using GnuTLS" - myconf="${myconf} --enable-nss=no --enable-gnutls=yes" - 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 --enable-nss=yes" - fi - else - einfo "No SSL support selected" - myconf="${myconf} --enable-gnutls=no --enable-nss=no" - fi - - if use xscreensaver ; then - myconf="${myconf} --x-includes=/usr/include/X11" - fi - - econf \ - $(use_enable nls) \ - $(use_enable perl) \ - $(use_enable spell gtkspell) \ - $(use_enable startup-notification) \ - $(use_enable tcl) \ - $(use_enable tk) \ - $(use_enable mono) \ - $(use_enable debug) \ - $(use_enable dbus) \ - $(use_enable meanwhile) \ - $(use_enable nas) \ - $(use_enable eds gevolution) \ - $(use_enable audiofile audio) \ - $(use_enable doc doxygen) \ - ${myconf} || die "Configuration failed" - - emake -j1 || die "Make failed" -} - -src_install() { - make install DESTDIR=${D} || die "Install failed" - use perl && fixlocalpod - dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION -} - -pkg_postinst() { - print_gaim_warning -} |