Make kppp depend on USE=ppp, so that it can be masked on systems that do not support ppp (such as prefix)

Package-Manager: portage--svn/cvs/Linux i686

7 files changed, 38 insertions, 19 deletions

diff --git a/kde-base/kdenetwork-meta/ChangeLog b/kde-base/kdenetwork-meta/ChangeLog
index d8bf9a0bdb50..97d4beb19dfd 100644
--- a/kde-base/kdenetwork-meta/ChangeLog
+++ b/kde-base/kdenetwork-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdenetwork-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/ChangeLog,v 1.150 2010/02/20 10:34:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/ChangeLog,v 1.151 2010/02/22 16:59:22 abcd Exp $
+
+  22 Feb 2010; Jonathan Callen <abcd@gentoo.org>
+  kdenetwork-meta-4.3.3.ebuild, kdenetwork-meta-4.3.4.ebuild,
+  kdenetwork-meta-4.3.5.ebuild, kdenetwork-meta-4.4.0.ebuild, metadata.xml:
+  Make kppp depend on USE=ppp, so that it can be masked on systems that do
+  not support ppp (such as prefix)
 
   20 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   kdenetwork-meta-4.3.5.ebuild:
diff --git a/kde-base/kdenetwork-meta/Manifest b/kde-base/kdenetwork-meta/Manifest
index 204f5db4037f..6fbae3abe9b6 100644
--- a/kde-base/kdenetwork-meta/Manifest
+++ b/kde-base/kdenetwork-meta/Manifest
@@ -1,6 +1,16 @@
-EBUILD kdenetwork-meta-4.3.3.ebuild 716 RMD160 bf19789d4029bbd3711e11862a0c080726796cba SHA1 92fae5f6a13c268d945cad97f1e96fbc9b8328db SHA256 8958bb16df0e767d19ad5e6951609c87775edf616bfa9af9d18ba8fc4b02e26c
-EBUILD kdenetwork-meta-4.3.4.ebuild 746 RMD160 cd728c48868666cdeee307b3437cd471861dea4b SHA1 a4ae09bd0959bd51c65dd7f8b4e82f8ae1955db0 SHA256 ef00567996ab3ce4acca1fe4d96b979a8adef4823be70e1bd20f108b4dc612ed
-EBUILD kdenetwork-meta-4.3.5.ebuild 749 RMD160 7347500e3d99d32e808f6a4b2b760ba90ad6c204 SHA1 e5d6f9a20ec3384809705d892ecf3dd05c794273 SHA256 6f011b5de04304ce2452670d47e3beb497e3cd0c2853a179cab5fbb535334628
-EBUILD kdenetwork-meta-4.4.0.ebuild 748 RMD160 c11812ac849d6b609e743eec0b888dd8e0cf2dd7 SHA1 ba807b20613daf6480dd2f6e3ae30dd5b1d12165 SHA256 f0b9b8a54e63904b248e022b35ea498ac999778a84dbd18ac6070a8bc257f238
-MISC ChangeLog 19891 RMD160 b275178e26c1bc769272c686958b954169c9c4b7 SHA1 80c068613c1f27d5788d5a58de21b9fa4dc93b81 SHA256 ec1ccc00e1aa7fdad3cb201ba564b9c7cc70a2fe38577cc8f54d1f5a24679343
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+EBUILD kdenetwork-meta-4.3.3.ebuild 730 RMD160 07b9df37da242a56b7cc45d803141f56e32f64db SHA1 9de1ea03a6d34ca53a339688ed1e8e6e5cae4c59 SHA256 0582f48cff1d83a179f918497d74503016e50eb131ff7da7ad9a78d92358477f
+EBUILD kdenetwork-meta-4.3.4.ebuild 759 RMD160 8d7ef741b45d51f31c1ec586fb8ba142b9daa469 SHA1 f3a1ce84e288a9397547830e81e2b15347714850 SHA256 e5cba3e42e68b01aff6021d6b5c269aacacb19cdbefd698ca0d831b723f37e11
+EBUILD kdenetwork-meta-4.3.5.ebuild 757 RMD160 fdc38d3232350963999c32c25eb4251aa773caf8 SHA1 e92aa57f8fa3b504f81ad4fcf5f8712f24f1c6ef SHA256 2e20e629913bf3da488695a433a9c6094e046b55a967d57561cc8a1938ff24ff
+EBUILD kdenetwork-meta-4.4.0.ebuild 759 RMD160 5dcc92ceca2b8acabe5f2dae4378241280d61d25 SHA1 88dd43661082cdc26066d600d9ef667635c21e13 SHA256 986c538f8e084236440702e2187d2ca4bb5cb642d00713cb3fb8a21386aec2f0
+MISC ChangeLog 20184 RMD160 d5d5ea7a5a90b6d64bc7ba574b237eb9e5530d0b SHA1 bafae80e6dbe6d1df7196c8b945fbe8713cec4cb SHA256 bf2ba37679cec7e0a9849a513939adcbdcd771290ebf9502070b90d4d2b5ab65
+MISC metadata.xml 240 RMD160 f5b300666332aafffed9ae6225937a1a6197be17 SHA1 8707a2dff4e7d397d8a47373957d4fac57149d8e SHA256 3f05ea722cb1de25afdd4fac90c88e7872853e17fb4be48382130c363d5fefbd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuCt/YACgkQOypDUo0oQOoLcwCfUU5QXmU1YDOhlZtIhQBy6DUt
+SN0An375CfTa/xfI6T62iplra62O0NGu
+=zJ+R
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.3.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.3.ebuild
index b8cfb48934d0..9382590ebbf4 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.3.ebuild
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.3.ebuild,v 1.7 2010/01/19 02:29:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.3.ebuild,v 1.8 2010/02/22 16:59:22 abcd Exp $
 
 EAPI="2"
 inherit kde4-functions
