public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/qjson/
@ 2015-08-25 12:31 Davide Pesavento
  0 siblings, 0 replies; 8+ messages in thread
From: Davide Pesavento @ 2015-08-25 12:31 UTC (permalink / raw
  To: gentoo-commits

commit:     7e0c96ad93482db849b855b6c179bb64bcf400dc
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 12:31:07 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 12:31:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e0c96ad

dev-libs/qjson: use qt4_get_bindir()

Package-Manager: portage-2.2.20.1

 dev-libs/qjson/qjson-0.8.1-r1.ebuild | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dev-libs/qjson/qjson-0.8.1-r1.ebuild b/dev-libs/qjson/qjson-0.8.1-r1.ebuild
index 71fde45..cfbc2b8 100644
--- a/dev-libs/qjson/qjson-0.8.1-r1.ebuild
+++ b/dev-libs/qjson/qjson-0.8.1-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit cmake-multilib multilib
+inherit cmake-multilib multilib qmake-utils
 
 DESCRIPTION="A library for mapping JSON data to QVariant objects"
 HOMEPAGE="http://qjson.sourceforge.net"
@@ -24,8 +24,8 @@ DOCS=( ChangeLog README.md )
 
 multilib_src_configure() {
 	local mycmakeargs=(
+		-DQT_QMAKE_EXECUTABLE="$(qt4_get_bindir)/qmake"
 		$(cmake-utils_use test QJSON_BUILD_TESTS)
-		-DQT_QMAKE_EXECUTABLE=/usr/$(get_libdir)/qt4/bin/qmake
 	)
 
 	cmake-utils_src_configure
@@ -33,9 +33,10 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	cmake-utils_src_compile
+
 	use doc && if is_final_abi; then
-		cd "${S}"/doc || die "Failed to move inside doc directory"
-		doxygen Doxyfile || die "Generating documentation failed"
+		cd "${S}"/doc || die
+		doxygen Doxyfile || die
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/qjson/
@ 2015-08-25 13:03 Mikle Kolyada
  0 siblings, 0 replies; 8+ messages in thread
From: Mikle Kolyada @ 2015-08-25 13:03 UTC (permalink / raw
  To: gentoo-commits

commit:     91fc1f579c1a9f5c48dec94b1753e69197d086b1
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 13:00:53 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 13:00:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91fc1f57

dev-libs/qjson: amd64 stable wrt bug #558656

Package-Manager: portage-2.2.20.1

 dev-libs/qjson/qjson-0.8.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/qjson/qjson-0.8.1-r1.ebuild b/dev-libs/qjson/qjson-0.8.1-r1.ebuild
index cfbc2b8..d659325 100644
--- a/dev-libs/qjson/qjson-0.8.1-r1.ebuild
+++ b/dev-libs/qjson/qjson-0.8.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://github/flavio/qjson/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc test"
 
 RDEPEND=">=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]"


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/qjson/
@ 2015-08-27  8:26 Jeroen Roovers
  0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2015-08-27  8:26 UTC (permalink / raw
  To: gentoo-commits

commit:     868017df5f224661280e09f2b6d923fac85c5ede
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 08:26:03 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 08:26:03 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868017df

dev-libs/qjson: Stable for HPPA PPC64 (bug #558656).

Package-Manager: portage-2.2.20.1

 dev-libs/qjson/qjson-0.8.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/qjson/qjson-0.8.1-r1.ebuild b/dev-libs/qjson/qjson-0.8.1-r1.ebuild
index d659325..60ff196 100644
--- a/dev-libs/qjson/qjson-0.8.1-r1.ebuild
+++ b/dev-libs/qjson/qjson-0.8.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://github/flavio/qjson/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc test"
 
 RDEPEND=">=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]"


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/qjson/
@ 2015-09-20 11:12 Davide Pesavento
  0 siblings, 0 replies; 8+ messages in thread
From: Davide Pesavento @ 2015-09-20 11:12 UTC (permalink / raw
  To: gentoo-commits

commit:     623d9b8cfc6d5c4d193b0a30c3d86f9b255b7fa2
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 11:12:06 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 11:12:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=623d9b8c

dev-libs/qjson: remove old

Package-Manager: portage-2.2.20.1

 dev-libs/qjson/qjson-0.8.1.ebuild | 41 ---------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/dev-libs/qjson/qjson-0.8.1.ebuild b/dev-libs/qjson/qjson-0.8.1.ebuild
deleted file mode 100644
index 1591cc1..0000000
--- a/dev-libs/qjson/qjson-0.8.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A library for mapping JSON data to QVariant objects"
-HOMEPAGE="http://qjson.sourceforge.net"
-SRC_URI="mirror://github/flavio/qjson/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug doc test"
-
-RDEPEND="dev-qt/qtcore:4"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-qt/qttest:4 )"
-
-DOCS=( ChangeLog README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use test QJSON_BUILD_TESTS)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use doc; then
-		cd doc
-		doxygen Doxyfile || die "Generating documentation failed"
-		HTML_DOCS=( doc/html/ )
-	fi
-
-	cmake-utils_src_install
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/qjson/
@ 2016-11-13 19:07 Markus Meier
  0 siblings, 0 replies; 8+ messages in thread
From: Markus Meier @ 2016-11-13 19:07 UTC (permalink / raw
  To: gentoo-commits

commit:     a30d0bc6b62f5691329e24475a0d5cb11124bf33
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 13 19:06:01 2016 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 19:06:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a30d0bc6

dev-libs/qjson: arm stable, bug #530720

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

 dev-libs/qjson/qjson-0.8.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/qjson/qjson-0.8.1-r1.ebuild b/dev-libs/qjson/qjson-0.8.1-r1.ebuild
index 2c6bbfa..5c8642c 100644
--- a/dev-libs/qjson/qjson-0.8.1-r1.ebuild
+++ b/dev-libs/qjson/qjson-0.8.1-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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://github/flavio/qjson/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc test"
 
 RDEPEND=">=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]"


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/qjson/
@ 2017-10-30 23:33 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2017-10-30 23:33 UTC (permalink / raw
  To: gentoo-commits

commit:     bc962d859501512280c1d5a345f1c615996c9ef3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 21:50:59 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 23:31:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc962d85

dev-libs/qjson: De-stabilise hppa

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-libs/qjson/qjson-0.8.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/qjson/qjson-0.8.1-r1.ebuild b/dev-libs/qjson/qjson-0.8.1-r1.ebuild
index 500f2d60c8e..85aaab21daf 100644
--- a/dev-libs/qjson/qjson-0.8.1-r1.ebuild
+++ b/dev-libs/qjson/qjson-0.8.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=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://github/flavio/qjson/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc test"
 
 RDEPEND=">=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]"


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/qjson/
@ 2017-12-08 21:58 Thomas Deutschmann
  0 siblings, 0 replies; 8+ messages in thread
From: Thomas Deutschmann @ 2017-12-08 21:58 UTC (permalink / raw
  To: gentoo-commits

commit:     07ad40246a59b78ce5191e3963de00c860f79c22
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  8 21:32:54 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Dec  8 21:58:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ad4024

dev-libs/qjson: x86 stable (bug #636638)

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-libs/qjson/qjson-0.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/qjson/qjson-0.9.0.ebuild b/dev-libs/qjson/qjson-0.9.0.ebuild
index b7f01765341..a3a5261397c 100644
--- a/dev-libs/qjson/qjson-0.9.0.ebuild
+++ b/dev-libs/qjson/qjson-0.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flavio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc test"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/qjson/
@ 2017-12-16 23:15 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2017-12-16 23:15 UTC (permalink / raw
  To: gentoo-commits

commit:     3655f77feb76223b7e1be81301a5bbc399c331f9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 23:13:17 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 23:15:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3655f77f

dev-libs/qjson: Drop old

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

 dev-libs/qjson/Manifest              |  1 -
 dev-libs/qjson/qjson-0.8.1-r1.ebuild | 47 ------------------------------------
 2 files changed, 48 deletions(-)

diff --git a/dev-libs/qjson/Manifest b/dev-libs/qjson/Manifest
index 46e42271541..3063e9e265f 100644
--- a/dev-libs/qjson/Manifest
+++ b/dev-libs/qjson/Manifest
@@ -1,2 +1 @@
-DIST qjson-0.8.1.tar.bz2 64398 BLAKE2B 42a7febf360fb4728660b8bcac8a736784f9ce912eabea3609420921399291bca8f98c5b74e8e0b71c93d9b7f9614458451073ff3704a7e373ae27e327d3d0fa SHA512 03e65bbdf6d397f77319867a03377deb419eac46ad91bc06abb7bc68d8f8f2e490db87d909ce51e065f22e5d201f1f73d57f72e14bc378580dbf40b855f1bc72
 DIST qjson-0.9.0.tar.gz 98300 BLAKE2B 9c8624f9bfe9f88d0b4c48ec90ac5d57631a1468a1dbd4845907b94d63d94a0bad8fec7b511fc8ae024a7e1c2d6bf04aeff02251af7df3c037c1b438e3a2e985 SHA512 ff0674f32abc6c88f9c535a58931f60baafa355655b043009a2574dadb822f10ec25017b78f2911f897a554a34733d7332c94cf4290dec16a631e22070c15e61

diff --git a/dev-libs/qjson/qjson-0.8.1-r1.ebuild b/dev-libs/qjson/qjson-0.8.1-r1.ebuild
deleted file mode 100644
index 85aaab21daf..00000000000
--- a/dev-libs/qjson/qjson-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib multilib qmake-utils
-
-DESCRIPTION="A library for mapping JSON data to QVariant objects"
-HOMEPAGE="http://qjson.sourceforge.net"
-SRC_URI="mirror://github/flavio/qjson/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug doc test"
-
-RDEPEND=">=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] )"
-
-DOCS=( ChangeLog README.md )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DQT_QMAKE_EXECUTABLE="$(qt4_get_bindir)/qmake"
-		$(cmake-utils_use test QJSON_BUILD_TESTS)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	use doc && if is_final_abi; then
-		cd "${S}"/doc || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		HTML_DOCS=( doc/html/ )
-		einstalldocs
-	fi
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2017-12-16 23:15 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-08 21:58 [gentoo-commits] repo/gentoo:master commit in: dev-libs/qjson/ Thomas Deutschmann
  -- strict thread matches above, loose matches on Subject: below --
2017-12-16 23:15 Andreas Sturmlechner
2017-10-30 23:33 Andreas Sturmlechner
2016-11-13 19:07 Markus Meier
2015-09-20 11:12 Davide Pesavento
2015-08-27  8:26 Jeroen Roovers
2015-08-25 13:03 Mikle Kolyada
2015-08-25 12:31 Davide Pesavento

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox