Add missing DEPEND, and RDEPEND on backend providers.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 47 insertions, 21 deletions

diff --git a/net-misc/xrdp/ChangeLog b/net-misc/xrdp/ChangeLog
index 39e4731f0664..42647a726452 100644
--- a/net-misc/xrdp/ChangeLog
+++ b/net-misc/xrdp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/xrdp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v 1.11 2014/10/23 11:12:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v 1.12 2014/10/27 14:33:09 mgorny Exp $
+
+  27 Oct 2014; Michał Górny <mgorny@gentoo.org> xrdp-0.6.1.ebuild,
+  xrdp-0.8.0.ebuild:
+  Add missing DEPEND, and RDEPEND on backend providers.
 
   23 Oct 2014; Michał Górny <mgorny@gentoo.org> xrdp-0.6.1.ebuild,
   xrdp-0.8.0.ebuild:
diff --git a/net-misc/xrdp/Manifest b/net-misc/xrdp/Manifest
index e4dbe3ddb687..491a01ecca5c 100644
--- a/net-misc/xrdp/Manifest
+++ b/net-misc/xrdp/Manifest
@@ -6,26 +6,26 @@ AUX xrdp-initd 829 SHA256 bdc5620e4854454c0617c57dd6fdf7398ef089f9a33481f7e6dacc
 AUX xrdp-sesman.pamd 156 SHA256 a153eb2505131600f7e1664728c029fa0255a355dd93c758946a4fac42baedc6 SHA512 37e5b4557be51dfc25b041a553d0464854586d7a10f16740d335be16c9b677f38a08495ef05a01259c3f8d401eb44542bd939dd23d1afa8bac4d9d9e144cb1a4 WHIRLPOOL 49072d111265aadac2c6ab8792d18f1c7b4630d52e0968907ec149a539082335a66ac54b3856727f7045c030af5f81866d332428f42c9cd657816a5b866a7de3
 DIST xrdp-0.8.0.tar.xz 1671376 SHA256 433535039f8b8766d9c22f62de9599afa94dd553e72d9791cec85a5e2f436a60 SHA512 bb2afefce7f53b6c3bca30cb6913171211df63a700f7d70325c1722348d5d31981e1d417727e48fd14aad500d0454e4126e6e1f81f8c09da4928b02f4acff26b WHIRLPOOL 39c1d4852f6f927fd348d345a8d4f4a79824eca0d5682340908d28f3b6b497ae33bfed944294b061b118e4154ed7c5dce15878302145ffabc2ca6b3a2eb07818
 DIST xrdp-v0.6.1.tar.gz 1563654 SHA256 6880003b26799e4154a9486f671b6fc1b0487de0da2289573f46c090146e5a3b SHA512 d2aa5c300ed4c5e84137776f3d5f63736a8d674ef3a96eda271fd6d80ecc394a1148dd9d09b3acf3916c774fd15fe7400271ffb034a45ddae6b34ea30fb2465c WHIRLPOOL 34d51ad9976eff16b2ad68405b54e6d91345f57791f2a35a1676981416a83a0d13f0bb1442fafeb5ff2d74dc3c08610a7e01909181c358beb4770e677d36f833
