x11-plugins/pidgin-gfire: Punted gtk USE flag, since building Gfire without GTK enabl...

svn path=/sunrise/; revision=11703

diff --git a/x11-plugins/pidgin-gfire/ChangeLog b/x11-plugins/pidgin-gfire/ChangeLog
index 993a3dc532d94c701b8eaebef6e8283ada8eb284..2fc6bb0801c01dfcb40b4dbab641c213534ecbfd 100644 (file)
--- a/x11-plugins/pidgin-gfire/ChangeLog
+++ b/x11-plugins/pidgin-gfire/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for x11-plugins/pidgin-gfire
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Jan 2011; Dean Matzkov (bapa) <bapabooiee@gmail.com>
+  pidgin-gfire-0.9.2.ebuild, metadata.xml:
+  Punted gtk USE flag, since building Gfire without GTK enabled is pointless.
+  Changed dbus-status USE flag to kmess-notify. Added dependency for gettext
+  if nls is enabled. Added USE flag descriptions.
+
   28 Oct 2010; Dean Matzkov (bapa) <bapabooiee@gmail.com>
   +pidgin-gfire-0.9.2.ebuild, +metadata.xml:
   New ebuild for bug #252548, with thanks to Andrzej Kardas for his initial work

diff --git a/x11-plugins/pidgin-gfire/Manifest b/x11-plugins/pidgin-gfire/Manifest
index 80e89f89fdeb2acd89ae072c6de9177f715d8c08..c7c16058d98eadb20f2a0a05ab21a46109e9ded4 100644 (file)
--- a/x11-plugins/pidgin-gfire/Manifest
+++ b/x11-plugins/pidgin-gfire/Manifest
@@ -1,4 +1,4 @@
 DIST pidgin-gfire-0.9.2.tar.bz2 494341 RMD160 c536b5c170c2c16c47a39efe5a5a060fdfecdbd2 SHA1 c26026462d6e29c0c9900ac7734df4b3cdbadcbc SHA256 02ddf8ae5f5a9593d2395639ded119d3760184c3659b1f45688e6b3f2ff1230f
-EBUILD pidgin-gfire-0.9.2.ebuild 1165 RMD160 3a2a5cd6eb47a1953699f1d2e1df4303a2c269b1 SHA1 0854394a50b12c3e85ae913081968a609404cf5a SHA256 a276de0c08186855e19089f6b7f467f5e86a57a35555934c0e370c630dd84a6b
-MISC ChangeLog 310 RMD160 286b0a09cba75d871903584874a4da326fafe3ca SHA1 c913c23003560ded83304e2522e1bd3f24d4f558 SHA256 4d2ee7f8a252ad4059842bd43070714bf52775f3bb3fa6dd87f683885b878f01
-MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
+EBUILD pidgin-gfire-0.9.2.ebuild 1128 RMD160 9b0f12322ab61dff712db641b84a60dcbaec0a37 SHA1 c9e043f61c94fb84f6f6ee82c8dd7ce2adaededa SHA256 8ebd85bcc0ee20d22117766b00d4230bc44bd2e2d8cba4955e39e9eb35abcea4
+MISC ChangeLog 617 RMD160 150e7205f58a32560c25d21d1c83ca9b4bfd5b8c SHA1 00c271ef2bb2b14a3331f03278db4e7ff5f6625b SHA256 d0faf3eb9825ca6135f36f5bda7efb4396472a2a9f66392ecc8f0517bcaeea78
+MISC metadata.xml 429 RMD160 106ea006ca0d98523a1416a8ecbb4791bb37a239 SHA1 5bfad2eac32f87542d47c968cc17b250457fe694 SHA256 967ace29c9762f3f7800470bc96d98e23ee0f1e82d34344a06139f2bc40fd666

diff --git a/x11-plugins/pidgin-gfire/metadata.xml b/x11-plugins/pidgin-gfire/metadata.xml
index e6233b5dc3a99a6f14179f9d922834f0db204a2a..7bd0e1a2dbed52c94c807c6c5b17cfb08b4dfbb8 100644 (file)
--- a/x11-plugins/pidgin-gfire/metadata.xml
+++ b/x11-plugins/pidgin-gfire/metadata.xml
@@ -3,4 +3,8 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
+<use>
+       <flag name='kmess-status'>Publish your Xfire status to <pkg>net-im/kmess</pkg> using dbus</flag>
+       <flag name='libnotify'>Get notifications for your Xfire contacts' status changes</flag>
+</use>
 </pkgmetadata>

diff --git a/x11-plugins/pidgin-gfire/pidgin-gfire-0.9.2.ebuild b/x11-plugins/pidgin-gfire/pidgin-gfire-0.9.2.ebuild
index 5460634f66eb65f193db2e845ebb10b4ec2defa2..3a1e8c0778dd5ac5a5f713e3573c21abd807f905 100644 (file)
--- a/x11-plugins/pidgin-gfire/pidgin-gfire-0.9.2.ebuild
+++ b/x11-plugins/pidgin-gfire/pidgin-gfire-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -11,31 +11,27 @@ SRC_URI="mirror://sourceforge/gfire/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug dbus gtk libnotify nls"
+IUSE="debug kmess-status libnotify nls"
 
 RDEPEND="
-       net-im/pidgin[gtk?]
-       dbus? ( dev-libs/dbus-glib )
-       gtk? ( x11-libs/gtk+:2 )
+       net-im/pidgin[gtk]
+       x11-libs/gtk+:2
+       kmess-status? ( dev-libs/dbus-glib )
        libnotify? ( x11-libs/libnotify )"
 
 DEPEND="${RDEPEND}
-       dev-util/pkgconfig"
+       dev-util/pkgconfig
+       nls? ( sys-devel/gettext )"
 
 src_configure() {
-       local myconf=$(use_enable libnotify)
-
-       if use libnotify && ! use gtk; then
-               ewarn "libnotify requires GTK support to be enabled; libnotify disabled"
-               myconf="--disable-libnotify"
-       fi
-
+       # Note: Enabling dbus-status *only* publishes your
+       # status to net-im/kmess; it does nothing else.
        econf \
-               $(use_enable dbus dbus-status) \
+               --enable-gtk \
+               $(use_enable kmess-status dbus-status) \
+               $(use_enable libnotify) \
                $(use_enable debug) \
-               $(use_enable gtk) \
-               $(use_enable nls) \
-               ${myconf}
+               $(use_enable nls)
 }
 
 src_install() {
@@ -44,6 +40,6 @@ src_install() {
 }
 
 pkg_postinst() {
-       elog "Please note that, unlike other Pidgin plugins, the Gfire plugin"
-       elog "requires Pidgin to be restarted before it is used"
+       elog "Please note that unlike other Pidgin plugins, the Gfire plugin"
+       elog "needs Pidgin to be restarted before it is activated."
 }