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

[Jimi Huotari]

commit: 9592d1fe093f4eef957080db70fb3de7d4949f60
Author: José P. R. N. Assis  gmail  com>
AuthorDate: Thu Feb  1 12:12:15 2024 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Tue Apr 16 16:29:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9592d1fe

dev-db/sqliteman: fix qscintilla dep #916232

Adding [qt5(+)] to the qscintilla dependency in preparation to supporting 
Qt5/Qt6
QScintilla multibuild. Revision number bumped to -r6. Keywords kept
as-is.

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

 .../sqliteman/{sqliteman-1.2.2-r5.ebuild => sqliteman-1.2.2-r6.ebuild}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r6.ebuild
similarity index 94%
rename from dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild
rename to dev-db/sqliteman/sqliteman-1.2.2-r6.ebuild
index 655184f548cf..f36aabb52938 100644
--- a/dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r6.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
dev-qt/qtgui:5
dev-qt/qtsql:5[sqlite]
dev-qt/qtwidgets:5
-   >=x11-libs/qscintilla-2.10.3:="
+   >=x11-libs/qscintilla-2.10.3:=[qt5(+)]"
 DEPEND="${RDEPEND}"
 
 PATCHES=(

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

[Andreas Sturmlechner]

commit: 8b972afb0c2cc2392f7ec298cdab0db7b805e976
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr  5 07:47:14 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr  5 07:47:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b972afb

dev-db/sqliteman: Drop 1.2.2-r4, cmake-utils--

Closes: https://bugs.gentoo.org/834312
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild | 45 --
 1 file changed, 45 deletions(-)

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
deleted file mode 100644
index 979ce3516bed..
--- a/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-QT_VER=5.7.1
-inherit cmake-utils flag-o-matic xdg-utils
-
-DESCRIPTION="Powerful GUI manager for the Sqlite3 database"
-HOMEPAGE="https://sourceforge.net/projects/sqliteman/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-   >=dev-qt/qtcore-${QT_VER}:5
-   >=dev-qt/qtgui-${QT_VER}:5
-   >=dev-qt/qtsql-${QT_VER}:5[sqlite]
-   >=dev-qt/qtwidgets-${QT_VER}:5
-   >=x11-libs/qscintilla-2.9.4:=[qt5(+)]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${P}-lpthread.patch"
-   "${FILESDIR}/${P}-qt5.patch"
-)
-
-src_prepare() {
-   # remove bundled lib
-   rm -rf "${S}"/${PN}/qscintilla2 || die
-
-   append-flags -fPIC
-   cmake-utils_src_prepare
-}
-
-pkg_postinst() {
-   xdg_desktop_database_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-}

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

[Jakov Smolić]

commit: 39cce2760ace5dd2500c94c4b083977ca79cbca1
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Apr  4 12:26:55 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Apr  4 12:26:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39cce276

dev-db/sqliteman: Stabilize 1.2.2-r5 x86, #834312

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild
index 624d65ccde91..655184f548cf 100644
--- a/dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="

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

[Jakov Smolić]

commit: ef683b016c517bc30266de410c5e5943d33480d9
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Apr  4 12:26:51 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Apr  4 12:26:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef683b01

dev-db/sqliteman: Stabilize 1.2.2-r5 amd64, #834312

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild
index 65f52a34916f..624d65ccde91 100644
--- a/dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="

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

[Andreas Sturmlechner]

commit: cfcfb63e2cd63157934eda5575d559ebd547aa36
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 27 23:03:37 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Feb 28 07:13:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfcfb63e

dev-db/sqliteman: EAPI-8 bump, switch to cmake.eclass, xdg.eclass

Cleanup obsolete minimum version deps
Fix pixmap icon installation path for use with desktop file
Improve desktop file (patch thx to Fedora)

Bug: https://bugs.gentoo.org/834312
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/sqliteman/files/sqliteman-1.2.2-cmake.patch | 10 ++
 .../sqliteman/files/sqliteman-1.2.2-desktop.patch  | 11 +++
 dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild | 38 ++
 3 files changed, 59 insertions(+)

