subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: dev\-db\/sqlitebrowser\/"

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2024-04-16 Thread Jimi Huotari

commit: 1d287f92f75cd4048d4b16575ba331b5fccbd73a
Author: José P. R. N. Assis  gmail  com>
AuthorDate: Thu Feb  1 12:09:23 2024 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Tue Apr 16 16:29:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d287f92

dev-db/sqlitebrowser: fix qscintilla dep #916232

Adding [qt5(+)] to the qscintilla dependency in preparation to
supporting Qt5/Qt6 QScintilla multibuild. Revision 3.12.2-r1 bumped to
r2. No other changes for plain 3.12.2 and -.

Bug: https://bugs.gentoo.org/916232
Signed-off-by: José P. R. N. Assis  gmail.com>
Signed-off-by: Jimi Huotari  gentoo.org>

 .../{sqlitebrowser-3.12.2-r1.ebuild => sqlitebrowser-3.12.2-r2.ebuild}  | 2 +-
 dev-db/sqlitebrowser/sqlitebrowser-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild
similarity index 97%
rename from dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r1.ebuild
rename to dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild
index 4b96bc2b8fbb..47ce7cb6cacc 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild
@@ -32,7 +32,7 @@ DEPEND="
>=dev-qt/qtprintsupport-5.5:5
>=dev-qt/qtwidgets-5.5:5
>=dev-qt/qtxml-5.5:5
-   >=x11-libs/qscintilla-2.8.10:=
+   >=x11-libs/qscintilla-2.8.10:=[qt5(+)]
sqlcipher? ( dev-db/sqlcipher )
 "
 

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-.ebuild
index 4b96bc2b8fbb..47ce7cb6cacc 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-.ebuild
@@ -32,7 +32,7 @@ DEPEND="
>=dev-qt/qtprintsupport-5.5:5
>=dev-qt/qtwidgets-5.5:5
>=dev-qt/qtxml-5.5:5
-   >=x11-libs/qscintilla-2.8.10:=
+   >=x11-libs/qscintilla-2.8.10:=[qt5(+)]
sqlcipher? ( dev-db/sqlcipher )
 "

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2024-03-07 Thread Andreas Sturmlechner

commit: 7f870cf7296deccc2d5a4a2b6ea3279825e516aa
Author: Mattéo Rossillol‑‑Laruelle  protonmail  com>
AuthorDate: Sat Mar  2 18:55:17 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar  7 10:54:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f870cf7

dev-db/sqlitebrowser: drop old 3.12.2

Signed-off-by: Mattéo Rossillol‑‑Laruelle  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35603
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild | 67 
 dev-db/sqlitebrowser/sqlitebrowser-.ebuild   |  4 +-
 2 files changed, 2 insertions(+), 69 deletions(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
deleted file mode 100644
index 6f50a5bd986f..
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="A light GUI editor for SQLite databases"
-HOMEPAGE="https://sqlitebrowser.org/;
-
-if [[ "${PV}" = ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
-else
-   SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3+ MPL-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   app-editors/qhexedit2
-   dev-db/sqlite:3
-   dev-libs/qcustomplot
-   >=dev-qt/qtconcurrent-5.5:5
-   >=dev-qt/qtcore-5.5:5
-   >=dev-qt/qtgui-5.5:5
-   >=dev-qt/qtnetwork-5.5:5[ssl]
-   >=dev-qt/qtprintsupport-5.5:5
-   >=dev-qt/qtwidgets-5.5:5
-   >=dev-qt/qtxml-5.5:5
-   >=x11-libs/qscintilla-2.8.10:=
-"
-
-BDEPEND="
-   >=dev-qt/linguist-tools-5.5:5
-   test? ( >=dev-qt/qttest-5.5:5 )
-"
-
-RDEPEND="
-   ${DEPEND}
-   >=dev-qt/qtsvg-5.5:5
-"
-
-src_prepare() {
-   cmake_src_prepare
-
-   if ! use test; then
-   sed -i CMakeLists.txt \
-   -e "/find_package/ s/ Test//" \
-   -e "/set/ s/ Qt5::Test//" \
-   || die "Cannot remove Qt Test from CMake dependencies"
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_TESTING=$(usex test)
-   -DFORCE_INTERNAL_QCUSTOMPLOT=OFF
-   -DFORCE_INTERNAL_QHEXEDIT=OFF
-   )
-
-   cmake_src_configure
-}

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-.ebuild
index cea98af250c9..4b96bc2b8fbb 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ "${PV}" = ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
 else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3+ MPL-2.0"

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2024-03-02 Thread Arthur Zamarin

commit: 1b0adb0a8dd874e36a2ccb849b29e6b017c8ed87
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  2 18:23:45 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  2 18:23:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b0adb0a

dev-db/sqlitebrowser: Stabilize 3.12.2-r1 amd64, #926038

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r1.ebuild
index 6dd4fce77d35..4b96bc2b8fbb 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" = ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
 else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3+ MPL-2.0"

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2024-03-02 Thread Arthur Zamarin

commit: 53339ef6206b4c633aeb84c93b7f1a65ca659686
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  2 18:23:44 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  2 18:23:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53339ef6

dev-db/sqlitebrowser: Stabilize 3.12.2-r1 x86, #926038

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r1.ebuild
index cea98af250c9..6dd4fce77d35 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ "${PV}" = ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
 else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="GPL-3+ MPL-2.0"

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2024-01-20 Thread Sam James

commit: f0c715b72c40a0cce096ebcb98315de5cba1b59a
Author: Mattéo Rossillol‑‑Laruelle  protonmail  com>
AuthorDate: Fri Dec 22 13:02:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 20 12:22:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0c715b7

dev-db/sqlitebrowser: revbump

Closes: https://bugs.gentoo.org/855254
Closes: https://bugs.gentoo.org/913047
Signed-off-by: Mattéo Rossillol‑‑Laruelle  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34420
Signed-off-by: Sam James  gentoo.org>

 dev-db/sqlitebrowser/metadata.xml  |  6 ++
 ...ebrowser-.ebuild => sqlitebrowser-3.12.2-r1.ebuild} | 14 ++
 dev-db/sqlitebrowser/sqlitebrowser-.ebuild | 14 ++
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/dev-db/sqlitebrowser/metadata.xml 
b/dev-db/sqlitebrowser/metadata.xml
index ed00998feb6b..1347829179ac 100644
--- a/dev-db/sqlitebrowser/metadata.xml
+++ b/dev-db/sqlitebrowser/metadata.xml
@@ -26,6 +26,12 @@
d'un tableur, et, de ce fait, ne pas être contraint à apprendre 
des
commandes SQL complexes.

+   
+   Allow to open and to edit databases 
encrypted using dev-db/sqlcipher
+   
+   
+   Permettre d'ouvrir et d'éditer des bases 
de données chiffrées en utilisant dev-db/sqlcipher
+   


https://github.com/sqlitebrowser/sqlitebrowser/issues/
sqlitebrowser/sqlitebrowser

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r1.ebuild
similarity index 83%
copy from dev-db/sqlitebrowser/sqlitebrowser-.ebuild
copy to dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r1.ebuild
index d094723adf0a..cea98af250c9 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="A light GUI editor for SQLite databases"
 HOMEPAGE="https://sqlitebrowser.org/;
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3+ MPL-2.0"
 SLOT="0"
-IUSE="test"
+IUSE="sqlcipher test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -33,6 +33,7 @@ DEPEND="
>=dev-qt/qtwidgets-5.5:5
>=dev-qt/qtxml-5.5:5
>=x11-libs/qscintilla-2.8.10:=
+   sqlcipher? ( dev-db/sqlcipher )
 "
 
 BDEPEND="
@@ -61,7 +62,12 @@ src_configure() {
-DENABLE_TESTING=$(usex test)
-DFORCE_INTERNAL_QCUSTOMPLOT=OFF
-DFORCE_INTERNAL_QHEXEDIT=OFF
+   -Dsqlcipher=$(usex sqlcipher)
)
 
+   # https://bugs.gentoo.org/855254
+   append-flags -fno-strict-aliasing
+   filter-lto
+
cmake_src_configure
 }

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-.ebuild
index d094723adf0a..cea98af250c9 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="A light GUI editor for SQLite databases"
 HOMEPAGE="https://sqlitebrowser.org/;
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3+ MPL-2.0"
 SLOT="0"
-IUSE="test"
+IUSE="sqlcipher test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -33,6 +33,7 @@ DEPEND="
>=dev-qt/qtwidgets-5.5:5
>=dev-qt/qtxml-5.5:5
>=x11-libs/qscintilla-2.8.10:=
+   sqlcipher? ( dev-db/sqlcipher )
 "
 
 BDEPEND="
@@ -61,7 +62,12 @@ src_configure() {
-DENABLE_TESTING=$(usex test)
-DFORCE_INTERNAL_QCUSTOMPLOT=OFF
-DFORCE_INTERNAL_QHEXEDIT=OFF
+   -Dsqlcipher=$(usex sqlcipher)
)
 
+   # https://bugs.gentoo.org/855254
+   append-flags -fno-strict-aliasing
+   filter-lto
+
cmake_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2022-12-20 Thread Andreas Sturmlechner

commit: f82cacba1c9385dad938dd5c6eadbf9ca86a4636
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 20 21:05:32 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 20 21:07:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f82cacba

dev-db/sqlitebrowser: drop 3.12.1

Overshadowed by stable 3.12.2.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/sqlitebrowser/Manifest|  1 -
 dev-db/sqlitebrowser/sqlitebrowser-3.12.1.ebuild | 67 
 2 files changed, 68 deletions(-)

diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index fd76afe3c0cc..85c8a211b702 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,2 +1 @@
-DIST sqlitebrowser-3.12.1.tar.gz 3990525 BLAKE2B 
9cccd48c83e1953091508f5760b3004c4690791cacc5784286e6ce5220a6e55e761d736d8fbbb135e419beba12def89f63a3d37d6c7e0281f50392f07bf25357
 SHA512 
f0a62958008693606d9ab04b0413fa10705c7b45fb970c218d8f1adfe8ca01895a6470f369ded6cb7a9338c27385838b8d57c89b5855b4050ce9bec0d69626d1
 DIST sqlitebrowser-3.12.2.tar.gz 3990817 BLAKE2B 
a0c1495814a814638428fa50e55d5afeb2d3f5c80c9aafbdea3cc444e8c681c48acd1f24126945a89d7284c3f0a23979f2b3541fae7c7a70803f7e7ad69be6f4
 SHA512 
