Fixed a couple of thingies here and there

Package-Manager: portage-2.1.1-r2

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 53d93f5cdc2e37bb9100d73ac08f76cc03bcedd1..5fe4867d8c64bbe574ff0962fe3a776fc7a702f3 100644 (file)
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.34 2007/01/06 16:05:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.35 2007/01/08 18:42:49 welp Exp $
+
+  08 Jan 2007; Peter Weller (welp) <welp@gentoo.org> gajim-0.11-r3.ebuild:
+  Fixed a couple of thingies here and there
 
   06 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> gajim-0.10.1.ebuild:
   Stable on Alpha.

diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 7d9b27d06724ee644c54caff70935ef21d88ec99..3e5140dc9e82e84f59f25c0c8b3be2fa2eebb156 100644 (file)
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gajim-10.1-FLAGS_noOverride.patch 2838 RMD160 3b67f3c6e09378ac215e74edbdf4814ccd8e89bd SHA1 7ce20640491f6efdddc39385d68398a6729c7eaa SHA256 bc33aa2492d68c6a95a5a322ccc6c5c3adb4b5e18640f6d99e63321b7240985b
 MD5 e43b8a78f00f2e806c7ba9f8ca302913 files/gajim-10.1-FLAGS_noOverride.patch 2838
 RMD160 3b67f3c6e09378ac215e74edbdf4814ccd8e89bd files/gajim-10.1-FLAGS_noOverride.patch 2838
@@ -20,18 +17,18 @@ EBUILD gajim-0.10.1.ebuild 2070 RMD160 2219943d92b5ec5b2b46b78126f956aac5d3c3a2
 MD5 0d84f145c9486434d5ef8ff1f784dcc5 gajim-0.10.1.ebuild 2070
 RMD160 2219943d92b5ec5b2b46b78126f956aac5d3c3a2 gajim-0.10.1.ebuild 2070
 SHA256 b4e5a6aecfbdfc302cce7aa3aa248aaa0fd55278cde39f47f41951e2dfb7201f gajim-0.10.1.ebuild 2070
-EBUILD gajim-0.11-r3.ebuild 2320 RMD160 d8e6e31b6b68df6438bc4911c6360ceabf15d556 SHA1 e6ac32c27c3541558e56f35fc8f8deb3b5fb4533 SHA256 a34f835ab7da7521b23a808312ac2fb77531a7d76ca1c735de7d04e5c89a62ce
-MD5 35ddab823967b700029c6082b5c04c03 gajim-0.11-r3.ebuild 2320
-RMD160 d8e6e31b6b68df6438bc4911c6360ceabf15d556 gajim-0.11-r3.ebuild 2320
-SHA256 a34f835ab7da7521b23a808312ac2fb77531a7d76ca1c735de7d04e5c89a62ce gajim-0.11-r3.ebuild 2320
+EBUILD gajim-0.11-r3.ebuild 2438 RMD160 ffba0bb33b940fbf43f407ad6f707a7b2c9bb0bd SHA1 67a6039926a348c0fba72d1e34ec0a73b327e130 SHA256 2c25ac7b0ab33c8d84671eb937bcb5f81c0360ac94fbe1daa896777991f2624a
+MD5 99802491d4ba92c60ec1ea950a198aa2 gajim-0.11-r3.ebuild 2438
+RMD160 ffba0bb33b940fbf43f407ad6f707a7b2c9bb0bd gajim-0.11-r3.ebuild 2438
+SHA256 2c25ac7b0ab33c8d84671eb937bcb5f81c0360ac94fbe1daa896777991f2624a gajim-0.11-r3.ebuild 2438
 EBUILD gajim-0.8.2.ebuild 1190 RMD160 81610feba58eaa4127333336cb1a73f6d767f079 SHA1 9221883cd141194faca6ff687ba3d3711b8cd5b2 SHA256 017d9d24ea9443f83da9bcfcd78a28d89a55c4ef8de358fddef50b30b6a62742
 MD5 3550a55fbbb772a7e346e810966eeb14 gajim-0.8.2.ebuild 1190
 RMD160 81610feba58eaa4127333336cb1a73f6d767f079 gajim-0.8.2.ebuild 1190
 SHA256 017d9d24ea9443f83da9bcfcd78a28d89a55c4ef8de358fddef50b30b6a62742 gajim-0.8.2.ebuild 1190