diff --git a/dev-db/sqliteman/files/sqliteman-1.2.2-cmake.patch 
b/dev-db/sqliteman/files/sqliteman-1.2.2-cmake.patch
new file mode 100644
index ..99c3b080ea0d
--- /dev/null
+++ b/dev-db/sqliteman/files/sqliteman-1.2.2-cmake.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -154,6 +154,6 @@
+ )
+ INSTALL(FILES
+ sqliteman/icons/sqliteman.png
+-DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor"
++DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pixmaps"
+ )
+ ENDIF (WIN32)

diff --git a/dev-db/sqliteman/files/sqliteman-1.2.2-desktop.patch 
b/dev-db/sqliteman/files/sqliteman-1.2.2-desktop.patch
new file mode 100644
index ..f6d765e40a45
--- /dev/null
+++ b/dev-db/sqliteman/files/sqliteman-1.2.2-desktop.patch
@@ -0,0 +1,11 @@
+--- a/sqliteman.desktop
 b/sqliteman.desktop
+@@ -8,7 +8,7 @@
+ Terminal=false
+ StartupNotify=true
+ MimeType=application/x-sqlite3;
+-
++Categories=Development;Database;
+ # Translations
+ GenericName[cs]=Sqlite administrace
+ 

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild
new file mode 100644
index ..65f52a34916f
--- /dev/null
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Powerful GUI manager for the Sqlite3 database"
+HOMEPAGE="https://sourceforge.net/projects/sqliteman/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtsql:5[sqlite]
+   dev-qt/qtwidgets:5
+   >=x11-libs/qscintilla-2.10.3:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${P}-lpthread.patch"
+   "${FILESDIR}/${P}-qt5.patch"
+   "${FILESDIR}/${P}-cmake.patch"
+   "${FILESDIR}/${P}-desktop.patch"
+)
+
+src_prepare() {
+   # remove bundled lib
+   rm -rf ${PN}/qscintilla2 || die
+
+   append-flags -fPIC
+   cmake_src_prepare
+}

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

[Michael Palimaka]

commit: 87436a546204cd84761ac86ef8843937bab5bd2c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Nov 21 10:30:54 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Nov 21 10:31:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87436a54

dev-db/sqliteman: remove 1.2.2-r2 and 1.2.2-r3

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 .../files/sqliteman-1.2.2-qscintilla-2.10.patch| 13 -
 dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild | 32 
 dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild | 34 --
 3 files changed, 79 deletions(-)

diff --git a/dev-db/sqliteman/files/sqliteman-1.2.2-qscintilla-2.10.patch 
b/dev-db/sqliteman/files/sqliteman-1.2.2-qscintilla-2.10.patch
deleted file mode 100644
index c197ad34211..000
--- a/dev-db/sqliteman/files/sqliteman-1.2.2-qscintilla-2.10.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/modules/FindQScintilla.cmake 
b/cmake/modules/FindQScintilla.cmake
-index c4592d0..7700ec4 100644
 a/cmake/modules/FindQScintilla.cmake
-+++ b/cmake/modules/FindQScintilla.cmake
-@@ -21,7 +21,7 @@ IF(QT4_FOUND)
- "${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci
- )
- 
--SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2)
-+SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 
qscintilla2_qt4 libqscintilla2_qt4)
- FIND_LIBRARY(QSCINTILLA_LIBRARY
- NAMES ${QSCINTILLA_NAMES}
- PATHS ${QT_LIBRARY_DIR}

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild
deleted file mode 100644
index 0550f0f6afa..000
--- a/dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Powerful GUI manager for the Sqlite3 database"
-HOMEPAGE="https://sourceforge.net/projects/sqliteman/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-   dev-qt/qtcore:4
-   dev-qt/qtgui:4
-   dev-qt/qtsql:4[sqlite]
-   x11-libs/qscintilla:=[qt4(-)]"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README )
-PATCHES=( "${FILESDIR}/${P}-lpthread.patch" )
-
-src_prepare() {
-   # remove bundled lib
-   rm -rf "${S}"/${PN}/qscintilla2 || die
-
-   cmake-utils_src_prepare
-}

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild
deleted file mode 100644
index e591dfbd957..000
--- a/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Powerful GUI manager for the Sqlite3 database"
-HOMEPAGE="https://sourceforge.net/projects/sqliteman/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-   dev-qt/qtcore:4
-   dev-qt/qtgui:4
-   dev-qt/qtsql:4[sqlite]
-   x11-libs/qscintilla:=[qt4(-)]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${P}-lpthread.patch"
-   "${FILESDIR}/${P}-qscintilla-2.10.patch"
-)
-
-src_prepare() {
-   # remove bundled lib
-   rm -rf "${S}"/${PN}/qscintilla2 || die
-
-   cmake-utils_src_prepare
-}

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