a6afc0a4286f07adb7038f3a010c93e14204b477bde27b1599c9bfe3390422d3edfaa2a9381b1f13e63a7aaf90e931ee85358eb8b2c15b6ea55818d29c59395f

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.12.1.ebuild
deleted file mode 100644
index d094723adf0a..
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.12.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="A light GUI editor for SQLite databases"
-HOMEPAGE="https://sqlitebrowser.org/;
-
-if [[ "${PV}" = ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
-else
-   SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+ MPL-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   app-editors/qhexedit2
-   dev-db/sqlite:3
-   dev-libs/qcustomplot
-   >=dev-qt/qtconcurrent-5.5:5
-   >=dev-qt/qtcore-5.5:5
-   >=dev-qt/qtgui-5.5:5
-   >=dev-qt/qtnetwork-5.5:5[ssl]
-   >=dev-qt/qtprintsupport-5.5:5
-   >=dev-qt/qtwidgets-5.5:5
-   >=dev-qt/qtxml-5.5:5
-   >=x11-libs/qscintilla-2.8.10:=
-"
-
-BDEPEND="
-   >=dev-qt/linguist-tools-5.5:5
-   test? ( >=dev-qt/qttest-5.5:5 )
-"
-
-RDEPEND="
-   ${DEPEND}
-   >=dev-qt/qtsvg-5.5:5
-"
-
-src_prepare() {
-   cmake_src_prepare
-
-   if ! use test; then
-   sed -i CMakeLists.txt \
-   -e "/find_package/ s/ Test//" \
-   -e "/set/ s/ Qt5::Test//" \
-   || die "Cannot remove Qt Test from CMake dependencies"
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_TESTING=$(usex test)
-   -DFORCE_INTERNAL_QCUSTOMPLOT=OFF
-   -DFORCE_INTERNAL_QHEXEDIT=OFF
-   )
-
-   cmake_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2021-07-15 Thread Sam James

commit: e82b7433a9e3f743060222694d1c7b41695d3fa1
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 15 21:35:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 15 21:38:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e82b7433

dev-db/sqlitebrowser: Stabilize 3.12.2 amd64, #799638

Signed-off-by: Sam James  gentoo.org>

 dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
index 2b8f7fd9d4d..6f50a5bd986 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" = ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
 else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3+ MPL-2.0"

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2021-07-15 Thread Sam James

commit: 9e1545895be81641567580abc28d0abcee109c0c
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 15 21:32:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 15 21:32:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e154589

dev-db/sqlitebrowser: Stabilize 3.12.2 x86, #799638

Signed-off-by: Sam James  gentoo.org>

 dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
index d094723adf0..2b8f7fd9d4d 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" = ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
 else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="GPL-3+ MPL-2.0"

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/files/, dev-db/sqlitebrowser/

2021-06-17 Thread Joonas Niilola

commit: 0de2acd7622eadf7cbe67c80844c605a068bcdfb
Author: Mattéo Rossillol‑‑Laruelle  protonmail  com>
AuthorDate: Sun May 30 17:11:13 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jun 17 06:49:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de2acd7

dev-db/sqlitebrowser: remove old

Signed-off-by: Mattéo Rossillol‑‑Laruelle  protonmail.com>
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-db/sqlitebrowser/Manifest  |  1 -
 .../files/sqlitebrowser-3.11.1-unbundle.patch  | 85 --
 .../sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild   | 67 -
 3 files changed, 153 deletions(-)

diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index a73bd0f9983..2e80a33ddc7 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,2 +1 @@
-DIST sqlitebrowser-3.11.1.tar.gz 2523481 BLAKE2B 
c9a92b93795050605aa938cf5c73493b7d887b386da77b4cee206becd70779f00ab39c7a105772cdbe925ebedcfe0277b6ebe7898383db87454e19b050001253
 SHA512 
31f5315fd66d14fde16b58fe6522da937068c42e21f60aa15c3c04a1318ecac09f68143df108b83204cdc70ec8bac617a8ae196df9b5524690f837d7e7728916
 DIST sqlitebrowser-3.12.1.tar.gz 3990525 BLAKE2B 
9cccd48c83e1953091508f5760b3004c4690791cacc5784286e6ce5220a6e55e761d736d8fbbb135e419beba12def89f63a3d37d6c7e0281f50392f07bf25357
 SHA512 
f0a62958008693606d9ab04b0413fa10705c7b45fb970c218d8f1adfe8ca01895a6470f369ded6cb7a9338c27385838b8d57c89b5855b4050ce9bec0d69626d1

diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch 
b/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch
deleted file mode 100644
index f8668332328..000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -Naur sqlitebrowser-3.11.1-orig/cmake/FindQScintilla.cmake 
sqlitebrowser-3.11.1/cmake/FindQScintilla.cmake
 sqlitebrowser-3.11.1-orig/cmake/FindQScintilla.cmake   2019-03-20 
11:12:47.452357850 -0400
-+++ sqlitebrowser-3.11.1/cmake/FindQScintilla.cmake2019-03-20 
11:17:49.611365342 -0400
-@@ -42,10 +42,12 @@
- # either expressed or implied, of the FreeBSD Project.
- #=
- 
-+SET (QT_MIN_VERSION "5.6.2")
-+FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Network 
Widgets )
- 
- find_path ( QSCINTILLA_INCLUDE_DIR
-   NAMES qsciscintilla.h
--  HINTS ${QT_INCLUDE_DIR}
-+  HINTS ${Qt5Core_INCLUDE_DIRS}
-   PATH_SUFFIXES Qsci
- )
- 
-@@ -80,8 +82,8 @@
- 
- 
- find_library ( QSCINTILLA_LIBRARY
--  NAMES qscintilla qscintilla2 libqscintilla2
--  HINTS ${QT_LIBRARY_DIR}
-+  NAMES qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5
-+  HINTS ${Qt5Core_LIBRARIES}
- )
- 
- set ( QSCINTILLA_LIBRARIES ${QSCINTILLA_LIBRARY} )
-diff -Naur sqlitebrowser-3.11.1-orig/CMakeLists.txt 
sqlitebrowser-3.11.1/CMakeLists.txt
 sqlitebrowser-3.11.1-orig/CMakeLists.txt   2019-03-20 11:12:47.452357850 
-0400
-+++ sqlitebrowser-3.11.1/CMakeLists.txt2019-03-20 11:19:07.740367280 
-0400
-@@ -61,26 +61,12 @@
- endif()
- 
- if(NOT FORCE_INTERNAL_ANTLR)
--find_package(Antlr2 QUIET)
-+  find_package(Antlr2 REQUIRED)
- endif()
- if(NOT FORCE_INTERNAL_QSCINTILLA)
--find_package(QScintilla QUIET)
-+  find_package(QScintilla REQUIRED)
- endif()
- 
--set(QHEXEDIT_DIR libs/qhexedit)
--set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
--
--if(NOT ANTLR2_FOUND)
--set(ANTLR_DIR libs/antlr-2.7.7)
--add_subdirectory(${ANTLR_DIR})
--endif()
--if(NOT QSCINTILLA_FOUND)
--set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
--add_subdirectory(${QSCINTILLA_DIR})
--endif()
--add_subdirectory(${QHEXEDIT_DIR})
--add_subdirectory(${QCUSTOMPLOT_DIR})
--
- find_package(Qt5 REQUIRED COMPONENTS Concurrent Gui LinguistTools Network 
PrintSupport Test Widgets Xml)
- 
- set(CMAKE_AUTOMOC ON)
-diff -Naur sqlitebrowser-3.11.1-orig/src/src.pro 
sqlitebrowser-3.11.1/src/src.pro
 sqlitebrowser-3.11.1-orig/src/src.pro  2019-03-20 11:12:47.459357850 
-0400
-+++ sqlitebrowser-3.11.1/src/src.pro   2019-03-20 11:22:02.891371623 -0400
-@@ -178,10 +178,6 @@
- }
- }
- 
--LIBPATH_QHEXEDIT=$$OUT_PWD/../libs/qhexedit
--LIBPATH_ANTLR=$$OUT_PWD/../libs/antlr-2.7.7
--LIBPATH_QCUSTOMPLOT=$$OUT_PWD/../libs/qcustomplot-source
--LIBPATH_QSCINTILLA=$$OUT_PWD/../libs/qscintilla/Qt4Qt5
- unix {
- LIBS += -ldl
- }
-@@ -222,9 +218,7 @@
- }
- 
- UI_DIR = .ui
--INCLUDEPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit 
$$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5 $$PWD/..
--LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT 
-L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2
--DEPENDPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit 
$$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5
-+LIBS += -L$$LIBPATH_QHEXEDIT

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2021-06-17 Thread Joonas Niilola

commit: 165c0bdf5c071150b2f2d613b20c9e4671749561
Author: Mattéo Rossillol‑‑Laruelle  protonmail  com>
AuthorDate: Sun May 30 17:12:24 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jun 17 06:49:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=165c0bdf

dev-db/sqlitebrowser: version bump to 3.12.2

Signed-off-by: Mattéo Rossillol‑‑Laruelle  protonmail.com>
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Closes: https://github.com/gentoo/gentoo/pull/20852
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-db/sqlitebrowser/Manifest|  1 +
 dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild | 67 
 2 files changed, 68 insertions(+)

diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 2e80a33ddc7..fd76afe3c0c 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1 +1,2 @@
 DIST sqlitebrowser-3.12.1.tar.gz 3990525 BLAKE2B 
9cccd48c83e1953091508f5760b3004c4690791cacc5784286e6ce5220a6e55e761d736d8fbbb135e419beba12def89f63a3d37d6c7e0281f50392f07bf25357
 SHA512 
f0a62958008693606d9ab04b0413fa10705c7b45fb970c218d8f1adfe8ca01895a6470f369ded6cb7a9338c27385838b8d57c89b5855b4050ce9bec0d69626d1
+DIST sqlitebrowser-3.12.2.tar.gz 3990817 BLAKE2B 
a0c1495814a814638428fa50e55d5afeb2d3f5c80c9aafbdea3cc444e8c681c48acd1f24126945a89d7284c3f0a23979f2b3541fae7c7a70803f7e7ad69be6f4
 SHA512 
