Change virtual/lpr to net-print/cups RDEPEND wrt #358879 because USE="cups" shouldn't be used for lprng in any case.

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

7 files changed, 26 insertions, 21 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index c6c6b6dbdbee..55d0ffdaef1e 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/lyx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.227 2011/05/16 04:22:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.228 2011/05/21 04:25:37 ssuominen Exp $
+
+  21 May 2011; Samuli Suominen <ssuominen@gentoo.org> lyx-1.5.7.ebuild,
+  lyx-1.6.8.ebuild, lyx-1.6.9.ebuild, lyx-1.6.10.ebuild, lyx-2.0.0.ebuild:
+  Change virtual/lpr to net-print/cups RDEPEND wrt #358879 because USE="cups"
+  shouldn't be used for lprng in any case.
 
 *lyx-2.0.0 (16 May 2011)
 
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index c36a47986c49..36de15db5a35 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 1.6.7-python.patch 906 RMD160 74a2f14445d6b011fe04d06f3bd6710d36ab6351 SHA1 a9bc180553105b61767a82280e211a2c187cfbd4 SHA256 ad4ebb8d3837536eea869e15b3759840a1153d64d74b744e956ce9bdf5e5651d
 AUX lyx-1.5.0-gentoo.patch 1298 RMD160 69b7ce68234e7f5c2fee708944267f1974aa10d0 SHA1 16c3e6f846c55c3eb5fd9d7da1247a3429efa7a4 SHA256 36be1ea2577cce270319a7a3b4bed92e5925c0e974edda8729bda2179ac8ffe2
@@ -12,17 +12,17 @@ DIST lyx-1.6.8.tar.bz2 12232798 RMD160 bf144d8f9ab0b646f320671dded82544c9bbe83e
 DIST lyx-1.6.9.tar.bz2 12560174 RMD160 30e37efc4c9cf3d335e78a1a1940dba2a0df1645 SHA1 a1acacc8a26546542e32977ae222e811c98b1ca4 SHA256 c5b3602c58db385be5c52ba958f52239c5fd090320ec99d79b7eb861c1597709
 DIST lyx-2.0.0.tar.xz 10011408 RMD160 9d2974ae03a986effcd0bccac04a6c877f976f33 SHA1 27bf0ee623aae0e59780d9f627cdf5cb788a2516 SHA256 a790951d6ed660b254e82d682b478665f119dd522ab4759fdeb5cd8d42f66f61
 DIST preferences 1669 RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 SHA1 3567ad4d4a2a041c295e40fef76ca53de6cb260d SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43
