QA: fix bad usage of !use and !built_with_use, fix two instances of econf with !...

Package-Manager: portage-5386-svn

diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 2de5b9ace339a0a305b19319c4142a1592bcb2a6..3ff89384a5b4d719d023da9c2d574f537669af90 100644 (file)
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -13,22 +13,18 @@ EBUILD gajim-0.10.1.ebuild 2015 RMD160 8cbd45485960b659d08b23346c50af4c87aa6812
 MD5 db0090ae72c5bfb808aa0c2853a8b557 gajim-0.10.1.ebuild 2015
 RMD160 8cbd45485960b659d08b23346c50af4c87aa6812 gajim-0.10.1.ebuild 2015
 SHA256 7528f76aeff8c405c2a3dc355444e05d1f6ccf4bc2567eb24d1cb691b708b980 gajim-0.10.1.ebuild 2015
-EBUILD gajim-0.11-r1.ebuild 1613 RMD160 8d1158ad19e4fe1be62f5a29bf6c38712ced42d6 SHA1 41f3bf13d32e5e691ac324b0c812c099279659c3 SHA256 e0cc02028fbce758612042534187398f666acc1874c185d3e3b713b0be24cba5
-MD5 abe3b197a284c7bb09cd80bc5358c7b5 gajim-0.11-r1.ebuild 1613
-RMD160 8d1158ad19e4fe1be62f5a29bf6c38712ced42d6 gajim-0.11-r1.ebuild 1613
-SHA256 e0cc02028fbce758612042534187398f666acc1874c185d3e3b713b0be24cba5 gajim-0.11-r1.ebuild 1613
-EBUILD gajim-0.11-r2.ebuild 2280 RMD160 67adb79730797a0377e6c54e332b084b4e9bad3a SHA1 1768d72671f73da5668e3f9378cf922bbbed5c34 SHA256 47a465f2f48906643e6240efa7f99b5a6027b7d906a8a5e72b47315209c46117
-MD5 b9374384a0065987db1375f1b4bbd900 gajim-0.11-r2.ebuild 2280
-RMD160 67adb79730797a0377e6c54e332b084b4e9bad3a gajim-0.11-r2.ebuild 2280
-SHA256 47a465f2f48906643e6240efa7f99b5a6027b7d906a8a5e72b47315209c46117 gajim-0.11-r2.ebuild 2280
+EBUILD gajim-0.11-r3.ebuild 2317 RMD160 a30fc3ffc538de3036642881bf1b17b483c66a47 SHA1 a32b77011d469f9497c57089bf5473190c7ea1e4 SHA256 ff7f602868a58d91215a360941dba9554912e41445a1858e832406596f80dd75
+MD5 e390d5f01506d9e1d38dcca3044a0247 gajim-0.11-r3.ebuild 2317
+RMD160 a30fc3ffc538de3036642881bf1b17b483c66a47 gajim-0.11-r3.ebuild 2317
+SHA256 ff7f602868a58d91215a360941dba9554912e41445a1858e832406596f80dd75 gajim-0.11-r3.ebuild 2317
 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 4186 RMD160 33d01a9a5653ed6769e2c305938f53b4e1449ae8 SHA1 354ac1220656bdbf4d97a63c0888e082afeac83f SHA256 0c9e40a70dc000a56a394b34d49752d9467d750888856d83c205226a6e189597
-MD5 26b7db29d1c903515f1e4a56fc92b66c ChangeLog 4186
-RMD160 33d01a9a5653ed6769e2c305938f53b4e1449ae8 ChangeLog 4186
-SHA256 0c9e40a70dc000a56a394b34d49752d9467d750888856d83c205226a6e189597 ChangeLog 4186
+MISC ChangeLog 4476 RMD160 f1e8fac9728c26896dfff7c5e714aeba19cc8ddb SHA1 942700dd669033b387ef4be335910841a78b239c SHA256 aba5544a4b8ad9823f4303bdae4973fa312bd0b71841c7ff36bbd747e99f51bd
+MD5 206a233bb0310c9f5e54dbf887500fd0 ChangeLog 4476
+RMD160 f1e8fac9728c26896dfff7c5e714aeba19cc8ddb ChangeLog 4476
+SHA256 aba5544a4b8ad9823f4303bdae4973fa312bd0b71841c7ff36bbd747e99f51bd ChangeLog 4476
 MISC metadata.xml 369 RMD160 b5684f22a8b81f5213bda704ee8d123d1cd796f7 SHA1 873a1e33738638929c94655538bf9d46d0df79f6 SHA256 7b181490899f19191e60d8b702571f6a642fbe355c37c25d8cd710bfe2f2fe0d
 MD5 bd9809fa23d644d4ee6cb9497f22654c metadata.xml 369
 RMD160 b5684f22a8b81f5213bda704ee8d123d1cd796f7 metadata.xml 369