a6afc0a4286f07adb7038f3a010c93e14204b477bde27b1599c9bfe3390422d3edfaa2a9381b1f13e63a7aaf90e931ee85358eb8b2c15b6ea55818d29c59395f

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
new file mode 100644
index 000..d094723adf0
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="A light GUI editor for SQLite databases"
+HOMEPAGE="https://sqlitebrowser.org/;
+
+if [[ "${PV}" = ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
+else
+   SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+ MPL-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   app-editors/qhexedit2
+   dev-db/sqlite:3
+   dev-libs/qcustomplot
+   >=dev-qt/qtconcurrent-5.5:5
+   >=dev-qt/qtcore-5.5:5
+   >=dev-qt/qtgui-5.5:5
+   >=dev-qt/qtnetwork-5.5:5[ssl]
+   >=dev-qt/qtprintsupport-5.5:5
+   >=dev-qt/qtwidgets-5.5:5
+   >=dev-qt/qtxml-5.5:5
+   >=x11-libs/qscintilla-2.8.10:=
+"
+
+BDEPEND="
+   >=dev-qt/linguist-tools-5.5:5
+   test? ( >=dev-qt/qttest-5.5:5 )
+"
+
+RDEPEND="
+   ${DEPEND}
+   >=dev-qt/qtsvg-5.5:5
+"
+
+src_prepare() {
+   cmake_src_prepare
+
+   if ! use test; then
+   sed -i CMakeLists.txt \
+   -e "/find_package/ s/ Test//" \
+   -e "/set/ s/ Qt5::Test//" \
+   || die "Cannot remove Qt Test from CMake dependencies"
+   fi
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_TESTING=$(usex test)
+   -DFORCE_INTERNAL_QCUSTOMPLOT=OFF
+   -DFORCE_INTERNAL_QHEXEDIT=OFF
+   )
+
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2021-02-17 Thread Joonas Niilola

commit: dbac42f941825cc560fcf5c9b7d9366469686ef2
Author: Mattéo Rossillol‑‑Laruelle  protonmail  com>
AuthorDate: Wed Jan 27 18:43:55 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Feb 17 11:35:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbac42f9

dev-db/sqlitebrowser: version bump and adoption

- update the `metadata.xml` file
- update dependencies: remove `dev-cpp/antlr-cpp:2`
  (see 
https://github.com/sqlitebrowser/sqlitebrowser/commit/ce66c1da20d15e8211a14db13f63cd42c2ede770/),
  update minimum required version of `x11-libs/qscintilla`
- add the live version

Closes: https://bugs.gentoo.org/735716
Signed-off-by: Mattéo Rossillol‑‑Laruelle  protonmail.com>
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Closes: https://github.com/gentoo/gentoo/pull/19246
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-db/sqlitebrowser/Manifest|  1 +
 dev-db/sqlitebrowser/metadata.xml| 43 ++-
 dev-db/sqlitebrowser/sqlitebrowser-3.12.1.ebuild | 67 
 dev-db/sqlitebrowser/sqlitebrowser-.ebuild   | 67 
 4 files changed, 166 insertions(+), 12 deletions(-)

diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 66ba9ee7251..a73bd0f9983 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1 +1,2 @@
 DIST sqlitebrowser-3.11.1.tar.gz 2523481 BLAKE2B 
c9a92b93795050605aa938cf5c73493b7d887b386da77b4cee206becd70779f00ab39c7a105772cdbe925ebedcfe0277b6ebe7898383db87454e19b050001253
 SHA512 
31f5315fd66d14fde16b58fe6522da937068c42e21f60aa15c3c04a1318ecac09f68143df108b83204cdc70ec8bac617a8ae196df9b5524690f837d7e7728916
+DIST sqlitebrowser-3.12.1.tar.gz 3990525 BLAKE2B 
9cccd48c83e1953091508f5760b3004c4690791cacc5784286e6ce5220a6e55e761d736d8fbbb135e419beba12def89f63a3d37d6c7e0281f50392f07bf25357
 SHA512 
f0a62958008693606d9ab04b0413fa10705c7b45fb970c218d8f1adfe8ca01895a6470f369ded6cb7a9338c27385838b8d57c89b5855b4050ce9bec0d69626d1

diff --git a/dev-db/sqlitebrowser/metadata.xml 
b/dev-db/sqlitebrowser/metadata.xml
index 45409a91f1e..92f71ab6877 100644
--- a/dev-db/sqlitebrowser/metadata.xml
+++ b/dev-db/sqlitebrowser/metadata.xml
@@ -1,15 +1,34 @@
 
-http://www.gentoo.org/dtd/metadata.dtd;>
+https://www.gentoo.org/dtd/metadata.dtd;>
+
 
-  
-  
-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
-and search data using a familiar spreadsheet-like interface, without the need 
to
-learn complicated SQL commands.
-
-  
-sqlitebrowser/sqlitebrowser
-  
+   
+   beatus...@protonmail.com
+   Mattéo Rossillol‑‑Laruelle
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   DB Browser for SQLite (DB4S) 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 and search data using a familiar
+   spreadsheet-like interface, without the need to learn 
complicated SQL
+   commands.
+   
+   
+   DB Browser for SQLite (DB4S) est un outil graphique, gratuit et 
open
+   source permettant de créer, concevoir et éditer toute base de 
données
+   compatible avec SQLite. Celui-ci est à déstination des 
utilisateurs et
+   des développeurs qui veulent créer des base de données et 
interragir
+   avec ces dernières, tout en utilisant une interface semblable à 
celle
+   d'un tableur, et, de ce fait, ne pas être contraint à apprendre 
des
+   commandes SQL complexes.
+   
+   
+   
https://github.com/sqlitebrowser/sqlitebrowser/issues/
+   sqlitebrowser/sqlitebrowser
+   
 

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.12.1.ebuild
new file mode 100644
index 000..d094723adf0
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.12.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="A light GUI editor for SQLite databases"
+HOMEPAGE="https://sqlitebrowser.org/;
+
+if [[ "${PV}" = ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
+else
+   SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+ MPL-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   app-editors/qhexedit2
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2019-10-16 Thread Joonas Niilola

commit: e6e0ba127e18777ee4241e8ff3e5e1d5a977d639
Author: Rodrigo Saboya  gmail  com>
AuthorDate: Wed Oct 16 17:40:39 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Oct 17 04:51:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6e0ba12

dev-db/sqlitebrowser: Handling test dependency correctly

Changed in: https://github.com/sqlitebrowser/sqlitebrowser/pull/1419/files

Closes: https://bugs.gentoo.org/683666
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Rodrigo Saboya  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13064
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
index c763fd949dc..937429c32f8 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
@@ -48,7 +48,8 @@ src_prepare() {
sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
 
if ! use test; then
-   sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die
+   sed -e "/find_package/ s/ Test//" -i CMakeLists.txt || die
+   sed -e "/set/ s/ Qt5::Test//" -i CMakeLists.txt || die
fi
 }

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2019-03-25 Thread Rick Farina

commit: 4490e7c52c46f224a17e469ee0635da41d6a715a
Author: Rick Farina  gentoo  org>
AuthorDate: Mon Mar 25 17:40:53 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Mar 25 17:40:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4490e7c5

dev-db/sqlitebrowser: add missing dep

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Rick Farina  gentoo.org>

 .../{sqlitebrowser-3.11.1.ebuild => sqlitebrowser-3.11.1-r1.ebuild}  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
similarity index 98%
rename from dev-db/sqlitebrowser/sqlitebrowser-3.11.1.ebuild
rename to dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
index 5de9f44aac0..c763fd949dc 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="
dev-cpp/antlr-cpp:2
dev-db/sqlite:3
>=dev-libs/qcustomplot-2.0.0[qt5(+)]
+   dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5[ssl]

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/

2019-03-20 Thread Rick Farina

commit: 420bd534b01e9f70683da54c4c1e409d3ecc9621
Author: Rick Farina  gentoo  org>
AuthorDate: Wed Mar 20 15:30:37 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Wed Mar 20 15:30:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420bd534

dev-db/sqlitebrowser: bump and unbundle

previous patch did most of the unbundling, but left qhexedit2 bundled
which caused revdep-rebuild to want to rebuild all the time.

semi related to bug #678628

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Rick Farina  gentoo.org>

 dev-db/sqlitebrowser/Manifest  |  1 +
 .../files/sqlitebrowser-3.11.1-unbundle.patch  | 85 ++
 dev-db/sqlitebrowser/sqlitebrowser-3.11.1.ebuild   | 64 
 3 files changed, 150 insertions(+)

diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 861e19002a8..214850f0684 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1 +1,2 @@
 DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 
105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf
 SHA512 
da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4
+DIST sqlitebrowser-3.11.1.tar.gz 2523481 BLAKE2B 
c9a92b93795050605aa938cf5c73493b7d887b386da77b4cee206becd70779f00ab39c7a105772cdbe925ebedcfe0277b6ebe7898383db87454e19b050001253
 SHA512 
31f5315fd66d14fde16b58fe6522da937068c42e21f60aa15c3c04a1318ecac09f68143df108b83204cdc70ec8bac617a8ae196df9b5524690f837d7e7728916

diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch 
b/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch
new file mode 100644
index 000..f8668332328
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch
@@ -0,0 +1,85 @@
+diff -Naur sqlitebrowser-3.11.1-orig/cmake/FindQScintilla.cmake 
sqlitebrowser-3.11.1/cmake/FindQScintilla.cmake
+--- sqlitebrowser-3.11.1-orig/cmake/FindQScintilla.cmake   2019-03-20 
11:12:47.452357850 -0400
 sqlitebrowser-3.11.1/cmake/FindQScintilla.cmake2019-03-20 
11:17:49.611365342 -0400
+@@ -42,10 +42,12 @@
+ # either expressed or implied, of the FreeBSD Project.
+ #=
+ 
++SET (QT_MIN_VERSION "5.6.2")
++FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Network 
Widgets )
+ 
+ find_path ( QSCINTILLA_INCLUDE_DIR
+   NAMES qsciscintilla.h
+-  HINTS ${QT_INCLUDE_DIR}
++  HINTS ${Qt5Core_INCLUDE_DIRS}
+   PATH_SUFFIXES Qsci
+ )
+ 
+@@ -80,8 +82,8 @@
+ 
+ 
+ find_library ( QSCINTILLA_LIBRARY
+-  NAMES qscintilla qscintilla2 libqscintilla2
+-  HINTS ${QT_LIBRARY_DIR}
++  NAMES qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5
++  HINTS ${Qt5Core_LIBRARIES}
+ )
+ 
+ set ( QSCINTILLA_LIBRARIES ${QSCINTILLA_LIBRARY} )
+diff -Naur sqlitebrowser-3.11.1-orig/CMakeLists.txt 
sqlitebrowser-3.11.1/CMakeLists.txt
+--- sqlitebrowser-3.11.1-orig/CMakeLists.txt   2019-03-20 11:12:47.452357850 
-0400
 sqlitebrowser-3.11.1/CMakeLists.txt2019-03-20 11:19:07.740367280 
-0400
+@@ -61,26 +61,12 @@
+ endif()
+ 
+ if(NOT FORCE_INTERNAL_ANTLR)
+-find_package(Antlr2 QUIET)
++  find_package(Antlr2 REQUIRED)
+ endif()
+ if(NOT FORCE_INTERNAL_QSCINTILLA)
+-find_package(QScintilla QUIET)
++  find_package(QScintilla REQUIRED)
+ endif()
+ 
+-set(QHEXEDIT_DIR libs/qhexedit)
+-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
+-
+-if(NOT ANTLR2_FOUND)
+-set(ANTLR_DIR libs/antlr-2.7.7)
+-add_subdirectory(${ANTLR_DIR})
+-endif()
+-if(NOT QSCINTILLA_FOUND)
+-set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
+-add_subdirectory(${QSCINTILLA_DIR})
+-endif()
+-add_subdirectory(${QHEXEDIT_DIR})
+-add_subdirectory(${QCUSTOMPLOT_DIR})
+-
+ find_package(Qt5 REQUIRED COMPONENTS Concurrent Gui LinguistTools Network 
PrintSupport Test Widgets Xml)
+ 
+ set(CMAKE_AUTOMOC ON)
+diff -Naur sqlitebrowser-3.11.1-orig/src/src.pro 
sqlitebrowser-3.11.1/src/src.pro
+--- sqlitebrowser-3.11.1-orig/src/src.pro  2019-03-20 11:12:47.459357850 
-0400
 sqlitebrowser-3.11.1/src/src.pro   2019-03-20 11:22:02.891371623 -0400
+@@ -178,10 +178,6 @@
+ }
+ }
+ 
+-LIBPATH_QHEXEDIT=$$OUT_PWD/../libs/qhexedit
+-LIBPATH_ANTLR=$$OUT_PWD/../libs/antlr-2.7.7
+-LIBPATH_QCUSTOMPLOT=$$OUT_PWD/../libs/qcustomplot-source
+-LIBPATH_QSCINTILLA=$$OUT_PWD/../libs/qscintilla/Qt4Qt5
+ unix {
+ LIBS += -ldl
+ }
+@@ -222,9 +218,7 @@
+ }
+ 
+ UI_DIR = .ui
+-INCLUDEPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit 
$$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5 $$PWD/..
+-LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT 
-L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2
+-DEPENDPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2019-02-28 Thread Rick Farina

commit: c670f8ca3285e773a498a1ec68a521039a4e9fc3
Author: Rick Farina  gentoo  org>
AuthorDate: Thu Feb 28 17:36:47 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Thu Feb 28 17:36:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c670f8ca

dev-db/sqlitebrowser: add missing DEPEND

sqlitebrowser directly links to /usr/lib64/libqhexedit.so

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Rick Farina  gentoo.org>

 dev-db/sqlitebrowser/sqlitebrowser-3.10.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1-r1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1-r1.ebuild
index 009bf7b5d94..259f09b86cb 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1-r1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1-r1.ebuild
@@ -19,6 +19,7 @@ BDEPEND="
test? ( dev-qt/qttest:5 )
 "
 DEPEND="
+   app-editors/qhexedit2
dev-cpp/antlr-cpp:2
dev-db/sqlite:3
>=dev-libs/qcustomplot-2.0.0[qt5(+)]
@@ -29,7 +30,6 @@ DEPEND="
>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 "
 RDEPEND="${DEPEND}
-   app-editors/qhexedit2
dev-qt/qtsvg:5
 "

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2019-02-14 Thread Andreas Sturmlechner

commit: a8edb29d6d2db42e46a490989b39bda11511b5e8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 14 21:45:55 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 14 23:06:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8edb29d

dev-db/sqlitebrowser: Fix RDEPENDs, gnome2-utils -> xdg, EAPI-7 bump

Closes: https://bugs.gentoo.org/664496
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../sqlitebrowser/sqlitebrowser-3.10.1-r1.ebuild   | 59 ++
 1 file changed, 59 insertions(+)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1-r1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1-r1.ebuild
new file mode 100644
index 000..009bf7b5d94
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop xdg
+
+DESCRIPTION="SQLite Database Browser"
+HOMEPAGE="https://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="test"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+   test? ( dev-qt/qttest:5 )
+"
+DEPEND="
+   dev-cpp/antlr-cpp:2
+   dev-db/sqlite:3
+   >=dev-libs/qcustomplot-2.0.0[qt5(+)]
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtwidgets:5
+   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+"
+RDEPEND="${DEPEND}
+   app-editors/qhexedit2
+   dev-qt/qtsvg:5
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.10.1-unbundle.patch )
+
+src_prepare() {
+   cmake-utils_src_prepare
+   find libs/{antlr-2.7.7,qcustomplot-source,qscintilla} -delete || die
+
+   sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
+
+   if ! use test; then
+   sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die
+   fi
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_TESTING=$(usex test)
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   doicon images/sqlitebrowser.svg
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2019-02-14 Thread Andreas Sturmlechner

commit: 7105ba4afa3b272cb2029372cbd80d6332da4eab
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 14 21:46:12 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 14 23:06:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7105ba4a

dev-db/sqlitebrowser: Drop 3.10.1

Dropping stable keywords - package unmaintained, runtime was broken anyway.

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild | 68 
 1 file changed, 68 deletions(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
deleted file mode 100644
index fb9278c2822..000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils gnome2-utils xdg-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="test"
-
-RDEPEND="
-   dev-cpp/antlr-cpp:2
-   dev-db/sqlite:3
-   >=dev-libs/qcustomplot-2.0.0[qt5(+)]
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5
-   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-"
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-   test? ( dev-qt/qttest:5 )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.10.1-unbundle.patch
-)
-
-src_prepare() {
-   cmake-utils_src_prepare
-   # https://github.com/qingfengxia/qhexedit still bundled
-   find libs/{antlr-2.7.7,qcustomplot-source,qscintilla} -delete || die
-
-   sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
-
-   if ! use test; then
-   sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_TESTING=$(usex test)
-   )
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-   doicon images/sqlitebrowser.svg
-}
-
-pkg_postinst() {
-   gnome2_icon_cache_update
-   xdg_desktop_database_update
-}
-
-pkg_postrm() {
-   gnome2_icon_cache_update
-   xdg_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/

2019-01-27 Thread Pacho Ramos

commit: b65bd41c91329de75a67a15aee65044768280624
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Jan 27 10:37:36 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Jan 27 11:05:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b65bd41c

dev-db/sqlitebrowser: Drop old

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Pacho Ramos  gentoo.org>

 dev-db/sqlitebrowser/Manifest  |  1 -
 .../files/sqlitebrowser-3.7.0-unbundle.patch   | 18 --
 .../files/sqlitebrowser-3.9.1-cmake.patch  | 24 
 dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild | 71 --
 4 files changed, 114 deletions(-)

diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 9b89c8bd849..861e19002a8 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,2 +1 @@
 DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 
105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf
 SHA512 
da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4
-DIST sqlitebrowser-3.9.1.tar.gz 1704713 BLAKE2B 
447a9e20fe4236feea2684703ac7f38b1c03f0ded352653b41bbec7d6380691776177fee1428fd67ac96190ed6752cedd76a9883cfa12584fec464cbf98707d3
 SHA512 
c1e88063fac864f60a9802ae378e13d6f3a09e2f4e71e50c6abca4967a941c444a64617bad2dfc743cf9a6be554af9c73e4c61533300ed9a51652234ffdbd225

diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch 
b/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch
deleted file mode 100644
index 8dbe870f2e8..000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 sqlitebrowser-3.7.0/CMakeLists.txt
-+++ sqlitebrowser-3.7.0/CMakeLists.txt
-@@ -29,15 +29,9 @@
- find_package(Antlr2)
- 
- set(QHEXEDIT_DIR libs/qhexedit)
--set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
- set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
- 
--if(NOT ANTLR2_FOUND)
--set(ANTLR_DIR libs/antlr-2.7.7)
--add_subdirectory(${ANTLR_DIR})
--endif()
- add_subdirectory(${QHEXEDIT_DIR})
--add_subdirectory(${QCUSTOMPLOT_DIR})
- add_subdirectory(${QSCINTILLA_DIR})
- 
- if(USE_QT5)

diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch 
b/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch
deleted file mode 100644
index cf1cde6c919..000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2563d678681fa6972674b47617015cb2515bd414 Mon Sep 17 00:00:00 2001
-From: Martin Kleusberg 
-Date: Wed, 12 Oct 2016 23:26:56 +0200
-Subject: [PATCH] Fix cmake file
-

- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 998c2f4..4c5debd 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.7)
- 
- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" 
"${CMAKE_MODULE_PATH}")
- 
--OPTION(USE_QT5 FALSE "Build with qt5")
--OPTION(ENABLE_TESTING FALSE "Enable the unit tests")
-+OPTION(USE_QT5 "Build with qt5" OFF)
-+OPTION(ENABLE_TESTING "Enable the unit tests" OFF)
- 
- if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE "Release")

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
deleted file mode 100644
index 9e91c60df05..000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils
-
-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="test"
-
-RDEPEND="
-   dev-cpp/antlr-cpp:2
-   dev-db/sqlite:3
-   dev-libs/qcustomplot[qt5(+)]
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5
-   >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)]
-"
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-   test? ( dev-qt/qttest:5 )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.7.0-unbundle.patch
-   "${FILESDIR}"/${PN}-3.9.1-cmake.patch
-)
-
-src_prepare() {
-   cmake-utils_src_prepare
-   # https://github.com/qingfengxia/qhexedit still bundled
-   # x11-libs/qscintilla[qt4?,qt5?] still bundled
-   find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
-
-   sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
-
-   if ! use test; then
-   sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2018-04-11 Thread Thomas Deutschmann

commit: 6b1d82e8bad1686d84b65b28c532fbc28c849137
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Apr 11 20:34:40 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Apr 11 20:43:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b1d82e8

dev-db/sqlitebrowser: x86 stable (bug #652646)

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
index 0bc58fa9e5c..fb9278c2822 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2018-04-06 Thread Aaron Bauman

commit: 6ce4ce4da9c303d0795675ab8a4659e46d62215f
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri Apr  6 15:57:26 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Apr  6 15:57:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ce4ce4d

dev-db/sqlitebrowser: amd64 stable

Bug: https://bugs.gentoo.org/652646
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
index 42732d6e3e7..0bc58fa9e5c 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/files/, dev-db/sqlitebrowser/

2017-12-18 Thread Michael Weber

commit: aaf313529ffdb9a96aa8a371804e29a3d16f4f1f
Author: Michael Weber  gentoo  org>
AuthorDate: Mon Dec 18 11:33:45 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Mon Dec 18 11:33:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaf31352

dev-db/sqlitebrowser: Fix tests, thanks Jouni Kosonen.

Closes: https://bugs.gentoo.org/640862
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../files/sqlitebrowser-3.10.1-unbundle.patch  | 46 ++
 dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild   |  3 +-
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch 
b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch
index 9e2ad3e910b..b774e41ecd8 100644
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch
@@ -57,3 +57,49 @@ index fdf5b4c..ffba6d7 100644
  find_package(Qt5Widgets REQUIRED)
  find_package(Qt5LinguistTools REQUIRED)
 
+--- sqlitebrowser-3.10.1/src/tests/CMakeLists.txt
 sqlitebrowser-3.10.1/src/tests/CMakeLists.txt
+@@ -49,9 +49,6 @@
+ else()
+ target_link_libraries(test-sqlobjects antlr)
+ endif()
+-link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
+-add_dependencies(test-sqlobjects qscintilla2)
+-target_link_libraries(test-sqlobjects qscintilla2)
+ add_test(test-sqlobjects test-sqlobjects)
+ 
+ # test-import
+@@ -118,7 +118,4 @@
+ else()
+ target_link_libraries(test-regex antlr)
+ endif()
+-link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
+-add_dependencies(test-regex qscintilla2)
+-target_link_libraries(test-regex qscintilla2)
+ add_test(test-regex test-regex)
+--- sqlitebrowser-3.10.1/src/src.pro
 sqlitebrowser-3.10.1/src/src.pro
+@@ -153,10 +150,7 @@
+ }
+ }
+ 
+ LIBPATH_QHEXEDIT=$$OUT_PWD/../libs/qhexedit
+-LIBPATH_ANTLR=$$OUT_PWD/../libs/antlr-2.7.7
+-LIBPATH_QCUSTOMPLOT=$$OUT_PWD/../libs/qcustomplot-source
+-LIBPATH_QSCINTILLA=$$OUT_PWD/../libs/qscintilla/Qt4Qt5
+ unix {
+ LIBS += -ldl
+ }
+@@ -197,9 +193,9 @@
+ }
+ 
+ UI_DIR = .ui
+-INCLUDEPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit 
$$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5 $$PWD/..
+-LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT 
-L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2
+-DEPENDPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit 
$$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5
++INCLUDEPATH += $$PWD/../libs/qhexedit $$PWD/..
++LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT 
-L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2_qt5
++DEPENDPATH += $$PWD/../libs/qhexedit
+ 
+ unix {
+ # The executable

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
index c661e29a9f2..42732d6e3e7 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
@@ -36,8 +36,7 @@ PATCHES=(
 src_prepare() {
cmake-utils_src_prepare
# https://github.com/qingfengxia/qhexedit still bundled
-   # x11-libs/qscintilla[qt4?,qt5?] still bundled
-   find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
+   find libs/{antlr-2.7.7,qcustomplot-source,qscintilla} -delete || die
 
sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2017-12-11 Thread Michael Weber

commit: 7028b5d536379431e77f6875858178818b32e24f
Author: Michael Weber  gentoo  org>
AuthorDate: Mon Dec 11 09:11:19 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Mon Dec 11 09:11:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7028b5d5

dev-db/sqlitebrowser: Fix QA issues regarding .desktop and icon files.

Package-Manager: Portage-2.3.17, Repoman-2.3.6

 dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild   | 12 +++-
 dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild | 11 +++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
index 9de05f943b1..c661e29a9f2 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils eutils
+inherit cmake-utils eutils gnome2-utils xdg-utils
 
 DESCRIPTION="SQLite Database Browser"
 HOMEPAGE="http://sqlitebrowser.org;
@@ -57,3 +57,13 @@ src_install() {
cmake-utils_src_install
doicon images/sqlitebrowser.svg
 }
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+   xdg_desktop_database_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+   xdg_desktop_database_update
+}

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
index 48a7c45c0e0..9e91c60df05 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
@@ -18,6 +18,7 @@ RDEPEND="
dev-cpp/antlr-cpp:2
dev-db/sqlite:3
dev-libs/qcustomplot[qt5(+)]
+   dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
@@ -58,3 +59,13 @@ src_install() {
cmake-utils_src_install
doicon images/sqlitebrowser.svg
 }
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+   xdg_desktop_database_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+   xdg_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/

2017-12-11 Thread Michael Weber

commit: 6d1f62107c04fdeacd0471e901cd60af99ffeac4
Author: Michael Weber  gentoo  org>
AuthorDate: Mon Dec 11 09:05:08 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Mon Dec 11 09:05:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1f6210

dev-db/sqlitebrowser: Version bump, thanks @jok-ts, @a17r et al.

Reported-by: Anton Bolshakov  pentoo.ch>
Suggested-by: Jouni Kosonen  tukesoft.com>
Closes: https://bugs.gentoo.org/633412
Closes: https://github.com/gentoo/gentoo/pull/6322
Package-Manager: Portage-2.3.17, Repoman-2.3.6

 dev-db/sqlitebrowser/Manifest  |  1 +
 .../files/sqlitebrowser-3.10.1-unbundle.patch  | 59 ++
 dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild   | 59 ++
 3 files changed, 119 insertions(+)

diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 3815a86c48c..9b89c8bd849 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1 +1,2 @@
+DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 
105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf
 SHA512 
da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4
 DIST sqlitebrowser-3.9.1.tar.gz 1704713 BLAKE2B 
447a9e20fe4236feea2684703ac7f38b1c03f0ded352653b41bbec7d6380691776177fee1428fd67ac96190ed6752cedd76a9883cfa12584fec464cbf98707d3
 SHA512 
c1e88063fac864f60a9802ae378e13d6f3a09e2f4e71e50c6abca4967a941c444a64617bad2dfc743cf9a6be554af9c73e4c61533300ed9a51652234ffdbd225

diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch 
b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch
new file mode 100644
index 000..9e2ad3e910b
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch
@@ -0,0 +1,59 @@
+diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake
+index f469637..92c2d37 100644
+--- a/cmake/FindQScintilla.cmake
 b/cmake/FindQScintilla.cmake
+@@ -43,9 +43,12 @@
+ #=
+ 
+ 
++SET (QT_MIN_VERSION "5.6.2")
++FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Network 
Widgets )
++ 
+ find_path ( QSCINTILLA_INCLUDE_DIR
+   NAMES qsciscintilla.h
+-  HINTS ${QT_INCLUDE_DIR}
++  HINTS ${Qt5Core_INCLUDE_DIRS}
+   PATH_SUFFIXES Qsci
+ )
+ 
+@@ -81,6 +84,6 @@ endif ()
+ 
+ find_library ( QSCINTILLA_LIBRARY
+-  NAMES qscintilla qscintilla2 libqscintilla2
+-  HINTS ${QT_LIBRARY_DIR}
++  NAMES qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5
++  HINTS ${Qt5Core_LIBRARIES}
+ )
+ 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fdf5b4c..ffba6d7 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -47,26 +47,20 @@ if(WIN32 AND MSVC)
+ endif()
+ 
+ if(NOT FORCE_INTERNAL_ANTLR)
+-find_package(Antlr2)
++find_package(Antlr2 REQUIRED)
+ endif()
+ if(NOT FORCE_INTERNAL_QSCINTILLA)
+ find_package(QScintilla)
+ endif()
+ 
+ set(QHEXEDIT_DIR libs/qhexedit)
+-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
+
+-if(NOT ANTLR2_FOUND)
+-set(ANTLR_DIR libs/antlr-2.7.7)
+-add_subdirectory(${ANTLR_DIR})
+-endif()
+ if(NOT QSCINTILLA_FOUND)
+ set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
+ add_subdirectory(${QSCINTILLA_DIR})
+ endif()
+ add_subdirectory(${QHEXEDIT_DIR})
+-add_subdirectory(${QCUSTOMPLOT_DIR})
+ 
+ find_package(Qt5Widgets REQUIRED)
+ find_package(Qt5LinguistTools REQUIRED)
+

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
new file mode 100644
index 000..9de05f943b1
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils
+
+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="test"
+
+RDEPEND="
+   dev-cpp/antlr-cpp:2
+   dev-db/sqlite:3
+   >=dev-libs/qcustomplot-2.0.0[qt5(+)]
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5
+   >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+"
+DEPEND="${RDEPEND}
+   dev-qt/linguist-tools:5
+   test? ( dev-qt/qttest:5 )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.10.1-unbundle.patch
+)
+
+src_prepare() {
+   cmake-utils_src_prepare
+   # https://github.com/qingfengxia/qhexedit still bundled
+   # x11-libs/qscintilla[qt4?,qt5?] still bundled
+   find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
+
+   sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
+
+   if ! use test; then

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2017-09-22 Thread Michael Palimaka

commit: 4cb51d441214094401f9eb19d8c1287d469a2103
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Sep 23 02:26:31 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Sep 23 02:27:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cb51d44

dev-db/sqlitebrowser: set USE default for dev-libs/qcustomplot[qt5]

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
index 49ae0c12d87..48a7c45c0e0 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
 RDEPEND="
dev-cpp/antlr-cpp:2
dev-db/sqlite:3
-   dev-libs/qcustomplot[qt5]
+   dev-libs/qcustomplot[qt5(+)]
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2017-06-04 Thread Michael Weber

commit: 849e38164c14b6d390a6aef730c0509674cd1850
Author: Michael Weber  gentoo  org>
AuthorDate: Fri Jun  2 19:53:39 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sun Jun  4 22:52:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=849e3816

dev-db/sqlitebrowser: Remove old version.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-db/sqlitebrowser/Manifest  |  1 -
 dev-db/sqlitebrowser/sqlitebrowser-3.8.0-r1.ebuild | 57 --
 2 files changed, 58 deletions(-)

diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 0a3fc3ba994..395bf793d12 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,2 +1 @@
-DIST sqlitebrowser-3.8.0.tar.gz 1538043 SHA256 
f638a751bccde4bf0305a75685e2a72d26fc3e3a69d7e15fd84573f88c1a4d92 SHA512 
6e262e3bd3b26a1574a69cc9f306774cc9fe69f87c3253aba6b40c35f2491bc0636b6d5e705526e039ee9d8ed27d21a4529a624d62e8879a3917cfb502a65589
 WHIRLPOOL 
35d3594643a65e6b69bec816430dab3017c3ba197a12ab56ed9f027525db02a635789fda723bbd823d2f66b3933ee2381181ea7e95151be515cf1ddceeb9c8f9
 DIST sqlitebrowser-3.9.1.tar.gz 1704713 SHA256 
d0d2e06a69927ba1d0b955f3261ce70c61befc5bd5ddaa06752dae8bb4219ed8 SHA512 
c1e88063fac864f60a9802ae378e13d6f3a09e2f4e71e50c6abca4967a941c444a64617bad2dfc743cf9a6be554af9c73e4c61533300ed9a51652234ffdbd225
 WHIRLPOOL 
50c27ef3405573806e3c8939b69652f25896b9281b59d609cd3210faeb793d707d11ecdea4dada045eb4aa4da375327669566f71ecdbd151f669be1c2419a197

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.8.0-r1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.8.0-r1.ebuild
deleted file mode 100644
index e75e489a89f..000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.8.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit 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="qt5 test"
-
-RDEPEND="
-   dev-cpp/antlr-cpp:2
-   dev-db/sqlite:3
-   dev-libs/qcustomplot[qt5=]
-   x11-libs/qscintilla:=
-   !qt5? (
-   dev-qt/qtcore:4
-   dev-qt/qtgui:4
-   )
-   qt5? (
-   dev-qt/qtnetwork:5
-   dev-qt/qttest:5
-   dev-qt/qtwidgets:5
-   )"
-DEPEND="${RDEPEND}
-   qt5? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.7.0-unbundle.patch )
-
-src_prepare() {
-   # https://github.com/qingfengxia/qhexedit still bundled
-   # x11-libs/qscintilla[qt4?,qt5?] still bundled
-   find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_use qt5)
-   $(cmake-utils_use_enable test TESTING)
-   )
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-   doicon images/sqlitebrowser.svg
-}

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2017-06-01 Thread Agostino Sarubbo