[Manuel Rüger]

commit: cd37a415e7f2249d9ab920e31b6328bef9307c75
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Nov 20 15:45:44 2017 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Nov 20 15:45:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd37a415

dev-db/sqliteman: Stable on amd64

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
index ebe92bb1c46..979ce3516be 100644
--- a/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="

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

[Thomas Deutschmann]

commit: 81b06b728eb5149e2c3c14c228d7073d1e2f70dc
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Nov  2 21:08:31 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Nov  2 21:13:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81b06b72

dev-db/sqliteman: x86 stable (bug #634982)

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
index a7645ef0f77..ebe92bb1c46 100644
--- a/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="

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

[Andreas Sturmlechner]

commit: 62eab3c77e0eab212b5f358e2682bb77deff8702
Author: Jouni Kosonen  tukesoft  com>
AuthorDate: Sat Oct 21 14:58:44 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct 22 00:03:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62eab3c7

dev-db/sqliteman: Depend on x11-libs/qscintilla[qt5]

Gentoo-bug: 634982
Closes: https://github.com/gentoo/gentoo/pull/6002

 dev-db/sqliteman/files/sqliteman-1.2.2-qt5.patch | 346 +++
 dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild   |  45 +++
 2 files changed, 391 insertions(+)

diff --git a/dev-db/sqliteman/files/sqliteman-1.2.2-qt5.patch 
b/dev-db/sqliteman/files/sqliteman-1.2.2-qt5.patch
new file mode 100644
index 000..ebc571a3398
--- /dev/null
+++ b/dev-db/sqliteman/files/sqliteman-1.2.2-qt5.patch
@@ -0,0 +1,346 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9fd041..f589bfe 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -101,28 +101,7 @@ 
+ 
+ 
+-SET (QT_MT_REQUIRED true)
+-SET (QT_MIN_VERSION "4.2.0")
++SET (QT_MIN_VERSION "5.7.1")
+-SET( QT_USE_QTSQL TRUE )
+-SET( QT_USE_QTXML TRUE )
+-FIND_PACKAGE( Qt4 REQUIRED )
+-MESSAGE(STATUS Qt4 version: 
${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH})
+-# suggest Qt upgrade
+-if (QT_VERSION_MINOR LESS 3)
+-MESSAGE(STATUS "")
+-MESSAGE(STATUS "__ BIG FAT WARNING! ___")
+-MESSAGE(STATUS "Your Qt version seems older than it should be.")
+-MESSAGE(STATUS "Althought will be Sqliteman compilled successfully,")
+-MESSAGE(STATUS "it will be limited in its features.")
+-MESSAGE(STATUS "There are some important bugs in older Qt versions.")
+-MESSAGE(STATUS "Please upgrade to the current Qt version.")
+-MESSAGE(STATUS "___")
+-MESSAGE(STATUS "")
+-endif (QT_VERSION_MINOR LESS 3)
+-MESSAGE(STATUS Qt4 includes: ${QT_INCLUDES})
+-MESSAGE(STATUS Qt4 libs: ${QT_LIBRARY_DIR})
+-
+-INCLUDE( ${QT_USE_FILE} )
+-
++FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Sql Widgets )
+ 
+ IF (WANT_INTERNAL_QSCINTILLA)
+ MESSAGE(STATUS "QSci: Building with internal copy of QScintilla.")
+diff --git a/cmake/modules/FindQScintilla.cmake 
b/cmake/modules/FindQScintilla.cmake
+index c4592d0..92754b4 100644
+--- a/cmake/modules/FindQScintilla.cmake
 b/cmake/modules/FindQScintilla.cmake