@@ -36,12 +32,9 @@ SHA256 7b181490899f19191e60d8b702571f6a642fbe355c37c25d8cd710bfe2f2fe0d metadata
 MD5 9451301d21d0074c1d20919d1b614cb7 files/digest-gajim-0.10.1 244
 RMD160 5041619a9c32445978b25986cd155c47f83db7cb files/digest-gajim-0.10.1 244
 SHA256 f5df4dd47d7a962883b93d37d76d95fd9db284e2afdbba2827f885384f4c572e files/digest-gajim-0.10.1 244
-MD5 8a5ae0236ddcd37470fce69ab75b2100 files/digest-gajim-0.11-r1 238
-RMD160 9637e57fd1c0f5ec68f63efdfa9c27dbbce0e4eb files/digest-gajim-0.11-r1 238
-SHA256 08ee73df755d0e62da96b3f7f6b9b204cb8707780125190d0c616f2eec083ae9 files/digest-gajim-0.11-r1 238
-MD5 8a5ae0236ddcd37470fce69ab75b2100 files/digest-gajim-0.11-r2 238
-RMD160 9637e57fd1c0f5ec68f63efdfa9c27dbbce0e4eb files/digest-gajim-0.11-r2 238
-SHA256 08ee73df755d0e62da96b3f7f6b9b204cb8707780125190d0c616f2eec083ae9 files/digest-gajim-0.11-r2 238
+MD5 8a5ae0236ddcd37470fce69ab75b2100 files/digest-gajim-0.11-r3 238
+RMD160 9637e57fd1c0f5ec68f63efdfa9c27dbbce0e4eb files/digest-gajim-0.11-r3 238
+SHA256 08ee73df755d0e62da96b3f7f6b9b204cb8707780125190d0c616f2eec083ae9 files/digest-gajim-0.11-r3 238
 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

diff --git a/net-im/gajim/files/digest-gajim-0.11-r1 b/net-im/gajim/files/digest-gajim-0.11-r1
deleted file mode 100644 (file)
index 3d99559..0000000
--- a/net-im/gajim/files/digest-gajim-0.11-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7ac7ac6fdfc515cb927adf21793856fa gajim-0.11.tar.bz2 2684957
-RMD160 ff92f3914eb14596f725a47efa04acb402053723 gajim-0.11.tar.bz2 2684957
-SHA256 1b660d2516b918fdba7533aab3dead8c222c98964ea459c5e4204c4949055422 gajim-0.11.tar.bz2 2684957

diff --git a/net-im/gajim/files/digest-gajim-0.11-r2 b/net-im/gajim/files/digest-gajim-0.11-r2
deleted file mode 100644 (file)
index 3d99559..0000000
--- a/net-im/gajim/files/digest-gajim-0.11-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7ac7ac6fdfc515cb927adf21793856fa gajim-0.11.tar.bz2 2684957
-RMD160 ff92f3914eb14596f725a47efa04acb402053723 gajim-0.11.tar.bz2 2684957
-SHA256 1b660d2516b918fdba7533aab3dead8c222c98964ea459c5e4204c4949055422 gajim-0.11.tar.bz2 2684957