commit: 2214336f37d03e541acb35b4166742d0f45b25d0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun  1 07:41:26 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun  1 07:41:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2214336f

dev-db/sqlitebrowser: amd64 stable wrt bug #620038

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
index 8189870a9a4..ec693322ab6 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2016-12-22 Thread David Seifert

commit: 3683d6da44caa04575e4c17b74a650c282d00d13
Author: David Seifert  gentoo  org>
AuthorDate: Thu Dec 22 17:46:37 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Dec 22 18:25:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3683d6da

dev-db/sqlitebrowser: Depend on x11-libs/qscintilla[qt4]

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3188

 .../{sqlitebrowser-3.8.0.ebuild => sqlitebrowser-3.8.0-r1.ebuild}   | 2 +-
 .../{sqlitebrowser-3.9.1.ebuild => sqlitebrowser-3.9.1-r1.ebuild}   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.8.0-r1.ebuild
similarity index 98%
rename from dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild
rename to dev-db/sqlitebrowser/sqlitebrowser-3.8.0-r1.ebuild
index e9d2802..a90f372 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.8.0-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
dev-cpp/antlr-cpp:2
dev-db/sqlite:3
dev-libs/qcustomplot[qt5=]
-   x11-libs/qscintilla
+   x11-libs/qscintilla:=
!qt5? (
dev-qt/qtcore:4
dev-qt/qtgui:4

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
similarity index 96%
rename from dev-db/sqlitebrowser/sqlitebrowser-3.9.1.ebuild
rename to dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
index c8415a6..a74bcaf 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
-   x11-libs/qscintilla
+   >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)]
 "
 DEPEND="${RDEPEND}
