Drop old; Version BUmp

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 88 insertions, 93 deletions

diff --git a/dev-db/sqlitebrowser/ChangeLog b/dev-db/sqlitebrowser/ChangeLog
index a7c23479b7d1..6db0cdbaaa06 100644
--- a/dev-db/sqlitebrowser/ChangeLog
+++ b/dev-db/sqlitebrowser/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/sqlitebrowser
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/ChangeLog,v 1.18 2014/09/29 07:30:52 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/ChangeLog,v 1.19 2015/02/21 14:03:56 jlec Exp $
+
+*sqlitebrowser-3.5.1 (21 Feb 2015)
+
+  21 Feb 2015; Justin Lecher <jlec@gentoo.org> +sqlitebrowser-3.5.1.ebuild,
+  -files/sqlitebrowser-2.0_beta1-gold.patch,
+  -files/sqlitebrowser-2.0_beta1-qt-4.7.0.patch,
+  -sqlitebrowser-2.0_beta1-r2.ebuild:
+  Drop old; Version BUmp
 
   29 Sep 2014; Justin Lecher <jlec@gentoo.org> sqlitebrowser-3.3.1.ebuild:
   qcustomplot pkg move
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 665b3a213838..175c21027fc6 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,31 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX sqlitebrowser-2.0_beta1-gold.patch 208 SHA256 12b9788829b1f8f3ab6204bfa4a61d2f42fbd29a7a304a55d15638c2e2bda807 SHA512 a060942c8096f7359a6f91267abf0fb2cd432ee1c97cef50cab76a8d3f17a1cd3e7873f3e4e95b22a7a281d549abd636ea8ded90d7e8806f3002122e82dac42f WHIRLPOOL 024ba6dae4b58f4dd05c2d3b6f39249cb6b38e27b1d62f7fc05b13bbc0ffdf78356ec7c0d8a6a632bcda2c90e383701defc7672b92defb50edf92f919790d216
-AUX sqlitebrowser-2.0_beta1-qt-4.7.0.patch 1044 SHA256 c1be6fa7c392007161b8bb26842a031359a1c8e95085e8e8db68203388551fd5 SHA512 0a23f353223ba8409e58a662ce1bcf077936d425d6fbaedd2b45cda6ce6210946a9d082196625ea86db743173effcfee5d0c394416cbad5cb5abc2405364dd4c WHIRLPOOL f1c1fceed3f98bf57264af1879a4bd4e51968338a1ad5403724f116671d567c0b094ff32e609033b979c8d74e39ee10fcecda82b0c811fce9a15e9daf2b03de8
 AUX sqlitebrowser-3.3.1-unbundle.patch 1270 SHA256 96f7c153df04b75883eded47ae0efe412818522a5f2c77128068dee1ac395553 SHA512 e8e050b6fc7dc85ebfc8543adf00ae07e66a1054c4c5a93c861f7d21b297b769807620b5caa8216a1ec8e0af9231967d6c2c8cd1e47d9fadeffc4ba8e1339282 WHIRLPOOL 243e1c75508460e0bc3066626452ec17fd12b9de997fdefd723d9ae3c89d6e6ae9f5dfc635d370408784a2699cd7805d1aa3fd351fe4f911828e2aabe80362b0
 DIST sqlitebrowser-3.3.1.tar.gz 818842 SHA256 5113d3b4c219585fe017047556363d4934b2b3e3f7c3f0968b87e9eac0156d22 SHA512 3cb44631f39b1c1a90b86502761826830054f440509faaece36052958af361185d41335f763499cec5fc005cc90eb7be403c4ac2a5cec655fe63d989434880bc WHIRLPOOL c4ab107ac97800c14ce788e4742beb528f40c74dc787217fdc9fe5dc1f0d8a67b97cd3fc9e6842b54e321d287fff925f050a20d22fbfe5e7491d4c2140c1f6de
