[gentoo-commits] proj/kde:master commit in: media-libs/prison/
commit: 300972415d13cb8f2dd37c9aa5c38985467e88cb Author: Andreas Sturmlechner gmail com> AuthorDate: Wed Aug 10 07:13:50 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Aug 10 15:35:17 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=30097241 media-libs/prison: Frameworks merged to master Package-Manager: portage-2.2.28 media-libs/prison/prison-.ebuild | 9 + 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/media-libs/prison/prison-.ebuild b/media-libs/prison/prison-.ebuild index 46799bf..2a2289b 100644 --- a/media-libs/prison/prison-.ebuild +++ b/media-libs/prison/prison-.ebuild @@ -4,11 +4,10 @@ EAPI=6 -EGIT_BRANCH="frameworks" inherit kde5 DESCRIPTION="QRCode and data matrix barcode library" -HOMEPAGE="https://projects.kde.org/projects/kdesupport/prison"; +HOMEPAGE="https://quickgit.kde.org/?p=prison.git"; LICENSE="GPL-2" KEYWORDS="" @@ -20,9 +19,3 @@ DEPEND=" media-libs/libdmtx " RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=(-DQT5_BUILD=TRUE) - - kde5_src_configure -}
[gentoo-commits] proj/kde:master commit in: media-libs/prison/files/, media-libs/prison/
commit: 426c38ac4c36271ba40a89710a2804d42ade1498 Author: Michael Palimaka gentoo org> AuthorDate: Sun Aug 7 16:57:19 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Aug 7 16:57:37 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=426c38ac media-libs/prison: drop obsolete patch Upstream-commit: 202413b7892febb6ba794a49f758732d98011c10 Package-Manager: portage-2.3.0 media-libs/prison/files/prison-disable-testapp.patch | 20 media-libs/prison/prison-.ebuild | 2 -- 2 files changed, 22 deletions(-) diff --git a/media-libs/prison/files/prison-disable-testapp.patch b/media-libs/prison/files/prison-disable-testapp.patch deleted file mode 100644 index aed8971..000 --- a/media-libs/prison/files/prison-disable-testapp.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9afe09b..0ed53b6 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,13 +24,13 @@ set(QT_REQUIRED_VERSION "5.2.0") - - find_package(Qt5Core ${QT_REQUIRED_VERSION} CONFIG REQUIRED) - find_package(Qt5Gui ${QT_REQUIRED_VERSION} CONFIG REQUIRED) --find_package(Qt5Test ${QT_REQUIRED_VERSION} CONFIG REQUIRED) -+# find_package(Qt5Test ${QT_REQUIRED_VERSION} CONFIG REQUIRED) - - if (Qt5_POSITION_INDEPENDENT_CODE) - set(CMAKE_POSITION_INDEPENDENT_CODE ON) - endif() - - add_subdirectory(lib) --add_subdirectory(testapp) -+# add_subdirectory(testapp) - - add_subdirectory(tools) diff --git a/media-libs/prison/prison-.ebuild b/media-libs/prison/prison-.ebuild index 683c453..46799bf 100644 --- a/media-libs/prison/prison-.ebuild +++ b/media-libs/prison/prison-.ebuild @@ -21,8 +21,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-disable-testapp.patch" ) - src_configure() { local mycmakeargs=(-DQT5_BUILD=TRUE)
[gentoo-commits] proj/kde:master commit in: media-libs/prison/
commit: 0d5029a6ce895527303d3c2c6c78797cd943b0f6 Author: Johannes Huber gentoo org> AuthorDate: Wed Mar 23 17:23:03 2016 + Commit: Johannes Huber gentoo org> CommitDate: Wed Mar 23 17:23:03 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0d5029a6 media-libs/prison: EAPI 6 Package-Manager: portage-2.2.28 media-libs/prison/prison-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/prison/prison-.ebuild b/media-libs/prison/prison-.ebuild index 0fd14df..683c453 100644 --- a/media-libs/prison/prison-.ebuild +++ b/media-libs/prison/prison-.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 EGIT_BRANCH="frameworks" inherit kde5
[gentoo-commits] proj/kde:master commit in: media-libs/prison/files/, media-libs/prison/
commit: 270d5ec2bb4d2a48fcb03ad3ab095863fc128bb4 Author: Johannes Huber gentoo org> AuthorDate: Fri Feb 20 22:15:59 2015 + Commit: Johannes Huber gentoo org> CommitDate: Fri Feb 20 22:16:19 2015 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=270d5ec2 [media-libs/prison] Use frameworks branch Package-Manager: portage-2.2.17 --- .../prison/files/prison-disable-testapp.patch | 20 media-libs/prison/prison-4..ebuild | 21 - media-libs/prison/prison-.ebuild| 12 ++-- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/media-libs/prison/files/prison-disable-testapp.patch b/media-libs/prison/files/prison-disable-testapp.patch new file mode 100644 index 000..aed8971 --- /dev/null +++ b/media-libs/prison/files/prison-disable-testapp.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9afe09b..0ed53b6 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -24,13 +24,13 @@ set(QT_REQUIRED_VERSION "5.2.0") + + find_package(Qt5Core ${QT_REQUIRED_VERSION} CONFIG REQUIRED) + find_package(Qt5Gui ${QT_REQUIRED_VERSION} CONFIG REQUIRED) +-find_package(Qt5Test ${QT_REQUIRED_VERSION} CONFIG REQUIRED) ++# find_package(Qt5Test ${QT_REQUIRED_VERSION} CONFIG REQUIRED) + + if (Qt5_POSITION_INDEPENDENT_CODE) + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + endif() + + add_subdirectory(lib) +-add_subdirectory(testapp) ++# add_subdirectory(testapp) + + add_subdirectory(tools) diff --git a/media-libs/prison/prison-4..ebuild b/media-libs/prison/prison-4..ebuild deleted file mode 100644 index 632f7b9..000 --- a/media-libs/prison/prison-4..ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit kde4-base - -DESCRIPTION="QRCode and data matrix barcode library" -HOMEPAGE="https://projects.kde.org/projects/kdesupport/prison"; - -LICENSE="GPL-2" -KEYWORDS="" -SLOT="4" -IUSE="debug" - -DEPEND=" - media-gfx/qrencode - media-libs/libdmtx -" -RDEPEND="${DEPEND}" diff --git a/media-libs/prison/prison-.ebuild b/media-libs/prison/prison-.ebuild index 357d11c..2e42ba3 100644 --- a/media-libs/prison/prison-.ebuild +++ b/media-libs/prison/prison-.ebuild @@ -4,6 +4,7 @@ EAPI=5 +EGIT_BRANCH="frameworks" inherit kde5 DESCRIPTION="QRCode and data matrix barcode library" @@ -14,17 +15,16 @@ KEYWORDS="" IUSE="" DEPEND=" + dev-qt/qtgui:5 media-gfx/qrencode media-libs/libdmtx " -RDEPEND="${DEPEND} - !media-libs/prison:4 -" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-disable-testapp.patch" ) src_configure() { - local mycmakeargs=( - -DQT5_BUILD=TRUE - ) + local mycmakeargs=(-DQT5_BUILD=TRUE) kde5_src_configure }
[gentoo-commits] proj/kde:master commit in: media-libs/prison/
commit: 0bbd1ed8deadc91bb26a25312b74f86b4544ed1a Author: Johannes Huber gentoo org> AuthorDate: Sun May 25 15:10:57 2014 + Commit: Johannes Huber gentoo org> CommitDate: Sun May 25 15:10:57 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0bbd1ed8 [media-libs/prison] Qt5 version Package-Manager: portage-2.2.10 --- .../prison/{prison-.ebuild => prison-4..ebuild} | 0 media-libs/prison/prison-.ebuild| 17 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/media-libs/prison/prison-.ebuild b/media-libs/prison/prison-4..ebuild similarity index 100% copy from media-libs/prison/prison-.ebuild copy to media-libs/prison/prison-4..ebuild diff --git a/media-libs/prison/prison-.ebuild b/media-libs/prison/prison-.ebuild index 967dedb..b678046 100644 --- a/media-libs/prison/prison-.ebuild +++ b/media-libs/prison/prison-.ebuild @@ -4,18 +4,27 @@ EAPI=5 -inherit kde4-base +inherit kde5 DESCRIPTION="QRCode and data matrix barcode library" HOMEPAGE="https://projects.kde.org/projects/kdesupport/prison"; LICENSE="GPL-2" KEYWORDS="" -SLOT="4" -IUSE="debug" +IUSE="" DEPEND=" media-gfx/qrencode media-libs/libdmtx " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !media-libs/prison:4 +" + +src_configure() { + local mycmakeargs=( + -DQT5_BUILD=TRUE + ) + + kde5_src_configure +}