New additions and changes

8 files changed, 12 insertions, 9 deletions

diff --git a/dev-db/squirrel-sql/Manifest b/dev-db/squirrel-sql/Manifest
index 645a2de..0695c79 100644
--- a/dev-db/squirrel-sql/Manifest
+++ b/dev-db/squirrel-sql/Manifest
@@ -5,4 +5,4 @@ DIST squirrelsql-3.6-optional.zip 55852801 SHA256 fe45b56f5bcddaa166483d186e755f
 EBUILD squirrel-sql-3.2.1.ebuild 825 SHA256 3ad8397257884e9ad71d70d25bc07abda836f6ca2a1b45f1b2eec22607a62770 SHA512 1ebe8cbc6f714605bffb91152eb8fe4397155fb26cfb40bac797aed51ea2bfd6d3ac9a236008fcbc6b77f68b0ba2e5b251ba3c6c7445d340513114e5fcd002e2 WHIRLPOOL 80be891f83bd87fcd08396da7599df79747218db8d14d1692956830ae6c2191b84c5e6dda629d4ed25727b9764b49a90c17535fa9c333e9afffe9c503e3509ed
 EBUILD squirrel-sql-3.3.0.ebuild 825 SHA256 3ad8397257884e9ad71d70d25bc07abda836f6ca2a1b45f1b2eec22607a62770 SHA512 1ebe8cbc6f714605bffb91152eb8fe4397155fb26cfb40bac797aed51ea2bfd6d3ac9a236008fcbc6b77f68b0ba2e5b251ba3c6c7445d340513114e5fcd002e2 WHIRLPOOL 80be891f83bd87fcd08396da7599df79747218db8d14d1692956830ae6c2191b84c5e6dda629d4ed25727b9764b49a90c17535fa9c333e9afffe9c503e3509ed
 EBUILD squirrel-sql-3.5.0.ebuild 825 SHA256 3ad8397257884e9ad71d70d25bc07abda836f6ca2a1b45f1b2eec22607a62770 SHA512 1ebe8cbc6f714605bffb91152eb8fe4397155fb26cfb40bac797aed51ea2bfd6d3ac9a236008fcbc6b77f68b0ba2e5b251ba3c6c7445d340513114e5fcd002e2 WHIRLPOOL 80be891f83bd87fcd08396da7599df79747218db8d14d1692956830ae6c2191b84c5e6dda629d4ed25727b9764b49a90c17535fa9c333e9afffe9c503e3509ed
-EBUILD squirrel-sql-3.6.0.ebuild 860 SHA256 7739e4209d3f840a4a3e80e9bc02ea34569d5d9a8f31f170fbda6e9a7f99c0d7 SHA512 b8bd0d89d4de98d781c60a8db30302c33aa58169212924c30aa1d614d2da59a76a931bc7acb0b736265587c98b0c43b431178297a20485ea59c8e2716b24b598 WHIRLPOOL f8108bb3587812efd08bb5ad652326af405f87d66bb4a3db34b21eb0605dd5c42920bb3d3df97f19ebc3507940395069fb230b870f098d7776db1cb6d605f325
+EBUILD squirrel-sql-3.6.0.ebuild 848 SHA256 1bc31206afe3137a344720ba2e720a141b995a9200826583b551c76adf444a62 SHA512 59383813082662b681305d6628ef9f8c69c2f8e439035393142dc00fb332150c3c074f4b1cfdf163dc88f92970ae2fe1c7ee977b6e81a7c56e350a872248757c WHIRLPOOL 95beb763fc7cc5c76d24f00906440926922b5404f7e4e347e841504acab044682040bc65b2fedba4cc95ab2da4000f75a2b534fa538655e41e24f64ef1dd3c90
diff --git a/dev-db/squirrel-sql/squirrel-sql-3.6.0.ebuild b/dev-db/squirrel-sql/squirrel-sql-3.6.0.ebuild
index abbbe5a..7526e37 100644
--- a/dev-db/squirrel-sql/squirrel-sql-3.6.0.ebuild
+++ b/dev-db/squirrel-sql/squirrel-sql-3.6.0.ebuild
@@ -13,7 +13,7 @@ DEPEND="virtual/jre"
 RDEPEND="${DEPEND}
 	informix? ( dev-java/jdbc-informix )
 	jaybird? ( dev-java/jdbc-jaybird )
