rendered paste bodyIndex: Manifest
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/gaim/Manifest,v
retrieving revision 1.592
diff -u -B -r1.592 Manifest
--- Manifest 24 Nov 2006 03:16:46 -0000 1.592
+++ Manifest 20 Dec 2006 03:58:54 -0000
@@ -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,10 +12,10 @@
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.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
+EBUILD gaim-2.0.0_beta5.ebuild 6874 RMD160 b8657274f3de2fe13f00f346d660a17f3c2e01b3 SHA1 aab5903a132b9e9280c9b67379ee3a036d821fc9 SHA256 94fbbc860e0dcf15a6b1fe7b0ecaa79f53ed02da53ca8371c0241c702410ec03
+MD5 add31f17a11542f8015c287ee91d7573 gaim-2.0.0_beta5.ebuild 6874
+RMD160 b8657274f3de2fe13f00f346d660a17f3c2e01b3 gaim-2.0.0_beta5.ebuild 6874
+SHA256 94fbbc860e0dcf15a6b1fe7b0ecaa79f53ed02da53ca8371c0241c702410ec03 gaim-2.0.0_beta5.ebuild 6874
MISC ChangeLog 61848 RMD160 9c7552aaaff64b7ed65d3abd7140e07cb5fdcf39 SHA1 f04e12b57ea0d459d3af2fb1ffef9a296992db5b SHA256 41aca6f1122d2a948aefaeb6229befa5d8b01505ab1cbb63ebac5edd6ae9f088
MD5 3ab8e5f9550c4cd1a745d7a3fff67393 ChangeLog 61848
RMD160 9c7552aaaff64b7ed65d3abd7140e07cb5fdcf39 ChangeLog 61848
@@ -33,10 +30,3 @@
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-----
Index: gaim-2.0.0_beta5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta5.ebuild,v
retrieving revision 1.3
diff -u -B -r1.3 gaim-2.0.0_beta5.ebuild
--- gaim-2.0.0_beta5.ebuild 18 Nov 2006 07:42:50 -0000 1.3
+++ gaim-2.0.0_beta5.ebuild 20 Dec 2006 03:58:54 -0000
@@ -15,7 +15,8 @@
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 nas nls perl silc spell startup-notification tcl tk xscreensaver custom-flags ssl qq msn gadu"
+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 )
@@ -25,13 +26,15 @@
( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 )
)
>=dev-lang/python-2.4 )
- >=x11-libs/gtk+-2.0
+ 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 )
- 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 )
@@ -43,13 +46,12 @@
)
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 )
+ gstreamer? ( >=media-libs/gstreamer-0.10 )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
doc? ( app-doc/doxygen )
- xscreensaver? ( x11-libs/libXScrnSaver )
dev-libs/libxml2"
DEPEND="$RDEPEND
@@ -61,7 +63,7 @@
S="${WORKDIR}/${MY_PV}"
# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,msn,oscar,yahoo,zephyr,simple"
+DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple"
# List of plugins
# app-accessibility/festival-gaim
@@ -110,16 +112,6 @@
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() {
@@ -127,25 +119,39 @@
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 "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 "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
- epatch "${FILESDIR}"/"${P}"-dbus.patch
- eautomake
}
src_compile() {
@@ -182,6 +188,9 @@
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
@@ -205,31 +214,35 @@
G2CONF=" \
$(use_enable nls) \
$(use_enable perl) \
- $(use_enable spell gtkspell) \
+ $(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 nas) \
$(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
- MAKEOPTS="-j1" gnome2_src_compile || die "Make failed"
+ emake -j1
else
- gnome2_src_compile || die "Make failed"
+ emake
fi
}
src_install() {
- gnome2_src_install || die "Install failed"
+ gnome2_src_install
use perl && fixlocalpod
dodoc AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog
}