-EBUILD xrdp-0.6.1.ebuild 2855 SHA256 22adbd4fc98ec7533985cea406e8d4e9eb044feabb8ef65cf30b38a197ee593f SHA512 25e5480a8225975d2a0859f1e3c8bcaedc656fc4f45ad912f6185cec3c94779ce16ac8ce961a03bf19fee82d8933e3258eac0407dc61adef6c32b5cf8792cc14 WHIRLPOOL d5809c6120d853a0eb19113627013afa746e1d08863bdf36183156dda6ed807ca8c3651361ac58d7089859310c507230e55f421fd34ac80aea7a7682ca1ef55a
-EBUILD xrdp-0.8.0.ebuild 4155 SHA256 a5f447e8112f7391cf68ff2302dc7928888a92ccecd747f8dc0efef6b67f47d8 SHA512 4a0890a00109e1f5b51971b7f4956527fbddf7474833a4d441738551d0f85f1c15b59c34704c8e07ea26e2feba44afd523bbe983239d17b3d42c57431ccddfd8 WHIRLPOOL 1810b3a38e5fee7616a2066b2a401e593d6dcdf10bbc50f87f4666340ec06d68cd600cc0fb5f03289bc7a02762ffa6fda6936e7012d604f79eeed00182e8294f
-MISC ChangeLog 875 SHA256 a46ff9f497cf3e9f3eefff425ed961b0fc05956e6f4ef7a4838f916357dd1ee3 SHA512 bace062e37975698ff50a8efa507e59776b94c5ba4f9d00f04004d64e7f580d5e44fd01c15c4628f17de22b1482d82d6b8d5e2aa99e4eabc57c8981d5ec7950b WHIRLPOOL 16e1df91b612fbe82a546ffcbc77098b475a54d5bdc5d8b53b6efabee4f8daaa2530df2758b0544fde40a46f17598b75f59925f4af8264bfb551e0cfce83d836
+EBUILD xrdp-0.6.1.ebuild 3167 SHA256 c349f339b7cfaf5f0894b3f6620fa213554a7c0733623dccf8b976e2a172775b SHA512 1c1b61f856d0c80ed9a6f32894a59da1a46a678038b74344ea88f86ae1f6e60e579e5b5a7f367d71d345bd91cd94b9e765b7bedb8d62e2a1cfa43b5155c56ef2 WHIRLPOOL b44ddb304b8468fe604a660e9d675a0071f66171ebc31dd715f291c41982a29655fce340875ed02b8e7733a4dbb01544efb168667360d6283d39ce5dbc65d75f
+EBUILD xrdp-0.8.0.ebuild 4459 SHA256 85656d8f04b46bee45ec944444edf3c5d854e1c1ea29cb5b937fd6e91f028dc4 SHA512 793b05f0c134a4b23779806a6ecceb92cb81ffce5ea8a8755bffb63dd8e6b7ce1e2d673f8ecd1c1d858cdfddd7928c9428a1f03bab927d20481933a6a3f814cf WHIRLPOOL a87e9454c4007d01fc8e704d6755ff5876aa9237143620726cfca84ce7f0ec7e4046a36e035e89153f19857eccb09ff4c5a7441738cb706649502e471a365b58
+MISC ChangeLog 1022 SHA256 b1336c62a3243b0f2f179fb3face6b4f972a579a8bc26d665603159588e87900 SHA512 dce8361d86ea536672f92dce2f0a521e15436da46bd48dab29c90e4467e11820b84426bc424a5413d3ef51247df83929fe701524d0031d852bb9d6e1de0b2f8b WHIRLPOOL 4b39efeafdf412cdc3877b915574835f5ac66a1efcb1ad21f602ff1e6609f33d6f32804cd1474ccb2583ee7b014fbddccbca02b826ea5c8043d11f5585c6302d
 MISC metadata.xml 345 SHA256 c31282487a5eb15b45e22867d2d88998390f96cd852505be88cda2fe0a44c172 SHA512 ac48599a59c2d3f303f31e564d3af5248a8ba27f63f2f50b5135bbfb3bc95c73fedf345c523862ba284aec161bd94ff21eb4f640071c61d2ed86685b39f698de WHIRLPOOL a5b0f439e70a6b18f3b5e2021878a69243508a1a9a27514d76a2da06883d7becbc84ad6553f8d39a9471e334268b8c93b378ae9856b7209b47c9793b6b7974c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUSOKPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUTlepXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO1T8QANItvhrEFJodJsLGa4suJQyu
-4S+KoJl83l0O9IAjma1hiQ4uCpBsGnvSPWbOLR4u4Ty7Xqu+WU/1ALJzM4qoeRay
-kUQTBs6hXpaZvSzfrxx5k4Txz4P4MKVlaOiY5UNHk1nsR4Emhs2ZObcTlUJ2LDuU
-ATbLKph/DQBDwPzBDf5+hTFG5FZjGlMVfs9b/cAcvPOmT9Kvb80Tq++HhboWuClf
-3CkKcM3yi/H8XPywE/DCPAOKPqa97fyK9/rQHdLhq+NXFmCzO5cNJaUsx7IglMrg
-y6Huek6VKBXSdWmxPSAjgvlzSpgfZMBlHUdxyZGM37IMrW/TnWMlAFWkH9p5zkS8
-f1h4FnOPBgBeKW0BZult58tjVtK69Txdw9j5ISHrlcHk13UcKp5T/xYujh0e2Y07
-Ex8UP5Bz/uDcjuAADsmpWZw7BvNaRdL8ruJfei3hxvotJ+UJaz8dI764hK27WqiD
-6+FqiQY5lbKtgVj534LBVwWWPTJY4Ul+E1AQ6GokNnJbcwigy0g5xGbCC4SI7PdR
-o7HfwHsY2ITZijXaqRYLkuN8M/ZI310fF6FOFDii8GBYZ5GucPGTkSiug5cEFXJa
-R8Cz76PxxrnMmtmMskyTfpI2ndOmN9ydPyRbv/Pyh14486uhqO2SgLB2FDNtbEyj
-TrL1eALmI15Lb4BEYPY+
-=JkQG
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO2hsP/3xL1ApxL/Pyejfn6yj0QcHs
+Fk5CnX1mfsq6TxRmX4qk+hTlc9mxOl+mQ7K0Q/GjAd02gGpj9SOmZuuvRvB1PnBz
+oByBbupVd0w/2jc7XqGWdbYPbFlHDE29iKmDKD53xWMnDTUWmk5ZBAXNBijjf5pw
+AF0PDFKXCGE9JZWYRTbxm0FEjbtD6Rol5EsxzJOmeEWwh0KAUK5XcJVGq0z1TPYc
+LhVyNwZ2OtymwiJq/U/BuKpjxRN70f6vND9jnig9z+4HhZudgcLKrPHw8q3cMau9
+FDbVT4jpT7NRO4Puz+lwDPjKMDBDzuss/gUTL+/EhfPKR0+Jtkcj71maQQ1EouHJ
+fSXjzjjUYoW5AbvK2vNe7I7goKW4DqmE28tlzWlfszjjycZSwoz0grGZhFP6hbsE
+3E8ebsxiFgZoCI1CW0+9qXwCH7+Ax4mdk3jzwR40KqhNRtEm7QbTZ4ZruPZY8FII
+OYpw/XBeiozrF/cH4Y3qGh0lYYsnlkDUrFncQ1Wvr7/+aXyUCXDJ1ODkOhuUW3o7
+EDFP+odxCdYOTNQ5Sw6ANnJRRvgfi9g2GqAtsbW//39RtxaqzP8HU4gTooKC27P9
+y87VIyeqS4yVIgKABZxGKItHymLIVEc9wfPDNuHsTPhzXtEvH/7RIK3jH2EWHsp8
+3f9AqKWnpStNRwnmaDEQ
+=1WfO
 -----END PGP SIGNATURE-----