-	mssql? ( dev-java/jdbc-mssqlserver )
+	mssql? ( dev-java/jtds )
 	mysql? ( dev-java/jdbc-mysql )
 	oracle? ( dev-java/jdbc-oracle-bin )
 	postgres? ( dev-java/jdbc-postgresql )
diff --git a/virtual/miller-dev/Manifest b/virtual/miller-dev/Manifest
index ae2a34a..3b68ce3 100644
--- a/virtual/miller-dev/Manifest
+++ b/virtual/miller-dev/Manifest
@@ -1 +1 @@
-EBUILD miller-dev-10-r2.ebuild 1873 SHA256 2535d788468437ecdb2e34f9a8c8ac501fbc88033a26a539c6272e3495149f7e SHA512 9eda78691a0c6da2d31e4746f4cdc952cb50950b98b103536dea789a6ed3098790d4fd0d7a7d9e79e67beaf27a377f233a2803ff401531535b5c257d7e3d653d WHIRLPOOL 441b56515d4c8e3afb070b0fc77780a0d7b6e7b728e3b18ddc8fd6a59a1dac5847c456f21d92fc7f6eb12d291bd104dd5cbab99a283e97ec00a56d0960605004
+EBUILD miller-dev-10-r2.ebuild 1828 SHA256 b8e4b46c115f9307219772d322c7f0423bae726229810b91b00d1b10efafcaef SHA512 5de281ad4264374f6471d731bc48b38b244065ebd397816a95aac01c2f64ad7f345681781e4214db72bb017219dbdb0595a2bb4cbb299c0c4f2261adc46b4f10 WHIRLPOOL c119500444fa8c71dfb3edf20ff5ee34291da60aa69aba81e2d239d1b4130825c60dc7d5dac99fcbf50bd6294247011a564ae8fa4de28e287bd49bf1a934cfe9
diff --git a/virtual/miller-dev/miller-dev-10-r2.ebuild b/virtual/miller-dev/miller-dev-10-r2.ebuild
index e1f84bc..2a91110 100644
--- a/virtual/miller-dev/miller-dev-10-r2.ebuild
+++ b/virtual/miller-dev/miller-dev-10-r2.ebuild
@@ -3,7 +3,7 @@ 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 subversion odbc mysql postgres cxx"
+IUSE="X dotnet odbc mysql postgres cxx"
 
 RDEPEND="
 	virtual/miller-base
@@ -69,7 +69,6 @@ RDEPEND="
 			dev-util/nemiver
 			dev-util/kdbg
 			kde-apps/okteta