-DIST sqlitebrowser_200_b1_src.tar.gz 1136660 SHA256 421f8cf097e9b7eefcc0f3f816ed2ef175d1e836682da0f3890d48f200d21cbd SHA512 23eb86e4c69a78a4a87ab086d3aa2866fa95d49a99667b1f9d064022d732cc55f388dffed233bbd122a8818c2d84f5a095fd1711dfdcf060b89174da06633616 WHIRLPOOL a834778fc19c8d31392b0abdafa0bd7a7514b8fa91a973153f80bc48248f6c115ed2e824fcc1e60b6e681a5434e245a13b4533f281c9e1fc98eb8aa3b016a465
-EBUILD sqlitebrowser-2.0_beta1-r2.ebuild 841 SHA256 06d69679b35eebf0d95269f736d4a9b706573c1b92fdefa0609e9c125f95c756 SHA512 e4c3bc32f1f58231d06e9f52f02ecb8b25f69716a85e29268d698b4bb5c28c7ce200fbe8e20239edd362a865ccbd17a32faa4ea7d0bc6e31261725704200d10f WHIRLPOOL 9e149a61b2c068c7936909c254635285264a029a880367b3b34946842b387d280d3876a115f3067e1006c802fb610514d61467d5b5cb5c5ee6d38e6794e7b77b
+DIST sqlitebrowser-3.5.1.tar.gz 874540 SHA256 d7f3d1e54882ebabab3b2f7764a6bb921d4fe319db84a092147c941ce19feb8d SHA512 815665002932a606c7e1da8738be0d94a0b2bf330042af30d5b4033ce27c548fec1a05b51f2a11a7620d4e123961ba63595b60aec7eac716e5d3747bb90886e2 WHIRLPOOL 1b8984eefe730ef468fc64bff1465de3a5b273e3e1594916f05cbe07bec315126001b42cc05d6a3c153aaaccab39bdafa29d31f83fceba6aa7697df7ff870462
 EBUILD sqlitebrowser-3.3.1.ebuild 1025 SHA256 8f8b87db50f60b0f6bb44e65508c416dd2f97b0da126573a2f78eb84717f3875 SHA512 6c8c7cc1bd66ffb05bb73c70700d7acb7ec39900e98a368423ae593393f9b3f4e43bc06cb0f135846cb0643aad53aff0f1cc890155e13a7e0dc304d58d882b6c WHIRLPOOL fe5e4f3f8a817740bb803992f970ddb19853c843dfe11d8a77271952e28b1f1355b2a6d8bed365def8bca39299cfc31170a825644f187dfc81a505d03d714061
-MISC ChangeLog 3195 SHA256 f9b6385a1a930ac869d68ffc97e6aa97c968f52e996e792c9fc10f9b05f19e1d SHA512 508649db0dc8061ef1537bd0b2e0503994667be125e5bf066f570db1a3eabafc5628fcef8c274436cfdd3379c3780f99aea70c21f485f1991d26ac4ce43be9ab WHIRLPOOL 4ac2cd82d73da9e89bd555cbde89524f11bf3b4aba52476bc6b541fe1abdd43dcf87f9fcc3b0add6f7bded9e21271d5fca486a13f6d958f0682413276e46e760
+EBUILD sqlitebrowser-3.5.1.ebuild 1281 SHA256 ba66ecb9eee3f6967255036c73a44eb88b0f6eedbd1a5d3ab308ab6e5102ed9a SHA512 f02d94c833629b9b00d90d758c97077d5414b056591f6c45a996bd91c5167b80d4c74173f3082eb97615e29ab7c3d30f1adc4cfa69d28fb4f9b55c71633f6b30 WHIRLPOOL f7ff0d513ae7e42dbff27913446e7551aa0dfd36967ca10706ac5e88b84f9daa74e56a3da3073504a2b3e1a6601315bab227edc820c1a7f515eeef89cea8ecec
+MISC ChangeLog 3465 SHA256 76f8634520e1eb01aec888fe3b7e722be77e190fb6b6ff26fdf0ff96bc003906 SHA512 25c2b1e1a8fbaba35b2ba75e8dafe136a2ad9da46ed8fa5dfdbf56a7c7130ec5b88e60bb2976d21eacd5484be086e3333c372923451e025f8288aa74506c1b19 WHIRLPOOL f2f62ca5dd1de5ac70758807aa04f67a0be9965a756542a9ef1c9c52b932c9e17485d9c0f784a7983649320b2d5dc65d479a6b78d74c71b7b3a8ecf6c99e54ff
 MISC metadata.xml 630 SHA256 3e72d77ccd73849eb1199ef695e13bf39557e9577e03758ef285d15ad50aa354 SHA512 0b58cee1916972db03c0acabc76974f59b0d0113efaf835edd68a1250aaa228479915fe7e696e622e3efd269828d0a5630285d417701dce50b46691a63d79a44 WHIRLPOOL e40465371d099279cced523b851aa5181bdc759493d510ab760cc1fa066fc456f113829a1abc485f3e62b77bcb5911b017140c78cbb9ac75d12a91e255e2988b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUKQqtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU6JFNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirGO0P/1XZeCilu8CMDY4T6T6IHDrf