dev-qt/linguist-tools:5

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/

2016-11-15 Thread David Seifert

commit: 58c9ff528235a3b483358f53f31e9cb75df0cf62
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Oct 22 18:52:26 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Nov 15 22:28:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58c9ff52

dev-db/sqlitebrowser: 3.9.1 version bump

Gentoo-bug: 596884

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2793

Signed-off-by: David Seifert  gentoo.org>

 dev-db/sqlitebrowser/Manifest  |  1 +
 .../files/sqlitebrowser-3.9.1-cmake.patch  | 24 +
 dev-db/sqlitebrowser/sqlitebrowser-3.9.1.ebuild| 61 ++
 3 files changed, 86 insertions(+)

diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 62d26f5..8b97346 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,2 +1,3 @@
 DIST sqlitebrowser-3.7.0.tar.gz 1509766 SHA256 
3093a1dcf5b3138c1adf29857d62249ab2b068e70b001869a31151763e28cc3a SHA512 
f4c2f517a0b04fb74d8ec656e34f93d467a233040b36fab8f6f172681eb213be5c08131ecdaaa542d833bf24ef564d8e6f800e861b9a20d53de7a585aa104533
 WHIRLPOOL 
3bbfaa99f179c10f542d344ce6fe55656aa750a52925b2de590e2ba24bcafa95604646e6b218bca4f461390268de2bc2fb29d0de1deaf06438b33cb660e614e8
 DIST sqlitebrowser-3.8.0.tar.gz 1538043 SHA256 