-			subversion? ( dev-vcs/kdesvn )
 			net-analyzer/nmap
 			dotnet? (
 				dev-util/mono-debugger
diff --git a/virtual/newworld-dev/Manifest b/virtual/newworld-dev/Manifest
index 817933c..ddcc363 100644
--- a/virtual/newworld-dev/Manifest
+++ b/virtual/newworld-dev/Manifest
@@ -1 +1 @@
-EBUILD newworld-dev-0.ebuild 1020 SHA256 365f6b11edf7119ab71e00da8bc6495236d7b925b546b6192ef484251632f5e9 SHA512 035f05159a346bb7c1953a6bfa178ee842c053d0911be8e504b413acb338c5325eaa672d37beb5bd27ad73dfcf02b9fe1ee89b8bcb372e34428bd9a3471b6b4d WHIRLPOOL f8310c48bbd51d89a04e6adb97ffe757e8108a76ddfdbb2adac438476e1fce7b3a4477593b3c3f6dc876d4494047780f7278a5a33e6c3d5b3f1b7c1cfd69d8bb
+EBUILD newworld-dev-0.ebuild 1115 SHA256 990ad578a9c513222fffc75d905c4e18def2dfe8d303cefc9367d40da53d03b0 SHA512 ee8c24f020bd991fc5fb6dc613387acc7bed217ed7be127f6b1f227531dc369bedc9d6ec531aca1e4138b6e365d329cb975ea2b7d6cf7672e3b7947130617024 WHIRLPOOL 3dba48da5b31ac99f1c4ceb8251343166bf836a1f67200ddd3334fbe9ab0bd16385ba0bce3120811ac10e586765a614529f600b9ffd9241064feb9885ee48caa
diff --git a/virtual/newworld-dev/newworld-dev-0.ebuild b/virtual/newworld-dev/newworld-dev-0.ebuild
index 094afa4..05acd23 100644
--- a/virtual/newworld-dev/newworld-dev-0.ebuild
+++ b/virtual/newworld-dev/newworld-dev-0.ebuild
@@ -3,7 +3,7 @@ DESCRIPTION="Virtual for PA New World development workstations"
 
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE="X odbc idea-ultimate"
+IUSE="X mssql odbc idea-ultimate"
 
 RDEPEND="
 	virtual/miller-base
@@ -23,10 +23,13 @@ RDEPEND="
 	dev-java/oracle-jdk-bin:1.7
 	dev-java/oracle-jdk-bin:1.8
 	app-text/trang
+	app-benchmarks/jmeter
 	app-shells/gentoo-bashcomp
 	app-arch/rar
 	net-ftp/ftp
 	odbc? ( dev-db/myodbc )
+	mssql? ( dev-db/freetds )
+	dev-vcs/cvs2svn
 	www-servers/apache
 	=dev-db/marklogic-5.0*
 	dev-db/mongodb
@@ -34,6 +37,7 @@ RDEPEND="
 	dev-vcs/git
 	dev-vcs/git-extras
 	virtual/jdk:1.7
+	www-servers/tomcat:7
 	X? (
 			|| ( dev-util/eclipse-sdk dev-util/eclipse-sdk-bin )
 			idea-ultimate? ( dev-util/idea-ultimate )
diff --git a/virtual/pressnet-dev/Manifest b/virtual/pressnet-dev/Manifest
index 1ca1649..f1cb16d 100644
--- a/virtual/pressnet-dev/Manifest
+++ b/virtual/pressnet-dev/Manifest
@@ -1 +1 @@
-EBUILD pressnet-dev-0.ebuild 1261 SHA256 bd54963c3b73415913003e975ca1258d5a054899c347c6ce080c7e8367c0c6d1 SHA512 70bd0f062bf445a0ddaa6854de4afffca40e23602b57e6a829867db6e825162cd3b4aac422ccd176ed607cf2d7cf9931290612ca7d148df6bc738cc172863144 WHIRLPOOL ea84aa89e7e8dfc3f70e5e723fc24b6bd5874d9bb843db3d5e4f41113b3d7384be452ddd41728c271bce6abf9c81faa3446b41a73e5a42f2f68bd444be33c2af
+EBUILD pressnet-dev-0.ebuild 1257 SHA256 ff696576c33cff1cef532ee098e1514bb222fdb3cfea894957eb6f2a5fcd5bc3 SHA512 44e9e0bb816900a0f55fb9a72adf8a1263a8eb4ccd10fb8776ee3381ee43c242d51991ca8e598f42c60660db1525072f449ea605860e3babe26cad306f806380 WHIRLPOOL fc9336145f6a07a6436b56a0dbc097d6fa5484b3d712b4e462f5bae51cbb62acc1139b48936706ec7cb7eef231edca639401cbd513bf7381c01cf41cff6a1795
diff --git a/virtual/pressnet-dev/pressnet-dev-0.ebuild b/virtual/pressnet-dev/pressnet-dev-0.ebuild
index 16dab10..0be4455 100644
--- a/virtual/pressnet-dev/pressnet-dev-0.ebuild
+++ b/virtual/pressnet-dev/pressnet-dev-0.ebuild
@@ -12,6 +12,7 @@ RDEPEND="
 		=sys-devel/gcc-4.4.7*
 		=dev-libs/boost-1.49*
 	)
+	dev-vcs/git
 	app-vim/youcompleteme
 	app-vim/syntastic
 	sys-devel/gcc
@@ -56,7 +57,6 @@ RDEPEND="
 		dev-db/tora[mysql]
 		dev-util/nemiver
 		kde-apps/okteta
-		dev-vcs/kdesvn
 		kde-apps/kcachegrind
 		app-editors/gvim
    )"