+@@ -10,22 +10,19 @@
+ #
+ # Redistribution and use is allowed according to the terms of the FreeBSD 
license.
+ 
+-IF(NOT QT4_FOUND)
+-INCLUDE(FindQt4)
+-ENDIF(NOT QT4_FOUND)
+-
+ SET(QSCINTILLA_FOUND FALSE)
+ 
+-IF(QT4_FOUND)
+-FIND_PATH(QSCINTILLA_INCLUDE_DIR qsciglobal.h
+-"${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci
++IF(Qt5_FOUND)
++FIND_PATH(QSCINTILLA_INCLUDE_DIR qsciglobal.h
++HINTS ${Qt5Core_INCLUDE_DIRS}
++PATH_SUFFIXES Qsci
+ )
+ 
+-SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2)
+-FIND_LIBRARY(QSCINTILLA_LIBRARY
+-NAMES ${QSCINTILLA_NAMES}
+-PATHS ${QT_LIBRARY_DIR}
+-)
++SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 
qscintilla2_qt5 libqscintilla2_qt5)
++FIND_LIBRARY(QSCINTILLA_LIBRARY
++NAMES ${QSCINTILLA_NAMES}
++HINTS ${Qt5Core_LIBRARIES}
++)
+ 
+ IF (QSCINTILLA_LIBRARY AND QSCINTILLA_INCLUDE_DIR)
+ 
+@@ -41,7 +34,7 @@ IF(QT4_FOUND)
+ ENDIF (CYGWIN)
+ 
+ ENDIF (QSCINTILLA_LIBRARY AND QSCINTILLA_INCLUDE_DIR)
+-ENDIF(QT4_FOUND)
++ENDIF(Qt5_FOUND)
+ 
+ IF (QSCINTILLA_FOUND)
+   IF (NOT QScintilla_FIND_QUIETLY)
+diff --git a/sqliteman/CMakeLists.txt b/sqliteman/CMakeLists.txt
+index c9154a7..13397ee 100644
+--- a/sqliteman/CMakeLists.txt
 b/sqliteman/CMakeLists.txt
+@@ -139,12 +139,12 @@ IF (WANT_RESOURCES)
+ )
+ ENDIF (WANT_RESOURCES)
+ SET (SQLITEMAN_RCS ${SQLITEMAN_RCS} api/api.qrc)
+-QT4_ADD_RESOURCES( SQLITEMAN_RC_RCS ${SQLITEMAN_RCS} )
++QT5_ADD_RESOURCES( SQLITEMAN_RC_RCS ${SQLITEMAN_RCS} )
+ 
+ 
+-QT4_WRAP_UI( SQLITEMAN_UI_HDRS ${SQLITEMAN_UI} )
++QT5_WRAP_UI( SQLITEMAN_UI_HDRS ${SQLITEMAN_UI} )
+ 
+-QT4_WRAP_CPP( SQLITEMAN_MOC_SRC ${SQLITEMAN_MOC} )
++QT5_WRAP_CPP( SQLITEMAN_MOC_SRC ${SQLITEMAN_MOC} )
+ 
+ INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} )
+ INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/sqliteman )
+@@ -157,10 +157,13 @@ IF (WANT_INTERNAL_QSCINTILLA)
+ ${CMAKE_SOURCE_DIR}/sqliteman/qscintilla2/Qt4/Qsci
+ )
+ ELSE (WANT_INTERNAL_QSCINTILLA)
+-INCLUDE_DIRECTORIES( ${QSCINTILLA_INCLUDE_DIR} )
++INCLUDE_DIRECTORIES(
++${QSCINTILLA_INCLUDE_DIR}
++${Qt5Widgets_INCLUDE_DIRS}
++${Qt5Sql_INCLUDE_DIRS}
++)
+ ENDIF (WANT_INTERNAL_QSCINTILLA)
+ 
+-
+ IF (MSVC)
+ # this is a must to switch off subsystem:console (console window poping 
up)
+ # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be 
modified
+@@ -178,6 +181,6 @@ ADD_EXECUTABLE( ${EXE_NAME} ${WIN32_SUBSYSTEM}
+ )
+ 

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

