Remove unused ssl and ipv6 use flags, use use_enable, truncate useless docs, fixes...

Package-Manager: portage-2.1_rc4-r3

diff --git a/net-im/ekiga/ChangeLog b/net-im/ekiga/ChangeLog
index b703794403db46a0408594d91a8b731258341611..bb03e09e79a0fc0b4d84616119b1ce5f5c5c5b67 100644 (file)
--- a/net-im/ekiga/ChangeLog
+++ b/net-im/ekiga/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/ekiga
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekiga/ChangeLog,v 1.4 2006/06/06 18:11:36 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekiga/ChangeLog,v 1.5 2006/06/07 18:06:45 genstef Exp $
+
+  07 Jun 2006; Stefan Schweizer <genstef@gentoo.org> ekiga-2.0.2.ebuild:
+  Remove unused ssl and ipv6 use flags, use use_enable, truncate useless docs,
+  fixes bug 132657
 
 *ekiga-2.0.2 (06 Jun 2006)
 

diff --git a/net-im/ekiga/Manifest b/net-im/ekiga/Manifest
index 401ddfcdabbc04e17a079d344cdbbb659e3319ba..b396e81e29ca0af64d40e9ffa768676d0cef944e 100644 (file)
--- a/net-im/ekiga/Manifest
+++ b/net-im/ekiga/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ekiga-1.99.0-configure.patch 669 RMD160 fa6cfdb6f1613e63b3af9a60d4f14b0260bae2db SHA1 c7f05a63821c2f890f6bc4dc9b3a848500833e7d SHA256 5c8ffcb27ebf51a0f39ae866e8b9637f56bad8fe113adb6122da4d973d55dd80
 MD5 683dfd499a4dd803dd3cb8797a4d0efe files/ekiga-1.99.0-configure.patch 669
 RMD160 fa6cfdb6f1613e63b3af9a60d4f14b0260bae2db files/ekiga-1.99.0-configure.patch 669
@@ -19,14 +16,14 @@ EBUILD ekiga-2.0.1.ebuild 2854 RMD160 868e37af02e3b4adb8c93f8024cabecad871edbd S
 MD5 613f0f5f1de07b21a413442830deebb3 ekiga-2.0.1.ebuild 2854
 RMD160 868e37af02e3b4adb8c93f8024cabecad871edbd ekiga-2.0.1.ebuild 2854
 SHA256 0d563cc52bef56d5987f7d799fd8091c763c95867748da5f6c6b4a7d24866324 ekiga-2.0.1.ebuild 2854
-EBUILD ekiga-2.0.2.ebuild 3019 RMD160 fd6478b3a485dbed96eb307ac3a503472a461a7b SHA1 caf4b5276494e7a37e434b4901b61ad00bce1ed3 SHA256 c36dbe750a2486995507af477dba8baeb72750ca4b61c1fbf902afb2c51ac99f
-MD5 23de0a1ca700c1d46b2d2c75a28c5fb1 ekiga-2.0.2.ebuild 3019
-RMD160 fd6478b3a485dbed96eb307ac3a503472a461a7b ekiga-2.0.2.ebuild 3019
-SHA256 c36dbe750a2486995507af477dba8baeb72750ca4b61c1fbf902afb2c51ac99f ekiga-2.0.2.ebuild 3019
-MISC ChangeLog 1219 RMD160 20cad069ce3453ad0006e5054f7f5386aab0c305 SHA1 0f06409c4537db0e0500485971c99ff553d2ed72 SHA256 7da0c5d085ef56def79fbed7ca658cba04f3a18febf5441a6e51c3c10a12927f
-MD5 2642074ea8962b680281957f9e0c9365 ChangeLog 1219
-RMD160 20cad069ce3453ad0006e5054f7f5386aab0c305 ChangeLog 1219
-SHA256 7da0c5d085ef56def79fbed7ca658cba04f3a18febf5441a6e51c3c10a12927f ChangeLog 1219
+EBUILD ekiga-2.0.2.ebuild 2278 RMD160 a4c95b6be1099349921b59a5f5b7aadeaea03343 SHA1 3babd900e09d8c5ca89eea3cd6496696eb47ebfe SHA256 f828fa83587825d75d246f75a2122156d5e4da5624660c1f967fda805a151e0e
+MD5 b463b72193402b692d1b79c301c93485 ekiga-2.0.2.ebuild 2278
+RMD160 a4c95b6be1099349921b59a5f5b7aadeaea03343 ekiga-2.0.2.ebuild 2278
+SHA256 f828fa83587825d75d246f75a2122156d5e4da5624660c1f967fda805a151e0e ekiga-2.0.2.ebuild 2278
+MISC ChangeLog 1391 RMD160 bcf18526b1776f0fab51d8d4b0bce24e20298e4c SHA1 e13852bd68d02c7a22bfe7dee7fed642d0993600 SHA256 995c1c58b9653253d155acc21b8286f56c0bda75e3e7dcc1741bcc63f3fb63ec
+MD5 b1cb902b7dc3176dd07f88e8e221f659 ChangeLog 1391
+RMD160 bcf18526b1776f0fab51d8d4b0bce24e20298e4c ChangeLog 1391
+SHA256 995c1c58b9653253d155acc21b8286f56c0bda75e3e7dcc1741bcc63f3fb63ec ChangeLog 1391
 MISC metadata.xml 157 RMD160 cb900ea8bf389b8f6147746711462b5757752b16 SHA1 bbbbd897cfe8d8bac785b23bead8e185871055bd SHA256 6759dc127ff53f85505b9b455ba325e65015b694b1ec50eb99ddfc8903b967bf
 MD5 b334f14db95c08e71ab02ffd5d712607 metadata.xml 157
 RMD160 cb900ea8bf389b8f6147746711462b5757752b16 metadata.xml 157