diff --git a/net-misc/xrdp/xrdp-0.6.1.ebuild b/net-misc/xrdp/xrdp-0.6.1.ebuild
index df0c5af06397..eb91771703c2 100644
--- a/net-misc/xrdp/xrdp-0.6.1.ebuild
+++ b/net-misc/xrdp/xrdp-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.6.1.ebuild,v 1.3 2014/10/23 11:12:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.6.1.ebuild,v 1.4 2014/10/27 14:33:09 mgorny Exp $
 
 EAPI=5
 
@@ -22,6 +22,12 @@ RDEPEND="dev-libs/openssl:0=
 	x11-libs/libXfixes:0=
 	kerberos? ( virtual/krb5:0= )
 	pam? ( virtual/pam:0= )"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	|| (
+		net-misc/tigervnc:0=[server,xorgmodule]
+		net-misc/x11rdp:0=
+	)"
 
 S=${WORKDIR}/${MY_P}
 
@@ -101,5 +107,10 @@ pkg_postinst() {
 		ewarn "consider regenerating rsakeys.ini using the following command:"
 		ewarn
 		ewarn "  ${EROOT}/usr/bin/xrdp-keygen xrdp ${EROOT}/etc/xrdp/rsakeys.ini"
+		ewarn
 	fi
+
+	elog "Various session types require different backend implementations:"
+	elog "- sesman-Xvnc requires net-misc/tigervnc[server,xorgmodule]"
+	elog "- sesman-X11rdp requires net-misc/x11rdp"
 }
diff --git a/net-misc/xrdp/xrdp-0.8.0.ebuild b/net-misc/xrdp/xrdp-0.8.0.ebuild
index 52ff4dc86752..f2fc2ee6970a 100644
--- a/net-misc/xrdp/xrdp-0.8.0.ebuild
+++ b/net-misc/xrdp/xrdp-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.8.0.ebuild,v 1.3 2014/10/23 11:12:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.8.0.ebuild,v 1.4 2014/10/27 14:33:09 mgorny Exp $
 
 EAPI=5
 
@@ -25,7 +25,13 @@ RDEPEND="dev-libs/openssl:0=
 	kerberos? ( virtual/krb5:0= )
 	pam? ( virtual/pam:0= )
 	pulseaudio? ( media-sound/pulseaudio:0= )"
-DEPEND="app-arch/xz-utils"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+RDEPEND="${RDEPEND}
+	|| (
+		net-misc/tigervnc:0=[server,xorgmodule]
+		net-misc/x11rdp:0=
+	)"
 
 # does not work with gentoo version of freerdp
 #	neutrinordp? ( net-misc/freerdp:0= )
@@ -134,5 +140,10 @@ pkg_postinst() {
 		ewarn "consider regenerating rsakeys.ini using the following command:"
 		ewarn
 		ewarn "  ${EROOT}/usr/bin/xrdp-keygen xrdp ${EROOT}/etc/xrdp/rsakeys.ini"
+		ewarn
 	fi
+
+	elog "Various session types require different backend implementations:"
+	elog "- sesman-Xvnc requires net-misc/tigervnc[server,xorgmodule]"
+	elog "- sesman-X11rdp requires net-misc/x11rdp"
 }