f638a751bccde4bf0305a75685e2a72d26fc3e3a69d7e15fd84573f88c1a4d92 SHA512 
6e262e3bd3b26a1574a69cc9f306774cc9fe69f87c3253aba6b40c35f2491bc0636b6d5e705526e039ee9d8ed27d21a4529a624d62e8879a3917cfb502a65589
 WHIRLPOOL 
35d3594643a65e6b69bec816430dab3017c3ba197a12ab56ed9f027525db02a635789fda723bbd823d2f66b3933ee2381181ea7e95151be515cf1ddceeb9c8f9
+DIST sqlitebrowser-3.9.1.tar.gz 1704713 SHA256 
d0d2e06a69927ba1d0b955f3261ce70c61befc5bd5ddaa06752dae8bb4219ed8 SHA512 
c1e88063fac864f60a9802ae378e13d6f3a09e2f4e71e50c6abca4967a941c444a64617bad2dfc743cf9a6be554af9c73e4c61533300ed9a51652234ffdbd225
 WHIRLPOOL 
50c27ef3405573806e3c8939b69652f25896b9281b59d609cd3210faeb793d707d11ecdea4dada045eb4aa4da375327669566f71ecdbd151f669be1c2419a197

diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch 
b/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch
new file mode 100644
index ..cf1cde6
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch
@@ -0,0 +1,24 @@
+From 2563d678681fa6972674b47617015cb2515bd414 Mon Sep 17 00:00:00 2001
+From: Martin Kleusberg 
+Date: Wed, 12 Oct 2016 23:26:56 +0200
+Subject: [PATCH] Fix cmake file
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 998c2f4..4c5debd 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.7)
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" 
"${CMAKE_MODULE_PATH}")
+ 
+-OPTION(USE_QT5 FALSE "Build with qt5")
+-OPTION(ENABLE_TESTING FALSE "Enable the unit tests")
++OPTION(USE_QT5 "Build with qt5" OFF)
++OPTION(ENABLE_TESTING "Enable the unit tests" OFF)
+ 
+ if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE "Release")

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1.ebuild
new file mode 100644
index ..c8415a6
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils eutils
+
+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="test"
+
+RDEPEND="
+   dev-cpp/antlr-cpp:2
+   dev-db/sqlite:3
+   dev-libs/qcustomplot[qt5]
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5
+   x11-libs/qscintilla
+"
+DEPEND="${RDEPEND}
+   dev-qt/linguist-tools:5
+   test? ( dev-qt/qttest:5 )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.7.0-unbundle.patch
+   "${FILESDIR}"/${PN}-3.9.1-cmake.patch
+)
+
+src_prepare() {
+   cmake-utils_src_prepare
+   # https://github.com/qingfengxia/qhexedit still bundled
+   # x11-libs/qscintilla[qt4?,qt5?] still bundled
+   find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
+
+   sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
+
+   if ! use test; then
+   sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die
+   fi
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DUSE_QT5=ON
+   -DENABLE_TESTING=$(usex test)
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   doicon images/sqlitebrowser.svg
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2016-11-15 Thread David Seifert

commit: 6132ca3e55391934dd387291bcdcc3c9292e1a2d
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Wed Nov  9 18:55:53 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Nov 15 22:28:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6132ca3e

dev-db/sqlitebrowser: Drop old

3.8.0 is already stable while 3.7.0 wasn't.

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2793

Signed-off-by: David Seifert  gentoo.org>

 dev-db/sqlitebrowser/Manifest  |  1 -
 dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r1.ebuild | 60 --
 2 files changed, 61 deletions(-)

diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 8b97346..0a3fc3b 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,3 +1,2 @@
-DIST sqlitebrowser-3.7.0.tar.gz 1509766 SHA256 
3093a1dcf5b3138c1adf29857d62249ab2b068e70b001869a31151763e28cc3a SHA512 
f4c2f517a0b04fb74d8ec656e34f93d467a233040b36fab8f6f172681eb213be5c08131ecdaaa542d833bf24ef564d8e6f800e861b9a20d53de7a585aa104533
 WHIRLPOOL 
3bbfaa99f179c10f542d344ce6fe55656aa750a52925b2de590e2ba24bcafa95604646e6b218bca4f461390268de2bc2fb29d0de1deaf06438b33cb660e614e8
 DIST sqlitebrowser-3.8.0.tar.gz 1538043 SHA256 
f638a751bccde4bf0305a75685e2a72d26fc3e3a69d7e15fd84573f88c1a4d92 SHA512 
6e262e3bd3b26a1574a69cc9f306774cc9fe69f87c3253aba6b40c35f2491bc0636b6d5e705526e039ee9d8ed27d21a4529a624d62e8879a3917cfb502a65589
 WHIRLPOOL 
35d3594643a65e6b69bec816430dab3017c3ba197a12ab56ed9f027525db02a635789fda723bbd823d2f66b3933ee2381181ea7e95151be515cf1ddceeb9c8f9
 DIST sqlitebrowser-3.9.1.tar.gz 1704713 SHA256 
d0d2e06a69927ba1d0b955f3261ce70c61befc5bd5ddaa06752dae8bb4219ed8 SHA512 
c1e88063fac864f60a9802ae378e13d6f3a09e2f4e71e50c6abca4967a941c444a64617bad2dfc743cf9a6be554af9c73e4c61533300ed9a51652234ffdbd225
 WHIRLPOOL 
50c27ef3405573806e3c8939b69652f25896b9281b59d609cd3210faeb793d707d11ecdea4dada045eb4aa4da375327669566f71ecdbd151f669be1c2419a197

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r1.ebuild
deleted file mode 100644
index 3ebd2cb..
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit 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 test"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="
-   dev-cpp/antlr-cpp:2=
-   dev-db/sqlite:3
-   dev-libs/qcustomplot[qt5=]
-   x11-libs/qscintilla
-   qt4? (
-   dev-qt/qtcore:4
-   dev-qt/qtgui:4
-   )
-   qt5? (
-   dev-qt/qtnetwork:5
-   dev-qt/qttest:5
-   dev-qt/qtwidgets:5
-   )"
-DEPEND="${RDEPEND}
-   qt5? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
-
-src_prepare() {
-   # https://github.com/qingfengxia/qhexedit still bundled
-   # x11-libs/qscintilla[qt4?,qt5?] still bundled
-   find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_use qt5)
-   $(cmake-utils_use_enable test TESTING)
-   )
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-   doicon images/sqlitebrowser.svg
-}

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2016-11-15 Thread David Seifert

commit: cbad8de74ffccf01f372b4abc096fac2e0e244f3
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Wed Nov  9 18:54:54 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Nov 15 22:28:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbad8de7

dev-db/sqlitebrowser: Eliminate qt4 vs. qt5 REQUIRED_USE

Drop useless subslot operator. Minimal change.

Package-Manager: portage-2.3.0

sqlitebrowser-3.8.0.ebuild
Closes: https://github.com/gentoo/gentoo/pull/2793

Signed-off-by: David Seifert  gentoo.org>

 dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild
index 2c36d5e..e9d2802 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,16 +15,14 @@ 
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 test"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
+IUSE="qt5 test"
 
 RDEPEND="