@@ -37,10 +34,3 @@ SHA256 cb352afaeb56243c6aa58b0dd8b4c91a3dd562e2da62edd8941ca34027082645 files/di
 MD5 79e65ffd6c3eeccacd6660b5bde2f6a2 files/digest-ekiga-2.0.2 238
 RMD160 9e1b38a77585e471f5985896359f80477e5bbb26 files/digest-ekiga-2.0.2 238
 SHA256 5c05718ca76835bb7548e48aff036dbecb54b43fbff3d597cea8fe344cd53efb files/digest-ekiga-2.0.2 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEhcVdNJowsmZ/PzARAnagAJ9pTVdtUNfn6VCOJxDz3kIQzSKw5QCeL+KA
-YYEzrr8X4kgxHdYtj83Wvb8=
-=pUSY
------END PGP SIGNATURE-----

diff --git a/net-im/ekiga/ekiga-2.0.2.ebuild b/net-im/ekiga/ekiga-2.0.2.ebuild
index 1c8c6758917d5585b0ecfa5d4d286d6f27478b49..a97643417e09339a070e21c59b29949eac9f437e 100644 (file)
--- a/net-im/ekiga/ekiga-2.0.2.ebuild
+++ b/net-im/ekiga/ekiga-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekiga/ekiga-2.0.2.ebuild,v 1.1 2006/06/06 18:11:36 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekiga/ekiga-2.0.2.ebuild,v 1.2 2006/06/07 18:06:45 genstef Exp $
 
 inherit gnome2 eutils flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.ekiga.org/includes/clicks_counter.php?http://www.ekiga.org/a
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="avahi dbus doc gnome ipv6 sdl ssl"
+IUSE="avahi dbus doc gnome sdl"
 
 RDEPEND="~dev-libs/pwlib-1.10.1
        ~net-libs/opal-2.2.2
@@ -19,7 +19,6 @@ RDEPEND="~dev-libs/pwlib-1.10.1
        >=x11-libs/gtk+-2.4.0
        >=dev-libs/glib-2.0.0
        >=dev-libs/libxml2-2.6.1
-       ssl? ( >=dev-libs/openssl-0.9.6g )
        sdl? ( >=media-libs/libsdl-1.2.4 )
        dbus? ( >=sys-apps/dbus-0.61 )
        avahi? ( net-dns/avahi )
@@ -59,36 +58,13 @@ src_unpack() {
 }
 
 src_compile() {
-       local myconf
-
-       # filter -O3, causes trouble with plugins (bug #88710)
-       replace-flags -O3 -O2
-
-       # don't touch! yes, it works this way.
-       # no, changing to use_enable / use_with breaks it
-       #
-       if use ssl; then
-               myconf="${myconf} --with-openssl-libs=/usr/lib"
-               myconf="${myconf} --with-openssl-includes=/usr/include/openssl"
-       fi
-
-       use sdl \
-               && myconf="${myconf} --with-sdl-prefix=/usr" \
-               || myconf="${myconf} --disable-sdltest"
-
-       use gnome \
-               || myconf="${myconf} --disable-gnome --disable-scrollkeeper --disable-schemas-install"
-
-       use dbus \
-               && myconf="${myconf} --enable-dbus"
-
-       use avahi \
-               || myconf="${myconf} --disable-avahi"
-
        econf \
-               $(use_enable ipv6) \
+               $(use_enable dbus) \
+               $(use_enable sdl) \
+               $(use_enable avahi) \
                $(use_enable doc) \
-               ${myconf} || die "configure failed"
+               $(use_enable gnome) \
+               || die "econf failed"
 
        emake || die "emake failed"
 }
@@ -98,20 +74,19 @@ src_install() {
                gnome2_src_install
        else
                make DESTDIR=${D} install || die "make install failed"
-               rm -rf ${D}/usr/lib/bonobo
 
-               dodoc AUTHORS ChangeLog COPYING README INSTALL NEWS FAQ TODO
+               dodoc AUTHORS ChangeLog NEWS
        fi
 }
 
 pkg_postinst() {
        if use gnome; then
                gnome2_pkg_postinst
+
                # we need to fix the GConf permissions, see bug #59764
-               # <obz@gentoo.org>
                einfo "Fixing GConf permissions for ekiga"
                ekiga-config-tool --fix-permissions
        fi
 }
 
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS FAQ TODO"
+DOCS="AUTHORS ChangeLog NEWS"