diff --git a/net-im/gajim/gajim-0.11-r1.ebuild b/net-im/gajim/gajim-0.11-r1.ebuild
deleted file mode 100644 (file)
index 4a4171f..0000000
--- a/net-im/gajim/gajim-0.11-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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-r1.ebuild,v 1.1 2007/01/04 22:36:58 welp Exp $
-
-inherit multilib python
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="http://www.gajim.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="dbus gnome idle libnotify nls spell srv trayicon X xhtml"
-
-DEPEND="dev-python/pysqlite
-       dev-python/pygtk
-       sys-devel/gettext
-       dev-util/intltool
-       dev-util/pkgconfig"
-
-RDEPEND="gnome? ( dev-python/gnome-python-extras dev-python/gnome-python-desktop )
-       dbus? ( sys-apps/dbus )
-       dbus? ( libnotify? ( x11-libs/libnotify ) )
-       xhtml? ( dev-python/docutils )
-       srv? ( net-dns/bind-tools )
-       idle? ( x11-libs/libXScrnSaver )
-       spell? ( app-text/gtkspell )
-       avahi? ( net-dns/avahi )"
-
-pkg_setup() {
-       if use dbus && !build_with_use sys-apps/dbus python; then
-               eerror "Please rebuild dbus with USE=\"python\"."
-               die "Python D-Bus support missing"
-       fi
-}
-
-src_compile() {
-       econf \
-               $(use_enable nls ) \
-               $(use_enable spell gtkspell ) \
-               $(use_enable dbus remote ) \
-               $(use_with X x ) \
-               die || "Configure failed"
-       if !use gnome; then
-               econf \
-                       $(use_enable trayicon ) \
-                       $(use_enable idle ) \
-                       die || "Configure failed"
-       fi
-}
-
-src_install() {
-       emake PREFIX=/usr DESTDIR="${D}" LIBDIR=/$(get_libdir) install || die "Install failed"
-       dodoc README NEWS AUTHORS ChangeLog THANKS
-}
-
-pkg_postinst() {
-       python_mod_optimize /usr/share/gajim/
-}
-pkg_postrm() {
-       python_mod_cleanup /usr/share/gajim/
-}

diff --git a/net-im/gajim/gajim-0.11-r2.ebuild b/net-im/gajim/gajim-0.11-r2.ebuild
deleted file mode 100644 (file)
index e0913b9..0000000
--- a/net-im/gajim/gajim-0.11-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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-r2.ebuild,v 1.1 2007/01/05 23:26:14 welp Exp $
-
-inherit multilib python eutils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="http://www.gajim.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="dbus gnome idle libnotify nls spell srv trayicon X xhtml"
-
-DEPEND="dev-python/pysqlite
-       dev-python/pygtk
-       sys-devel/gettext
-       dev-util/intltool
-       dev-util/pkgconfig"
-
-RDEPEND="gnome? ( dev-python/gnome-python-extras dev-python/gnome-python-desktop )
-       dbus? ( ||
-               ( <sys-apps/dbus-0.90 )
-               ( >=sys-apps/dbus-0.90 dev-python/dbus-python dev-libs/dbus-glib )
-       )
-       libnotify? ( x11-libs/libnotify )
-       xhtml? ( dev-python/docutils )
-       srv? ( net-dns/bind-tools )
-       idle? ( x11-libs/libXScrnSaver )
-       spell? ( app-text/gtkspell )
-       avahi? ( net-dns/avahi )"
-
-pkg_setup() {
-       if !use dbus; then
-               if use libnotify; then
-                       eerror "The dbus USE flag is required for libnotify support"
-                       die "USE=\"dbus\" needed for libnotify support"
-               fi
-               if use avahi; then
-                       eerror "The dbus USE flag is required for avahi support"
-                       die "USE=\"dbus\" needed for avahi support"
-               fi
-       else
-               if has_version "<sys-apps/dbus-0.90" && !built_with_use sys-apps/dbus python; then
-                               eerror "Please rebuild dbus with USE=\"python\""
-                               die "USE=\"python\" needed for dbus"
-               fi
-       fi
-
-       if use avahi; then
-               if !built_with_use net-dns/avahi dbus gtk python; then
-                       eerror "The following USE flags are required for correct avahi"
-                       eerror "support: dbus gtk python"
-                       die "Please enable the correct USE flags for avahi"
-               fi
-       fi
-}
-
-src_compile() {
-       econf \
-               $(use_enable nls) \
-               $(use_enable spell gtkspell) \
-               $(use_enable dbus remote) \
-               $(use_with X x) \
-               die || "econf failed"
-       if !use gnome; then
-               econf \
-                       $(use_enable trayicon) \
-                       $(use_enable idle) \
-                       die || "econf failed"
-       fi
-}
-
-src_install() {
-       emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install \
-               die "emake install failed"
-       dodoc README NEWS AUTHORS ChangeLog THANKS
-}
-
-pkg_postinst() {
-       python_mod_optimize /usr/share/gajim/
-}
-pkg_postrm() {
-       python_mod_cleanup /usr/share/gajim/
-}