-xPH/alRngJCTWnqu+Rgjwne3WHIF88SSCTHjoffkpxtXq/9N4VJr2dDeK+KWyGv3
-Tm/NFm5r6ywmKMST5ERwwjk+aWbLOtg9lUZT47sY3XY+1IFu5iFjIFpkAcwAgBxB
-JcOvRB8+eLc01Ritoo6KwBbk99tWQC7sMcKHmwkJjzVm0LjQ6OG8LhpUv+4z2jh9
-IWHHo/nvS09Ij7ztQgoS5T0xPLpnY6bxrUXDn7KM7STrdvTFyg4d9j4105no/iXc
-1Mbv6dYaFAz+1iz/4KvurhkZnSttO+lIt7V2Ykggt/N4DqHd8IBGjgmwvjE5cfYi
-SJRXnCdceiJSNO/0M5UdxZbYYCzfLfiEoZaJhHKElIJ8LFQm8sPlvjaYnLhZg7If
-NNTDpD+/Ai5g7p7lOQxPBIrG28vYhFY7Wu5uzCiVkwW7geHTZMOPWrmWG8f2m9WG
-1bZhs9KcI71yA/XsYHnc5hT1nCV0XP6P2jPx72wpIQnPhfzdoy/1hVokutchkg1K
-SLf3CnmFW5Ow6rSTgCot/p7k3ScWXq0Y7+FgvxDAT4hTqtR2riZHp3Cv9C5WHYJy
-jt9l7v3EgzOSIvac7+PXCx0ggQpSRzeVumxPBZg/h35bFRaM7zAXawvl5x9mpkuZ
-ADINiqEKnwCJziEsk8ar
-=o0TO
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirPZIP/3xOHwUmbDp6vjdcBJYfaQMl
+T9Kz7XdO0EQIBT8vPjg7EbgpIPLNNZSLW4PA69z+X8jCuLIwXIW13ccbOdFmRaiF
+1+fXRxAKQCBA5Okn8CuDOy4gJa/C5//+72zF+QsioUIMdZwV7JAiyjzrXZRKWsEp
+XRIjkqLcDfUIZhO1GhjoBiWppMBZHC8klcImfpS/qwHMG7Wa1glvT3kFnqNoiZQv
+ju0AdvmFuJbP/ZjBDQJOFnyDPJwRaMNRDy3pxourKwCpxijX31dq3KR1pwyTaJEZ
+aAFWng7zuvyFN2ZwK+yXV7BTDtfQsWtJAg/9PH8u0R/CpNJ+or+oJpQQTQWBzrWB
+rzd3NuP1o/mik9+1cvASQo0CTn5QAKYdl0evgKsaC0CPhM53qqFTpWf8e3Pr8cpm
+7nKXGCExkyLCxHWG7AXFxuhKYygxbRUTqb1by+IMN4od+N+cE0jQbobLBiQv9z75
+FjDLySsrtnFpoHH5AhN2u+lB9D96TZ7uzqlGkopIUZZsjDn2KY5vmQK3lAkKe6Hz
+9A4aQb9PdlNhD+0M07yhqetRamlV5TI6MF0EPjOf9G4Vx2IOewiYAuZoX2PVzP2x
+LlYTp7ERIw2FbcHLHtbVD5v3CdgSJ/tsqqjNjSVL2/2nHZfgHwBkumbLP3+8PNWi
+4VRGW43w4ga70A+hy6Jj
+=zoPJ
 -----END PGP SIGNATURE-----
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-2.0_beta1-gold.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-2.0_beta1-gold.patch
deleted file mode 100644
index 4068f1d66f0b..000000000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-2.0_beta1-gold.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- sqlitebrowser/sqlitebrowser.pro
-+++ sqlitebrowser/sqlitebrowser.pro
-@@ -74,6 +74,7 @@
-     UI_DIR = .ui
-     MOC_DIR = .moc
-     OBJECTS_DIR = .obj
-+    LIBS += -ldl
- }
- win32:RC_FILE = winapp.rc
- mac { 
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-2.0_beta1-qt-4.7.0.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-2.0_beta1-qt-4.7.0.patch
deleted file mode 100644
index b17a1fe2b839..000000000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-2.0_beta1-qt-4.7.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-As suggested by Andreas Gölzer at http://sourceforge.net/tracker/index.php?func=detail&aid=3096050&group_id=87946&atid=584909
-
---- trunk/sqlitebrowser/sqlitebrowser/sqlitedb.h
-+++ trunk/sqlitebrowser/sqlitebrowser/sqlitedb.h
-@@ -41,7 +41,7 @@
- class DBBrowserField
-     {    
-     public:
--        DBBrowserField() : name( 0 ) { }
-+        DBBrowserField() : name( "0" ) { }
-         DBBrowserField( const QString& wname,const QString& wtype )
-             : name( wname), type( wtype )
-         { }
-@@ -55,7 +55,7 @@
- class DBBrowserIndex
-     {    
-     public:
--        DBBrowserIndex() : name( 0 ) { }
-+        DBBrowserIndex() : name( "0" ) { }
-        DBBrowserIndex( const QString& wname,const QString& wsql )
-             : name( wname), sql( wsql )
-         { }
-@@ -70,7 +70,7 @@
- class DBBrowserTable
-     {    
-     public:
--        DBBrowserTable() : name( 0 ) { }
-+        DBBrowserTable() : name( "0" ) { }
-         DBBrowserTable( const QString& wname,const QString& wsql )
-             : name( wname), sql( wsql )
-         { }
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-2.0_beta1-r2.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-2.0_beta1-r2.ebuild
deleted file mode 100644
index edab38b867f3..000000000000
--- a/dev-db/sqlitebrowser/sqlitebrowser-2.0_beta1-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-2.0_beta1-r2.ebuild,v 1.4 2013/03/02 20:43:31 hwoarang Exp $
-
-EAPI=4
-inherit eutils qt4-r2
-
-DESCRIPTION="SQLite Database Browser"
-HOMEPAGE="http://sqlitebrowser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_200_b1_src.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-qt/qtcore-4.6:4[qt3support]
-	>=dev-qt/qtgui-4.6:4[qt3support]
-	>=dev-qt/qt3support-4.6:4"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/trunk/${PN}
-
-PATCHES=( "${FILESDIR}"/${P}-qt-4.7.0.patch
-	"${FILESDIR}"/${P}-gold.patch )
-
-src_install() {
-	dobin ${PN}/${PN}
-	newicon ${PN}/images/128.png ${PN}.png
-	make_desktop_entry ${PN} "SQLite Database Browser"
-}
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild
new file mode 100644
index 000000000000..099dfabc4ef6
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild,v 1.1 2015/02/21 14:03:56 jlec Exp $
+
+EAPI=5
+
+inherit qt4-r2 eutils cmake-utils
+
+DESCRIPTION="SQLite Database Browser"
+HOMEPAGE="http://sqlitebrowser.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+DEPEND="
+	dev-db/sqlite:3
+	dev-java/antlr:0[cxx]
+	dev-libs/qcustomplot[qt4?,qt5?]
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		)
+	qt5? (
+		dev-qt/linguist:5
+		dev-qt/linguist-tools:5
+		dev-qt/qtnetwork:5
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+		)"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.3.1-unbundle.patch )
+
+src_prepare() {
+	# https://github.com/qingfengxia/qhexedit still bundled
+	find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# Wait for unmask
+	local mycmakeargs=(
+		$(cmake-utils_use_use qt5)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	ls -l sqlb-unittests
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon images/sqlitebrowser.svg
+	domenu distri/sqlitebrowser.desktop
+}