Remove <media-libs/libdc1394-2 and v4l1 support wrt #367085 by Steve Williams

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

diff --git a/net-libs/ptlib/ChangeLog b/net-libs/ptlib/ChangeLog
index c7bcf29e6aed27698c6968e240b85f8d03db4907..7477e32a3fa1239bca6ee956995f22c70265730d 100644 (file)
--- a/net-libs/ptlib/ChangeLog
+++ b/net-libs/ptlib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/ptlib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.24 2011/04/04 20:44:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.25 2011/09/13 18:18:45 ssuominen Exp $
+
+  13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> ptlib-2.6.7-r1.ebuild:
+  Remove <media-libs/libdc1394-2 and v4l1 support wrt #367085 by Steve Williams
 
   04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> ptlib-2.6.7.ebuild:
   Use virtual/ffmpeg in all versions.

diff --git a/net-libs/ptlib/Manifest b/net-libs/ptlib/Manifest
index f4f0d03079739276ef0e969b0d8b0a46f188ef3f..fabe3326a2a32c78e33412bfc1004516d00787d4 100644 (file)
--- a/net-libs/ptlib/Manifest
+++ b/net-libs/ptlib/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX ptlib-2.6.4-vxml-ptones.patch 250 RMD160 b7eddb71af5d331ab104045c47d763bec1933434 SHA1 e7e586d16a13de169447a392662056549ff84912 SHA256 9d678b1439184728eb28ef7495816c59504b16a5bbc90e978f27f590666f865c
 DIST ptlib-2.6.6-htmldoc.tar.bz2 2089135 RMD160 1fa6671316c69942b00830627f9dbe34772a5f6a SHA1 b77782bbfcc7de38515e17cacd1ec886c4a8c274 SHA256 b72ce069519850c76e943a7c38f09181028792e449a60e5b0b09ed2aed5c99c7
 DIST ptlib-2.6.7.tar.bz2 3275152 RMD160 b9f0048057f53bb1869979be865f5baea8280162 SHA1 fb37538665995820a714e2fe5e268553995474e8 SHA256 7dd28225fedd21154d34899b21ee4b6d27c88eb1a9f9931c8e6ced28e8f3b97f
-EBUILD ptlib-2.6.7-r1.ebuild 7554 RMD160 698691435ba97da045ca4bb167361bb79a0b79b6 SHA1 0602937ff85505f43ab876cc8c079529d5caab49 SHA256 64b7042c58c7b9a1380c1a7a14fca9ed2a4bf5e021e6039471967d8064e0683d
+EBUILD ptlib-2.6.7-r1.ebuild 7380 RMD160 611cfe47726fc434e2576fda87b362244b793037 SHA1 401da50b1c5c155ad17a02272f24e489d1be0dc3 SHA256 15b10968127f08f398b95293a61b7e576795c3a9598b3821031358e901baaf1b
 EBUILD ptlib-2.6.7.ebuild 7363 RMD160 4aa62bf26d537d0df73ce41c8aaa80bc6215d2ff SHA1 59d95403cc208bc68d979d0ff9d5b2711b27f3a5 SHA256 683a0f989e0822633f13126b919082277c56831ec4833e15dec1e64c223a9bc6
-MISC ChangeLog 3630 RMD160 ff539eb825363ddc2614c07f902a46b5d3fa8437 SHA1 deb64e71d3140bdbe5f2fe7fc7e42c54148a3b1b SHA256 d10bddab7e8eee6e22130e7c9a2f8188d4ca369a5d79d7d787f7204a1d069d44
+MISC ChangeLog 3788 RMD160 1e9dbfae4b7d3502cd19257b6ca63701365d2377 SHA1 5b31808a9f9ab76d72df116d0d8be35097b6103c SHA256 6305b31e49112ff4e8203cbfb26d069239e3125e831bec58561a0ced0b0b1a7a
 MISC metadata.xml 1160 RMD160 b259b8631049719fe5c9aed02f15b95232860d41 SHA1 78af21a8a19d1d988329da8a70babd744a4e0e6c SHA256 91aa203d63993f44e881c8ee7908d49596ddd1c03b89ea5b041ac86e2877fdb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2aLYsACgkQHB6c3gNBRYd05gCdFxGIB/VnFIri/wh0xceumiNk