-EBUILD lyx-1.5.7.ebuild 3367 RMD160 620b3527a05ff9a6b7c8e437ed8aa44bfa5ce575 SHA1 8a271820a19eae09f82ee337ee33beb9d1e2c6ae SHA256 6a5110e467aa030076b73307cc24b03f99f24a27c3e79c58a89f53aa3812b9b1
-EBUILD lyx-1.6.10.ebuild 4012 RMD160 0fe3ba13617b2dd7fcd2bbea59317fe7deac360c SHA1 f76520aa0657bf3629bfe708ed07377081565e74 SHA256 1bf4182cd95892021b8245adc6bad49bb65efaa20e52ce5cea6450fb3b041880
-EBUILD lyx-1.6.8.ebuild 4095 RMD160 aec15c0f4597aac3ce652b15961b6ae516796417 SHA1 f49ed7cceb8626e411190bbfe5cd07f12b442ca6 SHA256 af042fb50f58ab4e6394132c1ddb8e65c367ee0e3c9d9b9ce2284c4f85e0e562
-EBUILD lyx-1.6.9.ebuild 4006 RMD160 b1664946bd14dac85b7741755728d82e73025dd1 SHA1 1f851692419a6c59a0042752a8b049fbb0695c5e SHA256 9e421642e1842b2bc62e1a5a64d915d317502ffe4e448e955daec42cbabb0a08
-EBUILD lyx-2.0.0.ebuild 4584 RMD160 81075b305b23993f5bec1d43f815fb9e8b77def1 SHA1 da35a562e5f281c20c84fbe7cf46e1e15269bab9 SHA256 4922f8f4fe856ad54ae92daf52a76a2c6d6ae2e3158f94ac5d6b157076b70bc1
-MISC ChangeLog 31269 RMD160 c2059366600b6c001b3eb4c353742d2c9e07d6cd SHA1 f7f88c05ef165d0b0388f9ff981ea90f51d1fc0a SHA256 1c14207ee30ef440d7a4ee40f27f43c602069dc7e61ffc7a1348771ad6ae489c
+EBUILD lyx-1.5.7.ebuild 3377 RMD160 0a4976c0c7efd837bf086c4c43528b0c4b15b35f SHA1 c8eea4ff0158d887495b5b0b5cadcb99e1e99aad SHA256 eb18e010c43d3d564eceaad094ca2cf7ba8d5e7c30d2c79e4ad6042d7b017e49
+EBUILD lyx-1.6.10.ebuild 4016 RMD160 8bc5ae7e3af87d4d85d0d84e5edaec2a8c98064e SHA1 77af277c0f5e5ad0c332f75be1beb394d13b276d SHA256 0cdfce71f4c5108c1c16682a9b0fd2f2ba19b4b8bafe987d46dd093f88c4464b
+EBUILD lyx-1.6.8.ebuild 4104 RMD160 7174a9904ef34e711e114867a95c4e5fc5ac4db1 SHA1 83c3d3e6646cc2f45741e42da8927a8df247a60b SHA256 8d497e2c9f614b31183a06eb0f7e170c95397beee04a87dec7909cb9a2c8cdb7
+EBUILD lyx-1.6.9.ebuild 4015 RMD160 0a7d8ee10c60a3a0248d7178deab89c7c28e165d SHA1 cc1c30e94ea118ef6349ad95e84af922b2f83af3 SHA256 b6cc9e2f498a07361b0a5d1938fde8e7bd959d60b3bf7c26cc7993dcf6cd1a65
+EBUILD lyx-2.0.0.ebuild 4588 RMD160 d970fab4fac640c786403cd2819f9a4bd51a83d2 SHA1 04af6818ffab2e30ba86918f77438b9ae9517710 SHA256 cf2c2502464e45b82dbcb7cbfa4aaaabc329dda4648dff6811fc0602c5c7b4c8
+MISC ChangeLog 31539 RMD160 fff0202418a6e35ec21c234050a17a9f00048ee6 SHA1 195bca4ab46bce5627efd1f58529f6dc53cd1a1e SHA256 04f3d3d19c7464eedee6f97513dd7386f728cc4324973262ed86c077f4f94267
 MISC metadata.xml 1572 RMD160 850394a1700004439f7258d04732517216d8e31c SHA1 99c60675f6273f853498479676a4be74e07182b3 SHA256 330d0d86b06c6ce15cea6cfdd3bd070bddc82309346902481883575fd211ec14
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3QpqMACgkQvFcC4BYPU0oHKwCfRRdPdvgUld+e2OFnUe/HkrGR
-posAn1UFqZIvJU/UW+SG+RUq3OlJeV+f
-=ym7p
+iF4EAREIAAYFAk3XPmwACgkQXkR9YqOcLPFkwQEAiFDMaahG6zPrHQ7KQRaD2oLK
+B3qb+kdaNnZnKgyQME8BAJd4wiqU1CW60Gii8+yTlSYY9AzvJhZ9AkeXu1wETqp9
+=cnCk
 -----END PGP SIGNATURE-----
diff --git a/app-office/lyx/lyx-1.5.7.ebuild b/app-office/lyx/lyx-1.5.7.ebuild
index e6890a28e869..bcacdc217b21 100644
--- a/app-office/lyx/lyx-1.5.7.ebuild
+++ b/app-office/lyx/lyx-1.5.7.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/app-office/lyx/lyx-1.5.7.ebuild,v 1.9 2011/04/16 10:59:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.5.7.ebuild,v 1.10 2011/05/21 04:25:37 ssuominen Exp $
 
 EAPI=1
 
@@ -46,7 +46,7 @@ RDEPEND="x11-libs/qt-gui:4
 	app-text/sgmltools-lite
 	app-text/aspell
 	>=dev-lang/python-2.3.4
