dev-db/sqlitebrowser: Version BUmp, #516662

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

5 files changed, 126 insertions, 26 deletions

diff --git a/dev-db/sqlitebrowser/ChangeLog b/dev-db/sqlitebrowser/ChangeLog
index e14a91859b59..85bf5ee2c3d1 100644
--- a/dev-db/sqlitebrowser/ChangeLog
+++ b/dev-db/sqlitebrowser/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/sqlitebrowser
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/ChangeLog,v 1.16 2013/03/02 20:43:31 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/ChangeLog,v 1.17 2014/09/28 14:57:30 jlec Exp $
+
+*sqlitebrowser-3.3.1 (28 Sep 2014)
+
+  28 Sep 2014; Justin Lecher <jlec@gentoo.org> +sqlitebrowser-3.3.1.ebuild,
+  +files/sqlitebrowser-3.3.1-unbundle.patch, metadata.xml:
+  Version BUmp, #516662
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org>
   sqlitebrowser-2.0_beta1-r2.ebuild:
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index c84ab6d7a7c2..38a372166695 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,28 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
-MISC ChangeLog 2904 SHA256 472f233e513392d7c89ae004e46a171923290ded07e743bde46ee1496330c272 SHA512 4ea0da8261605daacff1a776bfaed2a627180750968cb6966dfac00296bc49d11fdbaf7f03247258699913694ebf1a685fbdac653af680eba2a4eb567517d982 WHIRLPOOL 2458cf6636944c8791697c3b9a77dfc1eba8b227d75d12104d6a6125cdd36a6820123ffdfc8672e7cb41bdcad460e7dbee7f1261aea2d39d5d560a934d926b94
-MISC metadata.xml 620 SHA256 389bf8f67d83f2e67f8b590aee7013c7987ab992ba3f9585597e4872a059f328 SHA512 c4381c532797a685bd6f4bd00909fdb0dea9f5ec440c5c8fe440a02f6554c666f41e499a3b87bf9af23cc875f3aa86e3e6688bb9e75f812c55af76bf73307212 WHIRLPOOL 85ef531d1e8d25d790231e745d0a3d3ed6ac0ea69f540c22d5b396275fd77999293169fac309b44c8f3e621df7d0175cf9953c7a5d8ac17297812eb88a1c7123
+EBUILD sqlitebrowser-3.3.1.ebuild 1023 SHA256 904f0414e8e3606c4c895fed520a93e9dc7af37b167dd8226cbc647df650e68c SHA512 b6d9d1176f6230a77d33c5d72c327da34a545339447e397949e47e0b916dcc229d8c2404256de46acb8964412c9950b980d9701668d1e2fd79dff277b4dde1ea WHIRLPOOL 9792bd6958812df6618205a41180e5fb8766d1fe71b03091dde35a3af5d5a268b112019d97ba3e801072bcad8cedbda8d931b473cbe80e38ae80b8e70f834869
+MISC ChangeLog 3096 SHA256 01cbdd39aa95a4dfaf2944dc5a751dfc57fc4aa33868a2137f1aa449f43e1dcd SHA512 3b343df8d6e118a416906ae6aef3c0e4d28294afd65f580cd5cc589b4fa6ef402ef52dd42dfbdd13e7509c4c1f6373f44cab121f612fc713e891f6ad5266c95c WHIRLPOOL 6961ef73b1980d162f294e093acf8ad8be7da36733564d33d93a891d5d1668ad5610fdf71544a21e19820fac0511538dad9ef5ac5fddf64d39bad88e213d4fbf
+MISC metadata.xml 630 SHA256 3e72d77ccd73849eb1199ef695e13bf39557e9577e03758ef285d15ad50aa354 SHA512 0b58cee1916972db03c0acabc76974f59b0d0113efaf835edd68a1250aaa228479915fe7e696e622e3efd269828d0a5630285d417701dce50b46691a63d79a44 WHIRLPOOL e40465371d099279cced523b851aa5181bdc759493d510ab760cc1fa066fc456f113829a1abc485f3e62b77bcb5911b017140c78cbb9ac75d12a91e255e2988b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJRMmRyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88X3kP/Azlfkkeel44KocFcR+eAC9V
-jP+1wSn7412d03186n9X8s7S2LusXdi5rWW1Us35LuGUWwk1wOVug5au7RIDzjEa
-Gpk79UUkNQOPvoxHZKvkEOPsspfFnNVtfPHSDsJfibHLOFO81gO4D1kibE79Ikb0
-SFTtaCJn6ZKrLtbIR1mdwopSjy5MQ4kl1myNNa+Ttn0FXrYZkv9JkCDmWehgyPnI
-qqV6DFHtXcSiXrkghvusXDDLlQVP7qDnDTXskoOUAjjqeGZqKiWvLEJb92Y29JOA
-0700UQFecMOxpybyjOYm0dqkICXPUZpJar7yH0ysCPlhgrpHuMqsstwRZeBn6XDQ
-O4N32JtumdZdA+2n/ONQtKWT43sfe5Wtg2Ux2LYSPCO/B3nGXwkC4mTo8mjurlbI
-AyA2PhPSqI11/o0tbnsAyU+78KgxMbIbof+RlvtFfBooQF6g45Rl7RJi/FbobZ0R
-52zotRQKVBSbVVbAgQD1eNwkXqipV728DH/I4WtUyNzvnznyTdumSOCzxCMvH7Ew
-+c75/7e454ccUWXCqAxgDr04FTj2VDehlaw1Kx0T1KNMlX1NhvGC3TRr2h8LX9O1
-s0J5dcOc4xTrl0KBmXu+VLjjlLXrllZDoSEcrWQ7opHXFiDdC2VIJ51TQnzivVIC
-xlsVyIRxQ2VxnQGhBF4i
-=zaR5
+iQJ8BAEBCgBmBQJUKCH0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirRasP/2kGwi/j5BWhyLXUk99yzOtE
+EXT3TPtierscwkgqRje7cQ0RuOtec5jYN0iXv69b9B499D4u2EcG8wX2JvCKB/gl
+WCla2HpZL8fUOYjsyamK+NdH3ROgl7Z2rx0eVkaR1pbWDj1kLuomBuCGeypv0zK6
++VIdq1K+a7FoqtTqyMkjPpttvouyk4kF0JaDUI4KLJo0D7vljqK0sGbmH8QXf0vB
+YhQ3lLCVocVUHS8uZA5GTnhpZe+h0qft3WEsHA1M6C99jJkQ6JQYh0bBb6Vq27GO
+dFJhevw2dYAOPJcM7W4TybB00Qvlf0QpcyBg556PIuTDzatAxUSWkXBoI/U4j/oh
+y20wUdUvuAwFmx+vXdrIniHSi/rBMJ4UKL8V6YD4J/V0Ux2f/ZraFimDsEvjdoSw
+KszaKGzJJPmqkFD6aiebKnsdbp4uP0B85TaiLa7sWOmAgE9t0jNTHBN5y3IRErbD
+yppX8gYT2Jfdznu4Zc+GOYeBaPXJTeYPNqT6qOxQhg8ht1RpDqAxTWHxw/YaKWMN
+CAHL0wuhMeMIu5n6BRRZ+b+LsMOdzI39kJM0vPtq+zEl17xRfyD6zSG8wreo9hMx
+QSH6prvp+9fws8Nsmjp6UhXrUgCkn2OCMxJh+aRsRtdt+reqHJQQNyot5dyDgMMC
+0XrB2m/LkTT5Io7DvISt
+=eR+5
 -----END PGP SIGNATURE-----
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch
new file mode 100644
index 000000000000..263afaf2dea9
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch
@@ -0,0 +1,46 @@
+ CMakeLists.txt | 12 ++----------
+ 1 file changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 68f049e..474e613 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,13 +7,9 @@ if(NOT CMAKE_BUILD_TYPE)
+     set(CMAKE_BUILD_TYPE "Release")
+ endif()
+ 
+-set(ANTLR_DIR libs/antlr-2.7.7)
+ set(QHEXEDIT_DIR libs/qhexedit)
+-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
+ 
+-add_subdirectory(${ANTLR_DIR})
+ add_subdirectory(${QHEXEDIT_DIR})
+-add_subdirectory(${QCUSTOMPLOT_DIR})
+ 
+ if(USE_QT5)
+ 	find_package(Qt5Widgets REQUIRED)
+@@ -165,9 +161,7 @@ endif(APPLE)
+ 
+ include_directories(
+ 		"${CMAKE_CURRENT_BINARY_DIR}"
+-		${ANTLR_DIR}
+ 		${QHEXEDIT_DIR}
+-		${QCUSTOMPLOT_DIR}
+ 		${ADDITIONAL_INCLUDE_PATHS}
+ 		src)
+ 
+@@ -183,12 +177,10 @@ if(USE_QT5)
+     qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
+     set(QT_LIBRARIES "")
+ endif()
+-add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot)
++add_dependencies(${PROJECT_NAME} qhexedit)
+ 
+ link_directories(
+-		"${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
+-		"${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
+-		"${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}")
++		"${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}")
+ 
+ target_link_libraries(${PROJECT_NAME}
+ 		antlr
diff --git a/dev-db/sqlitebrowser/metadata.xml b/dev-db/sqlitebrowser/metadata.xml
index fc751b93e03f..a66306125a14 100644
--- a/dev-db/sqlitebrowser/metadata.xml
+++ b/dev-db/sqlitebrowser/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>xmw@gentoo.org</email>
-  <name>Michael Weber</name>
-</maintainer>
-<longdescription lang="en">
+  <maintainer>
+    <email>xmw@gentoo.org</email>
+    <name>Michael Weber</name>
+  </maintainer>
+  <longdescription lang="en">
 SQLite Database Browser is a freeware, public domain, open source visual tool
 used to create, design and edit database files compatible with SQLite. It is
 meant to be used for users and developers that want to create databases, edit
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.3.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.3.1.ebuild
new file mode 100644
index 000000000000..0c3efd7f473e
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-3.3.1.ebuild,v 1.1 2014/09/28 14:57:30 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=""
+
+DEPEND="
+	dev-java/antlr:0[cxx]
+	dev-qt/qtcore:4
+	dev-qt/qcustomplot
+	dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-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=(
+		-DUSE_QT5=OFF
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon images/sqlitebrowser.svg
+	domenu distri/sqlitebrowser.desktop
+}