-   dev-cpp/antlr-cpp:2=
+   dev-cpp/antlr-cpp:2
dev-db/sqlite:3
dev-libs/qcustomplot[qt5=]
x11-libs/qscintilla
-   qt4? (
+   !qt5? (
dev-qt/qtcore:4
dev-qt/qtgui:4
)

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2016-03-15 Thread Agostino Sarubbo

commit: d58e5ca2d3a2b2c6e695e808cdf004d866860dd1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Mar 15 11:25:59 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Mar 15 11:25:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d58e5ca2

dev-db/sqlitebrowser: amd64 stable wrt bug #571958

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild
index c78fb79..2c36d5e 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~x86"
 IUSE="qt4 qt5 test"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2016-01-10 Thread Michael Weber

commit: 5a3038169f1b1e24d4765b19286199d85890d88a
Author: Michael Weber  gentoo  org>
AuthorDate: Sun Jan 10 18:39:23 2016 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sun Jan 10 18:41:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a303816

dev-db/sqlitebrowser: Version bump (thanks Fabio Rossi, bug 571048).

Package-Manager: portage-2.2.26

 dev-db/sqlitebrowser/Manifest   |  1 +
 dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild | 60 +
 2 files changed, 61 insertions(+)

diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 17a24dd..62d26f5 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1 +1,2 @@
 DIST sqlitebrowser-3.7.0.tar.gz 1509766 SHA256 
3093a1dcf5b3138c1adf29857d62249ab2b068e70b001869a31151763e28cc3a SHA512 
f4c2f517a0b04fb74d8ec656e34f93d467a233040b36fab8f6f172681eb213be5c08131ecdaaa542d833bf24ef564d8e6f800e861b9a20d53de7a585aa104533
 WHIRLPOOL 
3bbfaa99f179c10f542d344ce6fe55656aa750a52925b2de590e2ba24bcafa95604646e6b218bca4f461390268de2bc2fb29d0de1deaf06438b33cb660e614e8
+DIST sqlitebrowser-3.8.0.tar.gz 1538043 SHA256 
f638a751bccde4bf0305a75685e2a72d26fc3e3a69d7e15fd84573f88c1a4d92 SHA512 
6e262e3bd3b26a1574a69cc9f306774cc9fe69f87c3253aba6b40c35f2491bc0636b6d5e705526e039ee9d8ed27d21a4529a624d62e8879a3917cfb502a65589
 WHIRLPOOL 
35d3594643a65e6b69bec816430dab3017c3ba197a12ab56ed9f027525db02a635789fda723bbd823d2f66b3933ee2381181ea7e95151be515cf1ddceeb9c8f9

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild
new file mode 100644
index 000..c78fb79
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.8.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MAKEFILE_GENERATOR=ninja
+
+inherit 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 test"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="
+   dev-cpp/antlr-cpp:2=
+   dev-db/sqlite:3
+   dev-libs/qcustomplot[qt5=]
+   x11-libs/qscintilla
+   qt4? (
+   dev-qt/qtcore:4
+   dev-qt/qtgui:4
+   )
+   qt5? (
+   dev-qt/qtnetwork:5
+   dev-qt/qttest:5
+   dev-qt/qtwidgets:5
+   )"
+DEPEND="${RDEPEND}
+   qt5? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.7.0-unbundle.patch )
+
+src_prepare() {
+   # https://github.com/qingfengxia/qhexedit still bundled
+   # x11-libs/qscintilla[qt4?,qt5?] still bundled
+   find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_use qt5)
+   $(cmake-utils_use_enable test TESTING)
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   doicon images/sqlitebrowser.svg
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2015-12-06 Thread James Le Cuirot

commit: d1f6c36477476add0efe1389a7ce4eccac2c0213
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Dec  6 21:46:43 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Dec  6 21:49:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1f6c364

dev-db/sqlitebrowser: Use the new antlr-cpp package instead of antlr

The non-Java parts of antlr have now been split out. The Java part
isn't required in this case.

Package-Manager: portage-2.2.26

 dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r1.ebuild | 60 ++
 1 file changed, 60 insertions(+)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r1.ebuild
new file mode 100644
index 000..3ebd2cb
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MAKEFILE_GENERATOR=ninja
+
+inherit 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 test"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="
+   dev-cpp/antlr-cpp:2=
+   dev-db/sqlite:3
+   dev-libs/qcustomplot[qt5=]
+   x11-libs/qscintilla
+   qt4? (
+   dev-qt/qtcore:4
+   dev-qt/qtgui:4
+   )
+   qt5? (
+   dev-qt/qtnetwork:5
+   dev-qt/qttest:5
+   dev-qt/qtwidgets:5
+   )"
+DEPEND="${RDEPEND}
+   qt5? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
+
+src_prepare() {
+   # https://github.com/qingfengxia/qhexedit still bundled
+   # x11-libs/qscintilla[qt4?,qt5?] still bundled
+   find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_use qt5)
+   $(cmake-utils_use_enable test TESTING)
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   doicon images/sqlitebrowser.svg
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2015-12-06 Thread James Le Cuirot

commit: 2772951448712648264540c78fcdec164982535f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Dec  6 21:49:06 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Dec  6 21:49:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27729514

dev-db/sqlitebrowser: Remove old

Package-Manager: portage-2.2.26

 dev-db/sqlitebrowser/Manifest   |  2 -
 dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild | 71 
 dev-db/sqlitebrowser/sqlitebrowser-3.6.0.ebuild | 73 -
 dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild | 60 
 4 files changed, 206 deletions(-)

diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index f555aba..17a24dd 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,3 +1 @@
-DIST sqlitebrowser-3.5.1.tar.gz 874540 SHA256 
d7f3d1e54882ebabab3b2f7764a6bb921d4fe319db84a092147c941ce19feb8d SHA512 
815665002932a606c7e1da8738be0d94a0b2bf330042af30d5b4033ce27c548fec1a05b51f2a11a7620d4e123961ba63595b60aec7eac716e5d3747bb90886e2
 WHIRLPOOL 
1b8984eefe730ef468fc64bff1465de3a5b273e3e1594916f05cbe07bec315126001b42cc05d6a3c153aaaccab39bdafa29d31f83fceba6aa7697df7ff870462
-DIST sqlitebrowser-3.6.0.tar.gz 1453029 SHA256 
221a410a3ec8512a766ed8bc4cade1f3b1cde94e41e52743d5a6d2a33acb3a56 SHA512 
ae4a0bb9ac8ff01ec965ae264a41fe7749672cd6562f0ce5e5b69007ea403fff5dcc4f90be3ffa4d9b7d1dc293767f2ca7757de55895f56efbe6b7be0e6721df
 WHIRLPOOL 
93e053d8b6cf9e67f0294117995443865e29923c899a0263ce117979f982155e4020a88ba865a4b92d162fc8842f5b95c4b512575d153cb7f9fa9445880e1b5c
 DIST sqlitebrowser-3.7.0.tar.gz 1509766 SHA256 
3093a1dcf5b3138c1adf29857d62249ab2b068e70b001869a31151763e28cc3a SHA512 
f4c2f517a0b04fb74d8ec656e34f93d467a233040b36fab8f6f172681eb213be5c08131ecdaaa542d833bf24ef564d8e6f800e861b9a20d53de7a585aa104533
 WHIRLPOOL 
3bbfaa99f179c10f542d344ce6fe55656aa750a52925b2de590e2ba24bcafa95604646e6b218bca4f461390268de2bc2fb29d0de1deaf06438b33cb660e614e8

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild
deleted file mode 100644
index d30919b..000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit 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 test"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="
-   dev-db/sqlite:3
-   dev-java/antlr:0[cxx]
-   dev-libs/qcustomplot[qt5=]
-   qt4? (
-   dev-qt/qtcore:4
-   dev-qt/qtgui:4
-   )
-   qt5? (
-   dev-qt/qtnetwork:5
-   dev-qt/qttest:5
-   dev-qt/qtwidgets:5
-   )"
-DEPEND="${RDEPEND}
-   qt5? ( dev-qt/linguist-tools:5 )"
-
-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() {
-   local mycmakeargs=(
-   $(cmake-utils_use_use qt5)
-   )
-   cmake-utils_src_configure
-   if use test; then
-   BUILD_DIR="${S}"/tests CMAKE_USE_DIR="${S}"/tests 
cmake-utils_src_configure
-   fi
-}
-
-src_compile() {
-   cmake-utils_src_compile
-   if use test; then
-   BUILD_DIR="${S}"/tests CMAKE_USE_DIR="${S}"/tests 
cmake-utils_src_compile
-   fi
-}
-
-src_test() {
-   tests/sqlb-unittests || die
-}
-
-src_install() {
-   cmake-utils_src_install
-   doicon images/sqlitebrowser.svg
-   domenu distri/sqlitebrowser.desktop
-}

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.6.0.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.6.0.ebuild
deleted file mode 100644
index c180287..000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.6.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit 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 test"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="
-   dev-db/sqlite:3
-   dev-java/antlr:0[cxx]
-   dev-libs/qcustomplot[qt5=]
-   x11-libs/qscintilla
-   qt4? (
-   dev-qt/qtcore:4
-   dev-qt/qtgui:4
-   )
-   qt5? (
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/

2015-10-01 Thread Michael Palimaka

commit: 747a5622fae03fa61f8e3c26fc171f8c25aee1c1
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Oct  1 14:13:41 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Oct  1 14:20:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=747a5622

dev-db/sqlitebrowser: dev-qt/linguist-tools is a build-time dependency

Also, dev-qt/linguist is not used at all.

Package-Manager: portage-2.2.20.1

 dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild | 7 +++
 dev-db/sqlitebrowser/sqlitebrowser-3.6.0.ebuild | 7 +++
 dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild | 8 
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild
index e7513c7..d30919b 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild
@@ -19,7 +19,7 @@ IUSE="qt4 qt5 test"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
-DEPEND="
+RDEPEND="
dev-db/sqlite:3
dev-java/antlr:0[cxx]
dev-libs/qcustomplot[qt5=]
@@ -28,13 +28,12 @@ DEPEND="
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}"
+DEPEND="${RDEPEND}
+   qt5? ( dev-qt/linguist-tools:5 )"
 
 PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
 

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.6.0.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.6.0.ebuild
index a1c6a96..c180287 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.6.0.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.6.0.ebuild
@@ -19,7 +19,7 @@ IUSE="qt4 qt5 test"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
-DEPEND="
+RDEPEND="
dev-db/sqlite:3
dev-java/antlr:0[cxx]
dev-libs/qcustomplot[qt5=]
@@ -29,13 +29,12 @@ DEPEND="
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}"
+DEPEND="${RDEPEND}
+   qt5? ( dev-qt/linguist-tools:5 )"
 
 PATCHES=( "${FILESDIR}"/${P}-unbundle-keep-qscintilla.patch )
 

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild
index 041e204..b67ebae 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild
@@ -19,7 +19,7 @@ IUSE="qt4 qt5 test"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
-DEPEND="
+RDEPEND="
dev-db/sqlite:3
dev-java/antlr:0[cxx]
dev-libs/qcustomplot[qt5=]
@@ -29,13 +29,13 @@ DEPEND="
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}"
+DEPEND="${RDEPEND}
+   qt5? ( dev-qt/linguist-tools:5 )
+"
 
 PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/files/, dev-db/sqlitebrowser/

2015-08-10 Thread Michael Weber

commit: 91763de7d6b5375befcd00ad33af11277c15b699
Author: Michael Weber xmw AT gentoo DOT org
AuthorDate: Mon Aug 10 22:21:29 2015 +
Commit: Michael Weber xmw AT gentoo DOT org
CommitDate: Mon Aug 10 22:21:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91763de7

dev-db/sqlitebrowser: version bump (bug 554034).

Package-Manager: portage-2.2.20

 dev-db/sqlitebrowser/Manifest  |  1 +
 .../files/sqlitebrowser-3.7.0-unbundle.patch   | 18 +++
 dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild| 60 ++
 3 files changed, 79 insertions(+)

diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 7c2b4ba..de294c2 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,3 +1,4 @@
 DIST sqlitebrowser-3.3.1.tar.gz 818842 SHA256 
5113d3b4c219585fe017047556363d4934b2b3e3f7c3f0968b87e9eac0156d22 SHA512 
3cb44631f39b1c1a90b86502761826830054f440509faaece36052958af361185d41335f763499cec5fc005cc90eb7be403c4ac2a5cec655fe63d989434880bc
 WHIRLPOOL 
c4ab107ac97800c14ce788e4742beb528f40c74dc787217fdc9fe5dc1f0d8a67b97cd3fc9e6842b54e321d287fff925f050a20d22fbfe5e7491d4c2140c1f6de
 DIST sqlitebrowser-3.5.1.tar.gz 874540 SHA256 