[Michael Palimaka]

commit: c0f8dce59412295559db623b8ce14d3afdde742f
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jun 18 09:05:36 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jun 18 09:06:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f8dce5

dev-db/sqliteman: update HOMEPAGE

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild | 4 ++--
 dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild
index ba5759ad766..0550f0f6afa 100644
--- a/dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r2.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=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit cmake-utils
 
 DESCRIPTION="Powerful GUI manager for the Sqlite3 database"
-HOMEPAGE="http://sqliteman.sourceforge.net/;
+HOMEPAGE="https://sourceforge.net/projects/sqliteman/;
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild
index 6b05f4741a6..e591dfbd957 100644
--- a/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="Powerful GUI manager for the Sqlite3 database"
-HOMEPAGE="http://sqliteman.sourceforge.net/;
+HOMEPAGE="https://sourceforge.net/projects/sqliteman/;
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"

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

[Andreas Sturmlechner]

commit: fdfa8e286694ce2f4380ac8313a112174bdb35a8
Author: Jouni Kosonen  tukesoft  com>
AuthorDate: Sun Apr 16 17:43:09 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 16 22:27:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdfa8e28

dev-db/sqliteman: Fix building with qscintilla-2.10

Closes: https://github.com/gentoo/gentoo/pull/4431

 .../files/sqliteman-1.2.2-qscintilla-2.10.patch| 13 +
 dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild | 34 ++
 2 files changed, 47 insertions(+)

diff --git a/dev-db/sqliteman/files/sqliteman-1.2.2-qscintilla-2.10.patch 
b/dev-db/sqliteman/files/sqliteman-1.2.2-qscintilla-2.10.patch
new file mode 100644
index 000..c197ad34211
--- /dev/null
+++ b/dev-db/sqliteman/files/sqliteman-1.2.2-qscintilla-2.10.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/modules/FindQScintilla.cmake 
b/cmake/modules/FindQScintilla.cmake
+index c4592d0..7700ec4 100644
+--- a/cmake/modules/FindQScintilla.cmake
 b/cmake/modules/FindQScintilla.cmake
+@@ -21,7 +21,7 @@ IF(QT4_FOUND)
+ "${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci
+ )
+ 
+-SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2)
++SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 
qscintilla2_qt4 libqscintilla2_qt4)
+ FIND_LIBRARY(QSCINTILLA_LIBRARY
+ NAMES ${QSCINTILLA_NAMES}
+ PATHS ${QT_LIBRARY_DIR}

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild
new file mode 100644
index 000..6b05f4741a6
--- /dev/null
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Powerful GUI manager for the Sqlite3 database"
+HOMEPAGE="http://sqliteman.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+   dev-qt/qtcore:4
+   dev-qt/qtgui:4
+   dev-qt/qtsql:4[sqlite]
+   x11-libs/qscintilla:=[qt4(-)]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${P}-lpthread.patch"
+   "${FILESDIR}/${P}-qscintilla-2.10.patch"
+)
+
+src_prepare() {
+   # remove bundled lib
+   rm -rf "${S}"/${PN}/qscintilla2 || die
+
+   cmake-utils_src_prepare
+}

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

[David Seifert]

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

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

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

 .../{sqliteman-1.2.2-r1.ebuild => sqliteman-1.2.2-r2.ebuild}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild
similarity index 89%
rename from dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild
rename to dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild
index e10a0ca..b91d182 100644
--- a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r2.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
dev-qt/qtcore:4
dev-qt/qtgui:4
dev-qt/qtsql:4[sqlite]
-   x11-libs/qscintilla"
+   x11-libs/qscintilla:=[qt4(-)]"
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README )
@@ -27,7 +27,7 @@ PATCHES=( "${FILESDIR}/${P}-lpthread.patch" )
 
 src_prepare() {
# remove bundled lib
-   rm -rf "${S}"/${PN}/qscintilla2
+   rm -rf "${S}"/${PN}/qscintilla2 || die
 
cmake-utils_src_prepare
 }

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