-	cups? ( virtual/lpr )
+	cups? ( net-print/cups )
 	latex? (
 		virtual/latex-base
 		app-text/ghostscript-gpl
diff --git a/app-office/lyx/lyx-1.6.10.ebuild b/app-office/lyx/lyx-1.6.10.ebuild
index cf08716223c2..0b3d9f2089c3 100644
--- a/app-office/lyx/lyx-1.6.10.ebuild
+++ b/app-office/lyx/lyx-1.6.10.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/app-office/lyx/lyx-1.6.10.ebuild,v 1.1 2011/05/14 16:15:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.10.ebuild,v 1.2 2011/05/21 04:25:37 ssuominen Exp $
 
 EAPI=2
 
@@ -50,7 +50,7 @@ COMMONDEPEND="x11-libs/qt-gui:4
 RDEPEND="${COMMONDEPEND}
 	|| ( dev-texlive/texlive-fontsextra app-text/ptex )
 	|| ( media-gfx/imagemagick media-gfx/graphicsmagick )
-	cups? ( virtual/lpr )
+	cups? ( net-print/cups )
 	latex? (
 		virtual/latex-base
 		app-text/ghostscript-gpl
diff --git a/app-office/lyx/lyx-1.6.8.ebuild b/app-office/lyx/lyx-1.6.8.ebuild
index 56440c63a200..b4df47e67273 100644
--- a/app-office/lyx/lyx-1.6.8.ebuild
+++ b/app-office/lyx/lyx-1.6.8.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/app-office/lyx/lyx-1.6.8.ebuild,v 1.7 2011/04/16 10:59:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.8.ebuild,v 1.8 2011/05/21 04:25:37 ssuominen Exp $
 
 EAPI=2
 
@@ -52,7 +52,7 @@ COMMONDEPEND="x11-libs/qt-gui:4
 RDEPEND="${COMMONDEPEND}
 	|| ( dev-texlive/texlive-fontsextra app-text/ptex )
 	|| ( media-gfx/imagemagick media-gfx/graphicsmagick )
-	cups? ( virtual/lpr )
+	cups? ( net-print/cups )
 	latex? (
 		virtual/latex-base
 		app-text/ghostscript-gpl
diff --git a/app-office/lyx/lyx-1.6.9.ebuild b/app-office/lyx/lyx-1.6.9.ebuild
index 05fd9e6c5d10..0c106ac1f00c 100644
--- a/app-office/lyx/lyx-1.6.9.ebuild
+++ b/app-office/lyx/lyx-1.6.9.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/app-office/lyx/lyx-1.6.9.ebuild,v 1.3 2011/04/16 10:59:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.9.ebuild,v 1.4 2011/05/21 04:25:37 ssuominen Exp $
 
 EAPI=2
 
@@ -50,7 +50,7 @@ COMMONDEPEND="x11-libs/qt-gui:4
 RDEPEND="${COMMONDEPEND}
 	|| ( dev-texlive/texlive-fontsextra app-text/ptex )
 	|| ( media-gfx/imagemagick media-gfx/graphicsmagick )
-	cups? ( virtual/lpr )
+	cups? ( net-print/cups )
 	latex? (
 		virtual/latex-base
 		app-text/ghostscript-gpl
diff --git a/app-office/lyx/lyx-2.0.0.ebuild b/app-office/lyx/lyx-2.0.0.ebuild
index 30281b75bc2e..3d8e5ac9565b 100644
--- a/app-office/lyx/lyx-2.0.0.ebuild
+++ b/app-office/lyx/lyx-2.0.0.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/app-office/lyx/lyx-2.0.0.ebuild,v 1.1 2011/05/16 04:22:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.0.ebuild,v 1.2 2011/05/21 04:25:37 ssuominen Exp $
 
 EAPI=3
 
@@ -50,7 +50,7 @@ COMMONDEPEND="x11-libs/qt-gui:4
 RDEPEND="${COMMONDEPEND}
 	|| ( dev-texlive/texlive-fontsextra app-text/ptex )
 	|| ( media-gfx/imagemagick media-gfx/graphicsmagick )
-	cups? ( virtual/lpr )
+	cups? ( net-print/cups )
 	latex? (
 		virtual/latex-base
 		app-text/ghostscript-gpl