-MISC ChangeLog 5240 RMD160 d4a11e0fc97493aa8fe8bbb6ca98d0b1c774465d SHA1 b5a55c985ea9798a2904a81e07a7ffcbeb1c512d SHA256 44e37a1106e39584bc635cb1772eb4b435d9867e8153ab73c17657066f3bc199
-MD5 b90b359a89c3a78da1a8913372213c07 ChangeLog 5240
-RMD160 d4a11e0fc97493aa8fe8bbb6ca98d0b1c774465d ChangeLog 5240
-SHA256 44e37a1106e39584bc635cb1772eb4b435d9867e8153ab73c17657066f3bc199 ChangeLog 5240
+MISC ChangeLog 5358 RMD160 415f43cd279d44fe3a7eee26b04b06a0fc7ea54d SHA1 f869416b07d229bd49d2563fc4334fdd4f9a5108 SHA256 bf1a0ff28f382478c9ebecb9f22fe8dc2c2ef0a266362253d9b0702a2822dfa6
+MD5 107dfd0f2a41f6bb872d16511c85f49a ChangeLog 5358
+RMD160 415f43cd279d44fe3a7eee26b04b06a0fc7ea54d ChangeLog 5358
+SHA256 bf1a0ff28f382478c9ebecb9f22fe8dc2c2ef0a266362253d9b0702a2822dfa6 ChangeLog 5358
 MISC metadata.xml 369 RMD160 b5684f22a8b81f5213bda704ee8d123d1cd796f7 SHA1 873a1e33738638929c94655538bf9d46d0df79f6 SHA256 7b181490899f19191e60d8b702571f6a642fbe355c37c25d8cd710bfe2f2fe0d
 MD5 bd9809fa23d644d4ee6cb9497f22654c metadata.xml 369
 RMD160 b5684f22a8b81f5213bda704ee8d123d1cd796f7 metadata.xml 369
@@ -45,10 +42,3 @@ SHA256 08ee73df755d0e62da96b3f7f6b9b204cb8707780125190d0c616f2eec083ae9 files/di
 MD5 5e6f8fe30acd8c347a23f1608670c913 files/digest-gajim-0.8.2 238
 RMD160 f72be370e668b69b9c511afca9ba7877b5f0dd50 files/digest-gajim-0.8.2 238
 SHA256 d5a0167a843111864ef4a3c51028e77406ce74c396a45fb71012d5f9c7c6e78c files/digest-gajim-0.8.2 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFn8iTugEuf3OQ0akRAkuCAJ4sgIF3jooZRghic/S07MW+h9mWgwCeKmSg
-v3cAS7btPyYMyPvPoakhKy8=
-=fkek
------END PGP SIGNATURE-----

diff --git a/net-im/gajim/gajim-0.11-r3.ebuild b/net-im/gajim/gajim-0.11-r3.ebuild
index bd61b382af0bfc6a6bd79926ee9335e79d771a77..37bc857ab9c9889bfe0fc502d0c850759abcb3c6 100644 (file)
--- a/net-im/gajim/gajim-0.11-r3.ebuild
+++ b/net-im/gajim/gajim-0.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.11-r3.ebuild,v 1.6 2007/01/06 15:48:36 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.11-r3.ebuild,v 1.7 2007/01/08 18:42:49 welp Exp $
 
 inherit multilib python eutils
 
@@ -19,10 +19,17 @@ DEPEND="dev-python/pysqlite
        dev-util/intltool
        dev-util/pkgconfig"
 
-RDEPEND="gnome? ( dev-python/gnome-python-extras dev-python/gnome-python-desktop )
-       dbus? ( ||
-               ( ( >=sys-apps/dbus-0.90 dev-python/dbus-python dev-libs/dbus-glib )
-               ( <sys-apps/dbus-0.90 ) )
+RDEPEND="gnome? ( dev-python/gnome-python-extras
+               dev-python/gnome-python-desktop
+       )
+       dbus? (
+               || (
+                       ( >=sys-apps/dbus-0.90
+                               dev-python/dbus-python
+                               dev-libs/dbus-glib
+                       )
+                       ( <sys-apps/dbus-0.90 )
+               )
        )
        libnotify? ( x11-libs/libnotify )
        xhtml? ( dev-python/docutils )
@@ -59,6 +66,7 @@ pkg_setup() {
 
 src_compile() {
        local myconf
+
        if ! use gnome; then
                myconf="${myconf} $(use_enable trayicon)"
                myconf="${myconf} $(use_enable idle)"
@@ -68,18 +76,25 @@ src_compile() {
                $(use_enable spell gtkspell) \
                $(use_enable dbus remote) \
                $(use_with X x) \
+               --docdir="/usr/share/doc/${PF}" \
+               --prefix="/usr" \
+               --libdir="/usr/$(get_libdir)" \
                ${myconf} || die "econf failed"
+
+       emake || die "emake failed"
 }
 
 src_install() {
-       emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install || \
-               die "emake install failed"
-       dodoc README NEWS AUTHORS ChangeLog THANKS
+       emake DESTDIR="${D}" install || die "emake install failed"
+
+       rm "${D}/usr/share/doc/${PF}/README.html"
+       dohtml README.html
 }
 
 pkg_postinst() {
        python_mod_optimize /usr/share/gajim/
 }
+
 pkg_postrm() {
        python_mod_cleanup /usr/share/gajim/
 }