@@ -11,15 +11,15 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2"
 SLOT="4.3"
 KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="aqua kdeprefix"
+IUSE="aqua kdeprefix ppp"
 
 RDEPEND="
 	$(add_kdebase_dep kdenetwork-filesharing)
 	$(add_kdebase_dep kdnssd)
 	$(add_kdebase_dep kget)
 	$(add_kdebase_dep kopete)
-	$(add_kdebase_dep kppp)
 	$(add_kdebase_dep krdc)
 	$(add_kdebase_dep krfb)
+	ppp? ( $(add_kdebase_dep kppp) )
 	$(block_other_slots)
 "
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.4.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.4.ebuild
index 53dc698971cf..5cb3294ab154 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.4.ebuild
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.4.ebuild,v 1.3 2010/01/22 19:23:17 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.4.ebuild,v 1.4 2010/02/22 16:59:22 abcd Exp $
 
 EAPI="2"
 inherit kde4-functions
@@ -11,15 +11,15 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2"
 SLOT="4.3"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix"
+IUSE="aqua kdeprefix ppp"
 
 RDEPEND="
 	$(add_kdebase_dep kdenetwork-filesharing)
 	$(add_kdebase_dep kdnssd)
 	$(add_kdebase_dep kget)
 	$(add_kdebase_dep kopete)
-	$(add_kdebase_dep kppp)
 	$(add_kdebase_dep krdc)
 	$(add_kdebase_dep krfb)
+	ppp? ( $(add_kdebase_dep kppp) )
 	$(block_other_slots)
 "
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.5.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.5.ebuild
index 1e3c2108b24d..896428639cf8 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.5.ebuild
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.5.ebuild,v 1.2 2010/02/20 10:34:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-4.3.5.ebuild,v 1.3 2010/02/22 16:59:22 abcd Exp $
 
 EAPI="2"
 inherit kde4-functions
@@ -11,15 +11,15 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2"
 SLOT="4.3"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix"
+IUSE="aqua kdeprefix ppp"
 
 RDEPEND="
 	$(add_kdebase_dep kdenetwork-filesharing)
 	$(add_kdebase_dep kdnssd)
 	$(add_kdebase_dep kget)
 	$(add_kdebase_dep kopete)
-	$(add_kdebase_dep kppp)
 	$(add_kdebase_dep krdc)
 	$(add_kdebase_dep krfb)
+	ppp? ( $(add_kdebase_dep kppp) )
 	$(block_other_slots)
 "
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.4.0.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.4.0.ebuild
index 47f5f2629214..4123b4f4a3a3 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-4.4.0.ebuild
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-4.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-4.4.0.ebuild,v 1.1 2010/02/09 00:15:16 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-4.4.0.ebuild,v 1.2 2010/02/22 16:59:22 abcd Exp $
 
 EAPI="2"
 inherit kde4-functions
@@ -11,15 +11,15 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2"
 SLOT="4.4"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix"
+IUSE="aqua kdeprefix ppp"
 
 RDEPEND="
 	$(add_kdebase_dep kdenetwork-filesharing)
 	$(add_kdebase_dep kdnssd)
 	$(add_kdebase_dep kget)
 	$(add_kdebase_dep kopete)
-	$(add_kdebase_dep kppp)
 	$(add_kdebase_dep krdc)
 	$(add_kdebase_dep krfb)
+	ppp? ( $(add_kdebase_dep kppp) )
 	$(block_other_slots)
 "
diff --git a/kde-base/kdenetwork-meta/metadata.xml b/kde-base/kdenetwork-meta/metadata.xml
index 8d1e86a9cefb..e8a9ed870cd8 100644
--- a/kde-base/kdenetwork-meta/metadata.xml
+++ b/kde-base/kdenetwork-meta/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
+<use>
+	<flag name="ppp">Enable support for <pkg>net-dialup/ppp</pkg>.</flag>
+</use>
 </pkgmetadata>