[Michael Palimaka]

commit: 641226130f6ee8b1e390db562276c6f9045193ea
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jun 29 18:25:13 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jun 29 18:27:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64122613

dev-db/sqliteman: add patch to solve build failure on uclibc caused by 
underlinking

Gentoo-bug: 587076

Package-Manager: portage-2.3.0

 dev-db/sqliteman/files/sqliteman-1.2.2-lpthread.patch | 19 +++
 dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild|  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/dev-db/sqliteman/files/sqliteman-1.2.2-lpthread.patch 
b/dev-db/sqliteman/files/sqliteman-1.2.2-lpthread.patch
new file mode 100644
index 000..a9bf4f4
--- /dev/null
+++ b/dev-db/sqliteman/files/sqliteman-1.2.2-lpthread.patch
@@ -0,0 +1,19 @@
+Resolves underlinking issue causing build failure on uclibc.
+
+Author: René Rhéaume 
+Gentoo-bug: 587076
+
+--- a/sqliteman/CMakeLists.txt
 b/sqliteman/CMakeLists.txt
+@@ -183,7 +183,10 @@ IF (WIN32)
+ # don't use console subsystem
+ IF (MINGW)
+ TARGET_LINK_LIBRARIES(${EXE_NAME} "-mwindows")
+-  ENDIF (MINGW)
++ENDIF (MINGW)
++ELSE (WIN32)
++  FIND_PACKAGE(Threads)
++  TARGET_LINK_LIBRARIES(${EXE_NAME} ${CMAKE_THREAD_LIBS_INIT})
+ ENDIF (WIN32)
+ 
+ 

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild
index edadcb7..e10a0ca 100644
--- a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r1.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$
 
@@ -23,6 +23,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README )
+PATCHES=( "${FILESDIR}/${P}-lpthread.patch" )
 
 src_prepare() {
# remove bundled lib

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

[Markus Meier]

commit: 24cf0632de4ab8a6273f681851725e60e164
Author: Markus Meier  gentoo  org>
AuthorDate: Fri Feb 26 17:18:59 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Fri Feb 26 17:18:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24cf0632

dev-db/sqliteman: add ~arm, bug #572046

Package-Manager: portage-2.2.27
RepoMan-Options: --include-arches="arm"

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

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild
index 8df2316..edadcb7 100644
--- a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="

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

[Agostino Sarubbo]

commit: 762a420c9c00b38a5bb0cacf18e211ea6f3fabfb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Dec  3 13:27:26 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Dec  3 13:27:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=762a420c

dev-db/sqliteman: x86 stable wrt bug #566240

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

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

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild
index f6adf6c..8df2316 100644
--- a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="

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

[Michael Palimaka]

commit: e9279b278bae00ff451cdc943755e977e4a6214c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Dec  3 13:33:56 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Dec  3 13:34:04 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9279b27

dev-db/sqliteman: remove old

Package-Manager: portage-2.2.26

 dev-db/sqliteman/sqliteman-1.2.2.ebuild | 28 
 1 file changed, 28 deletions(-)

diff --git a/dev-db/sqliteman/sqliteman-1.2.2.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2.ebuild
deleted file mode 100644
index b5908b4..000
--- a/dev-db/sqliteman/sqliteman-1.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Powerful GUI manager for the Sqlite3 database"
-HOMEPAGE="http://sqliteman.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4
-   dev-qt/qtsql:4[sqlite]
-   x11-libs/qscintilla"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS README"
-
-src_prepare() {
-   # remove bundled lib
-   rm -rf "${S}"/${PN}/qscintilla2
-}

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

[Agostino Sarubbo]

commit: d2670454f18bf428756f0e3917d57410264344d9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Nov 20 11:04:55 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Nov 20 11:04:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2670454

dev-db/sqliteman: amd64 stable wrt bug #566240

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

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

diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild 
b/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild
index 108154e..f6adf6c 100644
--- a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="