From: Kathryn Kulick Date: Wed, 20 Dec 2006 05:10:49 +0000 (+0000) Subject: Heavy changes for new IUSE, thanks to chutz@gg3.net for the patch on bug#152200 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=32e7b6768bfe6cc3e5268f6a881c7674cc12f010;p=gentoo.git Heavy changes for new IUSE, thanks to chutz@gg3.net for the patch on bug#152200 Package-Manager: portage-2.1.2_rc3-r6 --- diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog index c1ba108cec1d..e3063e8dc8d5 100644 --- a/net-im/gaim/ChangeLog +++ b/net-im/gaim/ChangeLog @@ -1,6 +1,12 @@ # 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.422 2006/11/24 03:16:37 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.423 2006/12/20 05:10:49 gothgirl Exp $ + +*gaim-2.0.0_beta5-r1 (20 Dec 2006) + + 20 Dec 2006; +gaim-2.0.0_beta5-r1.ebuild: + Changing ebuild quite a bit for new iuse, thank chutz@gg3.net for patch + bug#152200 24 Nov 2006; Olivier Crête -files/gaim-2.0.0_beta3-as-needed.patch, diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest index 34474bda1520..e040b0faae38 100644 --- a/net-im/gaim/Manifest +++ b/net-im/gaim/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX gaim-0.76-xinput.patch 644 RMD160 8003dcbad47c300845898cb42b7a96f12b149c5f SHA1 f74085f170b8d6171cf47094bde9601f2e6085d7 SHA256 3532e792388cc6023522871bc99fd9e84204a42dfa6801b507df7fe480c37cd0 MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644 RMD160 8003dcbad47c300845898cb42b7a96f12b149c5f files/gaim-0.76-xinput.patch 644 @@ -15,14 +12,18 @@ EBUILD gaim-1.5.0.ebuild 3993 RMD160 c590613b9c54e16c9aa6d427893d47924a86cf68 SH MD5 33700f7439472df3bb31923316010694 gaim-1.5.0.ebuild 3993 RMD160 c590613b9c54e16c9aa6d427893d47924a86cf68 gaim-1.5.0.ebuild 3993 SHA256 f644ac37595f2727fa58198a7d16409a4b3102fae684bfc7e8acc91a8ad0db63 gaim-1.5.0.ebuild 3993 +EBUILD gaim-2.0.0_beta5-r1.ebuild 6822 RMD160 fd9d30f31691f2dc2d0dff250aee6c518c7c0d7d SHA1 58da64ca31f5931c6160b7538688a1e00a316128 SHA256 03c8ff14b562349612e5b4cd78a6555e72c97f2f816375baaafe464c76430f1d +MD5 eb943d560307f042f44af1ed75355031 gaim-2.0.0_beta5-r1.ebuild 6822 +RMD160 fd9d30f31691f2dc2d0dff250aee6c518c7c0d7d gaim-2.0.0_beta5-r1.ebuild 6822 +SHA256 03c8ff14b562349612e5b4cd78a6555e72c97f2f816375baaafe464c76430f1d gaim-2.0.0_beta5-r1.ebuild 6822 EBUILD gaim-2.0.0_beta5.ebuild 6633 RMD160 b4ef1feeb7e758e4da6c7d8db796a0d9d0ae0c92 SHA1 458ecd9a30437695f7456c509cdfde4cf128dbde SHA256 aa934161d3ba10715dba730fb2cde05952bcd9643bd4975c8dcf0534fcebf19c MD5 e5879ae6ca7137a352a5d6f5a8376bd9 gaim-2.0.0_beta5.ebuild 6633 RMD160 b4ef1feeb7e758e4da6c7d8db796a0d9d0ae0c92 gaim-2.0.0_beta5.ebuild 6633 SHA256 aa934161d3ba10715dba730fb2cde05952bcd9643bd4975c8dcf0534fcebf19c gaim-2.0.0_beta5.ebuild 6633 -MISC ChangeLog 61848 RMD160 9c7552aaaff64b7ed65d3abd7140e07cb5fdcf39 SHA1 f04e12b57ea0d459d3af2fb1ffef9a296992db5b SHA256 41aca6f1122d2a948aefaeb6229befa5d8b01505ab1cbb63ebac5edd6ae9f088 -MD5 3ab8e5f9550c4cd1a745d7a3fff67393 ChangeLog 61848 -RMD160 9c7552aaaff64b7ed65d3abd7140e07cb5fdcf39 ChangeLog 61848 -SHA256 41aca6f1122d2a948aefaeb6229befa5d8b01505ab1cbb63ebac5edd6ae9f088 ChangeLog 61848 +MISC ChangeLog 62040 RMD160 f2c420c1ae2f7ecb64ef311d0795c1b2369aa3ee SHA1 8efe4b5dddca58e3aee5c0d1ec1270992229fb4f SHA256 1c72f2ed00bfd9f4ff9589524af99bf38f304675677ee36b40eab7e3eccb34d0 +MD5 33f995081788fb943292462a50135299 ChangeLog 62040 +RMD160 f2c420c1ae2f7ecb64ef311d0795c1b2369aa3ee ChangeLog 62040 +SHA256 1c72f2ed00bfd9f4ff9589524af99bf38f304675677ee36b40eab7e3eccb34d0 ChangeLog 62040 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414 @@ -33,10 +34,6 @@ SHA256 0eeeff6fff0204e03a372c96611f8db0135f38286f7abade6be47aef06463f5b files/di MD5 e72ee508b4ecfbfb4b6aa4a2d69e1a8b files/digest-gaim-2.0.0_beta5 253 RMD160 8e54b2eeefbc921ead529e878e49e0ed6ef763ea files/digest-gaim-2.0.0_beta5 253 SHA256 609d8796cdf2888aae84b2d384a750f17ab9d48516c4e229d46a92c789bc668b files/digest-gaim-2.0.0_beta5 253 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFZmQqmOfEJZHYOKcRAsBkAKCdW6bmMR7Av+OJTrY0By38huVifACeMegD -j2PMhA9hUBw8J6xRhDmuvOY= -=zOE9 ------END PGP SIGNATURE----- +MD5 e72ee508b4ecfbfb4b6aa4a2d69e1a8b files/digest-gaim-2.0.0_beta5-r1 253 +RMD160 8e54b2eeefbc921ead529e878e49e0ed6ef763ea files/digest-gaim-2.0.0_beta5-r1 253 +SHA256 609d8796cdf2888aae84b2d384a750f17ab9d48516c4e229d46a92c789bc668b files/digest-gaim-2.0.0_beta5-r1 253 diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta5-r1 b/net-im/gaim/files/digest-gaim-2.0.0_beta5-r1 new file mode 100644 index 000000000000..f7813f30596c --- /dev/null +++ b/net-im/gaim/files/digest-gaim-2.0.0_beta5-r1 @@ -0,0 +1,3 @@ +MD5 84099216123de25402fa7e904ceca437 gaim-2.0.0beta5.tar.bz2 6489271 +RMD160 5fdb0f16411745033a691c4991e0f36cd31655c5 gaim-2.0.0beta5.tar.bz2 6489271 +SHA256 d6fab2ff940eddbf8256b2d845332cbc25b10e1c44f1761a0a754c55849b01db gaim-2.0.0beta5.tar.bz2 6489271 diff --git a/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild b/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild new file mode 100644 index 000000000000..1b982350ed96 --- /dev/null +++ b/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild @@ -0,0 +1,251 @@ +# 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_beta5-r1.ebuild,v 1.1 2006/12/20 05:10:49 gothgirl Exp $ + +inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app gnome2 + +MY_PV=${P/_beta/beta} + +DESCRIPTION="GTK Instant Messenger client" +HOMEPAGE="http://gaim.sourceforge.net/" +SRC_URI="mirror://sourceforge/gaim/${MY_PV}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile mono nls perl silc startup-notification tcl tk xscreensaver custom-flags ssl qq msn gadu" +IUSE="${IUSE} gtk sasl console" + +RDEPEND=" + bonjour? ( !avahi? ( net-misc/howl ) + avahi? ( net-dns/avahi ) ) + dbus? ( || ( + ( >=dev-libs/dbus-glib-0.71 >=dev-python/dbus-python-0.71 ) + ( =sys-apps/dbus-0.35 ) + ) + >=dev-lang/python-2.4 ) + gtk? ( + >=x11-libs/gtk+-2.0 + startup-notification? ( >=x11-libs/startup-notification-0.5 ) + xscreensaver? ( x11-libs/libXScrnSaver ) + eds? ( gnome-extra/evolution-data-server ) ) + >=dev-libs/glib-2.0 + gstreamer? ( media-libs/gstreamer + media-libs/gst-plugins-good ) + perl? ( >=dev-lang/perl-5.8.2-r1 ) + 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 ) + tcl? ( dev-lang/tcl ) + tk? ( dev-lang/tk ) + mono? ( dev-lang/mono ) + gstreamer? ( >=media-libs/gstreamer-0.10 ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + doc? ( app-doc/doxygen ) + dev-libs/libxml2" + +DEPEND="$RDEPEND + dev-util/pkgconfig + nls? ( sys-devel/gettext )" + +PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-3.0_beta5 )" + +S="${WORKDIR}/${MY_PV}" + +# Enable Default protocols +DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple" + +# 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 "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 +} + +pkg_setup() { + print_gaim_warning + + if use bonjour && use avahi && ! built_with_use net-dns/avahi howl-compat ; then + eerror + eerror "You need to rebuild net-dns/avahi 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 + + if use console && ! built_with_use sys-libs/ncurses unicode; then + eerror + eerror "You need to rebuild sys-libs/ncurses with USE=unicode in order" + eerror "to build the console client of gaim." + eerror + die "Configure failed" + fi + + if ! use gtk && ! use console; then + eerror + eerror "You Need to pick either gtk or console, You can have both." + eerror "Please enable either gtk or console useflag." + eerror + die "Configure failed" + fi +} + +src_unpack() { + gnome2_src_unpack +} + +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 gadu; then + DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg" + myconf="${myconf} --with-gadu-includes=." + myconf="${myconf} --with-gadu-libs=." + fi + + if use silc; then + DYNAMIC_PRPLS="${DYNAMIC_PRPLS},silc" + fi + + if use qq; then + DYNAMIC_PRPLS="${DYNAMIC_PRPLS},qq" + fi + + if use meanwhile; then + DYNAMIC_PRPLS="${DYNAMIC_PRPLS},sametime" + fi + + if use bonjour; then + DYNAMIC_PRPLS="${DYNAMIC_PRPLS},bonjour" + fi + + if use msn; then + DYNAMIC_PRPLS="${DYNAMIC_PRPLS},msn" + 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 gtk gtkui) \ + $(use_enable console consoleui) \ + $(use_enable startup-notification) \ + $(use_enable tcl) \ + $(use_enable gtk sm) \ + $(use_enable gtk gtkspell) \ + $(use_enable tk) \ + $(use_enable xscreensaver screensaver) \ + $(use_enable mono) \ + $(use_enable debug) \ + $(use_enable dbus) \ + $(use_enable meanwhile) \ + $(use_enable eds gevolution) \ + $(use_enable gstreamer) \ + $(use_enable sasl cyrus-sasl ) \ + $(use_enable doc doxygen) \ + "--with-dynamic-prpls=${DYNAMIC_PRPLS}" \ + ${myconf} || die "Configuration failed" + + # This is a tempory fix until Makefile is fixed!! + if use mono; then + emake -j1 + else + emake + fi +} + +src_install() { + gnome2_src_install + use perl && fixlocalpod + dodoc AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog +} + +pkg_postinst() { + gnome2_gconf_install + print_gaim_warning +}