dev-db/sqlitebrowser: Version BUmp, #516662

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 104 insertions, 7 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/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
+}