d7f3d1e54882ebabab3b2f7764a6bb921d4fe319db84a092147c941ce19feb8d SHA512 
815665002932a606c7e1da8738be0d94a0b2bf330042af30d5b4033ce27c548fec1a05b51f2a11a7620d4e123961ba63595b60aec7eac716e5d3747bb90886e2
 WHIRLPOOL 
1b8984eefe730ef468fc64bff1465de3a5b273e3e1594916f05cbe07bec315126001b42cc05d6a3c153aaaccab39bdafa29d31f83fceba6aa7697df7ff870462
 DIST sqlitebrowser-3.6.0.tar.gz 1453029 SHA256 
221a410a3ec8512a766ed8bc4cade1f3b1cde94e41e52743d5a6d2a33acb3a56 SHA512 
ae4a0bb9ac8ff01ec965ae264a41fe7749672cd6562f0ce5e5b69007ea403fff5dcc4f90be3ffa4d9b7d1dc293767f2ca7757de55895f56efbe6b7be0e6721df
 WHIRLPOOL 
93e053d8b6cf9e67f0294117995443865e29923c899a0263ce117979f982155e4020a88ba865a4b92d162fc8842f5b95c4b512575d153cb7f9fa9445880e1b5c
+DIST sqlitebrowser-3.7.0.tar.gz 1509766 SHA256 
3093a1dcf5b3138c1adf29857d62249ab2b068e70b001869a31151763e28cc3a SHA512 
f4c2f517a0b04fb74d8ec656e34f93d467a233040b36fab8f6f172681eb213be5c08131ecdaaa542d833bf24ef564d8e6f800e861b9a20d53de7a585aa104533
 WHIRLPOOL 
3bbfaa99f179c10f542d344ce6fe55656aa750a52925b2de590e2ba24bcafa95604646e6b218bca4f461390268de2bc2fb29d0de1deaf06438b33cb660e614e8

diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch 
b/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch
new file mode 100644
index 000..8dbe870
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch
@@ -0,0 +1,18 @@
+--- sqlitebrowser-3.7.0/CMakeLists.txt
 sqlitebrowser-3.7.0/CMakeLists.txt
+@@ -29,15 +29,9 @@
+ find_package(Antlr2)
+ 
+ set(QHEXEDIT_DIR libs/qhexedit)
+-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
+ set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
+ 
+-if(NOT ANTLR2_FOUND)
+-set(ANTLR_DIR libs/antlr-2.7.7)
+-add_subdirectory(${ANTLR_DIR})
+-endif()
+ add_subdirectory(${QHEXEDIT_DIR})
+-add_subdirectory(${QCUSTOMPLOT_DIR})
+ add_subdirectory(${QSCINTILLA_DIR})
+ 
+ if(USE_QT5)

diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild
new file mode 100644
index 000..041e204
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MAKEFILE_GENERATOR=ninja
+
+inherit 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 test
+
+REQUIRED_USE=^^ ( qt4 qt5 )
+
+DEPEND=
+   dev-db/sqlite:3
+   dev-java/antlr:0[cxx]
+   dev-libs/qcustomplot[qt5=]
+   x11-libs/qscintilla
+   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}/${P}-unbundle.patch )
+
+src_prepare() {
+   # https://github.com/qingfengxia/qhexedit still bundled
+   # x11-libs/qscintilla[qt4?,qt5?] still bundled
+   find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_use qt5)
+   $(cmake-utils_use_enable test TESTING)
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   doicon images/sqlitebrowser.svg
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/files/, dev-db/sqlitebrowser/

2015-08-10 Thread Michael Weber

commit: 96be02580a30392352a2fa8e159234d7ea9062ce
Author: Michael Weber xmw AT gentoo DOT org
AuthorDate: Mon Aug 10 22:23:46 2015 +
Commit: Michael Weber xmw AT gentoo DOT org
CommitDate: Mon Aug 10 22:23:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96be0258

dev-db/sqlitebrowser: drop old version.

Package-Manager: portage-2.2.20

 dev-db/sqlitebrowser/Manifest  |  1 -
 .../files/sqlitebrowser-3.3.1-unbundle.patch   | 46 --
 dev-db/sqlitebrowser/sqlitebrowser-3.3.1.ebuild| 45 -
 3 files changed, 92 deletions(-)

diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index de294c2..f555aba 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,4 +1,3 @@
-DIST sqlitebrowser-3.3.1.tar.gz 818842 SHA256 
5113d3b4c219585fe017047556363d4934b2b3e3f7c3f0968b87e9eac0156d22 SHA512 
3cb44631f39b1c1a90b86502761826830054f440509faaece36052958af361185d41335f763499cec5fc005cc90eb7be403c4ac2a5cec655fe63d989434880bc
 WHIRLPOOL 
c4ab107ac97800c14ce788e4742beb528f40c74dc787217fdc9fe5dc1f0d8a67b97cd3fc9e6842b54e321d287fff925f050a20d22fbfe5e7491d4c2140c1f6de
 DIST sqlitebrowser-3.5.1.tar.gz 874540 SHA256 
d7f3d1e54882ebabab3b2f7764a6bb921d4fe319db84a092147c941ce19feb8d SHA512 
815665002932a606c7e1da8738be0d94a0b2bf330042af30d5b4033ce27c548fec1a05b51f2a11a7620d4e123961ba63595b60aec7eac716e5d3747bb90886e2
 WHIRLPOOL 
1b8984eefe730ef468fc64bff1465de3a5b273e3e1594916f05cbe07bec315126001b42cc05d6a3c153aaaccab39bdafa29d31f83fceba6aa7697df7ff870462
 DIST sqlitebrowser-3.6.0.tar.gz 1453029 SHA256 
221a410a3ec8512a766ed8bc4cade1f3b1cde94e41e52743d5a6d2a33acb3a56 SHA512 
ae4a0bb9ac8ff01ec965ae264a41fe7749672cd6562f0ce5e5b69007ea403fff5dcc4f90be3ffa4d9b7d1dc293767f2ca7757de55895f56efbe6b7be0e6721df
 WHIRLPOOL 
93e053d8b6cf9e67f0294117995443865e29923c899a0263ce117979f982155e4020a88ba865a4b92d162fc8842f5b95c4b512575d153cb7f9fa9445880e1b5c
 DIST sqlitebrowser-3.7.0.tar.gz 1509766 SHA256 
3093a1dcf5b3138c1adf29857d62249ab2b068e70b001869a31151763e28cc3a SHA512 
f4c2f517a0b04fb74d8ec656e34f93d467a233040b36fab8f6f172681eb213be5c08131ecdaaa542d833bf24ef564d8e6f800e861b9a20d53de7a585aa104533
 WHIRLPOOL 
3bbfaa99f179c10f542d344ce6fe55656aa750a52925b2de590e2ba24bcafa95604646e6b218bca4f461390268de2bc2fb29d0de1deaf06438b33cb660e614e8

diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch 
b/dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch
deleted file mode 100644
index 263afaf..000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch
+++ /dev/null
@@ -1,46 +0,0 @@
- 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/sqlitebrowser-3.3.1.ebuild 
b/dev-db/sqlitebrowser/sqlitebrowser-3.3.1.ebuild
deleted file mode 100644
index bf0890e..000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit 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-libs/qcustomplot[-qt5(-)]
-   dev-qt/qtcore:4
-   dev-qt/qtgui:4
-RDEPEND=${DEPEND}
-
-PATCHES=( ${FILESDIR}/${P}-unbundle.patch )
-
-src_prepare() {
-   #

[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/files/

2015-08-10 Thread Michael Weber

commit: 07bd7b113ecc99e25bcbf858f525cdda26ba8d2a
Author: Michael Weber xmw AT gentoo DOT org
AuthorDate: Mon Aug 10 22:22:40 2015 +
Commit: Michael Weber xmw AT gentoo DOT org
CommitDate: Mon Aug 10 22:22:40 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07bd7b11

dev-db/sqlitebrowser: drop unused patch.

Package-Manager: portage-2.2.20

 .../files/sqlitebrowser-3.6.0-unbundle.patch   | 75 --
 1 file changed, 75 deletions(-)

diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle.patch 
b/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle.patch
deleted file mode 100644
index d3b31bc..000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle.patch
+++ /dev/null
@@ -1,75 +0,0 @@
 sqlitebrowser-3.6.0/CMakeLists.txt
-+++ sqlitebrowser-3.6.0/CMakeLists.txt
-@@ -21,15 +21,9 @@
-   set(CMAKE_PREFIX_PATH ${QT5_PATH};${SQLITE3_PATH})
- endif()
- 
--set(ANTLR_DIR libs/antlr-2.7.7)
- set(QHEXEDIT_DIR libs/qhexedit)
--set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
--set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
- 
--add_subdirectory(${ANTLR_DIR})
- add_subdirectory(${QHEXEDIT_DIR})
--add_subdirectory(${QCUSTOMPLOT_DIR})
--add_subdirectory(${QSCINTILLA_DIR})
- 
- if(USE_QT5)
-   find_package(Qt5Widgets REQUIRED)
-@@ -31,7 +31,7 @@
- set(CMAKE_AUTOMOC ON)
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- else()
--find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED)
-+find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork qscintilla2 REQUIRED)
- include(${QT_USE_FILE})
- add_definitions(${QT_DEFINITIONS})
- endif()
-@@ -207,10 +201,7 @@
- 
- include_directories(
-   ${CMAKE_CURRENT_BINARY_DIR}
--  ${ANTLR_DIR}
-   ${QHEXEDIT_DIR}
--  ${QCUSTOMPLOT_DIR}
--  ${QSCINTILLA_DIR}
-   ${ADDITIONAL_INCLUDE_PATHS}
-   src)
- 
-@@ -227,13 +218,10 @@
- qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
- set(QT_LIBRARIES )
- endif()
--add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot qscintilla2)
-+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}/${QSCINTILLA_DIR})
-+  ${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR})
- 
- target_link_libraries(${PROJECT_NAME}
-   antlr
 sqlitebrowser-3.6.0/tests/CMakeLists.txt
-+++ sqlitebrowser-3.6.0/tests/CMakeLists.txt
-@@ -7,9 +7,6 @@
- set(CMAKE_BUILD_TYPE Release)
- endif()
- 
--set(ANTLR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7)
--add_subdirectory(${ANTLR_DIR} ${CMAKE_CURRENT_BINARY_DIR}/antlr)
--
- if(USE_QT5)
- find_package(Qt5Widgets REQUIRED)
- set(CMAKE_AUTOMOC ON)
-@@ -65,7 +62,7 @@
- QT4_WRAP_UI(SQLB_FORM_HDR ${SQLB_FORMS})
- endif()
- 
--include_directories(${CMAKE_CURRENT_BINARY_DIR} ${ANTLR_DIR} ../src)
-+include_directories(${CMAKE_CURRENT_BINARY_DIR} ../src)
- 
- add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC} 
${SQLB_FORM_HDR})
-

38 matches

Mail list logo