Huge collection of fixes

4 files changed, 42 insertions, 29 deletions

diff --git a/virtual/miller-dev/Manifest b/virtual/miller-dev/Manifest
index 7bcd148..3bc674c 100644
--- a/virtual/miller-dev/Manifest
+++ b/virtual/miller-dev/Manifest
@@ -1 +1 @@
-EBUILD miller-dev-10-r2.ebuild 1427 SHA256 b0cf8097b189a8b0d9929356436842ee521cdb80a77dd50e85e87ac0efc247eb SHA512 22ef30bb4efa67fd6b110a4692a6854ad216575b9c953b032c9dd483e10edb6bb7900819fd2f1f16639623ae8f6bf992d7c590694e35fd3f7c8cd4a9eb5653a0 WHIRLPOOL 432ee0a1a9fe04eb497b6dc6c5eb88232e77e8992e7857b017a6321bcb3759c719567f8f1b6cb2aefbcf80ba8e1b54137492a9e690866c8eb1a2e5990ffdcee6
+EBUILD miller-dev-10-r2.ebuild 1571 SHA256 66f126880f6673ef3b1f85dbf776db44298030653085c1bdad9c9982f72ceb24 SHA512 54f9ed6fb577458bcb67890439e77418610e6c38d059371cbcb92a68b8747db3ef354d1b29521c6cc8d7a8f4967337f86b07de9f49ffb85d4f2d0264ec088630 WHIRLPOOL 3edcbd133ce54449bbc0d006585e7be071608c66731a11ce1699c56d2c69f162178443f0e7f1462d54de509ec91f1ba761699567872c8e2bad83ae809d1b1475
diff --git a/virtual/miller-dev/files/digest-miller-dev-6 b/virtual/miller-dev/files/digest-miller-dev-6
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-dev/files/digest-miller-dev-6
+++ /dev/null
diff --git a/virtual/miller-dev/files/digest-miller-dev-7 b/virtual/miller-dev/files/digest-miller-dev-7
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-dev/files/digest-miller-dev-7
+++ /dev/null
diff --git a/virtual/miller-dev/miller-dev-10-r2.ebuild b/virtual/miller-dev/miller-dev-10-r2.ebuild
index a182038..1e67a15 100644
--- a/virtual/miller-dev/miller-dev-10-r2.ebuild
+++ b/virtual/miller-dev/miller-dev-10-r2.ebuild
@@ -1,13 +1,15 @@
+EAPI="4"
 DESCRIPTION="Virtual for Miller development workstations"
 
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE="X dotnet odbc mysql postgres"
+IUSE="X dotnet odbc mysql postgres cxx"
 
-DEPEND="virtual/miller-base
+RDEPEND="
+	virtual/miller-base
 	www-client/lynx
 	www-client/chromium
-	|| ( www-client/firefox www-client/icecat )
+	www-client/firefox
 	www-client/opera
 	postgres? ( dev-db/apgdiff )
 	sys-devel/gdb
@@ -15,12 +17,15 @@ DEPEND="virtual/miller-base
 	app-text/htmltidy
 	app-doc/doxygen
 	app-benchmarks/siege
-	dev-util/cppcheck
+	cxx? (
+			dev-util/cppcheck
+			sys-devel/clang[static-analyzer]
+			app-vim/omnicppcomplete
+			dev-util/splint
+		 )
 	media-fonts/freefont
 	app-vim/vcscommand
 	net-analyzer/arping
-	dev-util/splint
-	app-vim/omnicppcomplete
 	dev-libs/fcgi
 	dev-libs/Ice
 	dev-cpp/glibmm
@@ -34,7 +39,6 @@ DEPEND="virtual/miller-base
 	net-ftp/ftp
 	media-video/ffmpeg
 	postgres? ( dev-db/postgresql_autodoc )
-	dev-db/squirrel-sql
 	odbc? (
 			mysql? ( dev-db/myodbc )
 			postgres? ( dev-db/psqlodbc )
@@ -42,26 +46,35 @@ DEPEND="virtual/miller-base
 	net-misc/youtube-dl
 	www-servers/apache
 	X? (
-		|| ( net-misc/tightvnc net-misc/vnc )
-		net-misc/rdesktop
-		media-gfx/gimp
-		kde-base/kruler
-		net-analyzer/wireshark
-		x11-apps/xhost
-		dev-db/tora
-		dev-util/nemiver
-		dev-util/kdbg
-		kde-base/okteta
-		dev-vcs/kdesvn
-		net-analyzer/nmap
-		dotnet? (
-			dev-util/mono-debugger
-			dev-util/monodevelop
-			dev-util/monodevelop-database
-			dev-util/monodevelop-debugger-gdb
-		)
-		postgres? ( >=dev-db/pgadmin3-1.12 )
-		kde-base/kcachegrind
-		app-editors/gvim
+			|| (
+				net-misc/tightvnc
+				net-misc/vnc
+			   )
+			net-misc/rdesktop
+			media-gfx/gimp
+			kde-base/kruler
+			net-analyzer/wireshark
+			x11-apps/xhost
+			dev-db/tora
+			dev-db/squirrel-sql
+			dev-util/nemiver
+			dev-util/kdbg
+			kde-base/okteta
+			dev-vcs/kdesvn
+			net-analyzer/nmap
+			dotnet? (
+				dev-util/mono-debugger
+				dev-util/monodevelop
+				|| (
+					>=dev-util/monodevelop-4
+					(
+					 dev-util/monodevelop-database
+					 dev-util/monodevelop-debugger-gdb
+					)
+				   )
+				)
+	postgres? ( >=dev-db/pgadmin3-1.12 )
+	kde-base/kcachegrind
+	app-editors/gvim
 	)"