From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1294418-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 2F1C81382C5
for <garchives@archives.gentoo.org>; Thu, 17 Jun 2021 06:49:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 84BCEE0830;
Thu, 17 Jun 2021 06:49:27 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5944BE0830
for <gentoo-commits@lists.gentoo.org>; Thu, 17 Jun 2021 06:49:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 475A93404AD
for <gentoo-commits@lists.gentoo.org>; Thu, 17 Jun 2021 06:49:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8087E7B2
for <gentoo-commits@lists.gentoo.org>; Thu, 17 Jun 2021 06:49:23 +0000 (UTC)
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" <juippis@gentoo.org>
Message-ID: <1623912556.0de2acd7622eadf7cbe67c80844c605a068bcdfb.juippis@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/files/, dev-db/sqlitebrowser/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-db/sqlitebrowser/Manifest dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
X-VCS-Directories: dev-db/sqlitebrowser/ dev-db/sqlitebrowser/files/
X-VCS-Committer: juippis
X-VCS-Committer-Name: Joonas Niilola
X-VCS-Revision: 0de2acd7622eadf7cbe67c80844c605a068bcdfb
X-VCS-Branch: master
Date: Thu, 17 Jun 2021 06:49:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: ee9a5aa6-ecae-4581-ac8a-a52449e04efb
X-Archives-Hash: 5df1e8605df4a6a2f01f90ff3adcc60a
commit: 0de2acd7622eadf7cbe67c80844c605a068bcdfb
Author: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail <DOT> com>
AuthorDate: Sun May 30 17:11:13 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun 17 06:49:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de2acd7
dev-db/sqlitebrowser: remove old
Signed-off-by: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail.com>
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Joonas Niilola <juippis <AT> 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..00000000000
--- 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.cmake 2019-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.txt 2019-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 -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2_qt5
-
- unix {
- # Below, the user can specify where all generated file can be placed
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
deleted file mode 100644
index 9264df0706c..00000000000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake 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"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- 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(+)]
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtwidgets:5
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- dev-qt/qtprintsupport:5
- dev-qt/qtxml:5
-
-"
-RDEPEND="${DEPEND}
- dev-qt/qtsvg:5
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.11.1-unbundle.patch )
-
-src_prepare() {
- cmake_src_prepare
- rm -r libs || die
- sed -i 's#"src/qhexedit.h"#<qhexedit.h>#' src/EditDialog.cpp || die
- #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 "/find_package/ s/ Test//" -i CMakeLists.txt || die
- sed -e "/set/ s/ Qt5::Test//" -i CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_TESTING=$(usex test)
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- doicon images/sqlitebrowser.svg
-}