-dHEAn2EBTTt+LFn+L0BES7WdhsgSa296
-=C9j8
+iF4EAREIAAYFAk5vnroACgkQXkR9YqOcLPGfZAD/Vn+X/fQfTZ9j4SBkdxGc4Xdf
+lJMpr/jfzZbjAiv0S/wA/ir697H701Rfi5oTeW1FCS4Q5xE6S09v/1PNMN1iLBwb
+=Ut/A
 -----END PGP SIGNATURE-----

diff --git a/net-libs/ptlib/ptlib-2.6.7-r1.ebuild b/net-libs/ptlib/ptlib-2.6.7-r1.ebuild
index 72b0dedd35f391fdabe61d77f8df7898e438850d..cb820c098bc27f22f9d8f04532b700f6d0fa4f61 100644 (file)
--- a/net-libs/ptlib/ptlib-2.6.7-r1.ebuild
+++ b/net-libs/ptlib/ptlib-2.6.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.6.7-r1.ebuild,v 1.5 2011/04/04 12:23:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.6.7-r1.ebuild,v 1.6 2011/09/13 18:18:45 ssuominen Exp $
 
 EAPI="2"
 
@@ -16,9 +16,9 @@ LICENSE="MPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 # default enabled are features from 'minsize', the most used according to ptlib
-IUSE="alsa +asn +audio debug doc dtmf esd examples ffmpeg ftp http ieee1394 ipv6
+IUSE="alsa +asn +audio debug doc dtmf esd examples ffmpeg ftp http ipv6
 jabber ldap mail odbc oss pch qos remote sasl sdl serial shmvideo snmp soap
-socks ssl +stun telnet tts v4l v4l2 +video vxml wav xml xmlrpc"
+socks ssl +stun telnet tts v4l2 +video vxml wav xml xmlrpc"
 
 CDEPEND="
        audio? ( alsa? ( media-libs/alsa-lib )
@@ -28,11 +28,7 @@ CDEPEND="
        sasl? ( dev-libs/cyrus-sasl:2 )
        sdl? ( media-libs/libsdl )
        ssl? ( dev-libs/openssl )
-       video? ( ieee1394? ( media-libs/libdc1394:1
-                               media-libs/libdv
-                               sys-libs/libavc1394
-                               sys-libs/libraw1394 )
-               v4l2? ( media-libs/libv4l ) )
+       video? ( v4l2? ( media-libs/libv4l ) )
        xml? ( dev-libs/expat )
        !!dev-libs/pwlib"
 RDEPEND="${CDEPEND}
@@ -41,8 +37,7 @@ DEPEND="${CDEPEND}
        dev-util/pkgconfig
        sys-devel/bison
        sys-devel/flex
-       video? ( v4l? ( sys-kernel/linux-headers )
-               v4l2? ( sys-kernel/linux-headers ) )"
+       video? ( v4l2? ( sys-kernel/linux-headers ) )"
 
 # NOTES:
 # media-libs/libdc1394:2 should be supported but headers location have changed
@@ -180,7 +175,7 @@ src_configure() {
                $(use_enable http) \
                $(use_enable http httpforms) \
                $(use_enable http httpsvc) \
-               $(use_enable ieee1394 dc) \
+               --disable-dc \
                $(use_enable ipv6) \
                $(use_enable jabber) \
                $(use_enable ldap openldap) \
@@ -201,7 +196,7 @@ src_configure() {
                $(use_enable stun) \
                $(use_enable telnet) \
                $(use_enable tts) \
-               $(use_enable v4l) \
+               --disable-v4l \
                $(use_enable v4l2) \
                $(use_enable video) $(use_enable video vidfile) \
                $(use_enable vxml) \