[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2023-12-21 Thread Sam James
commit: 76b0dad5cf084cd4cf11098844bc5a89a51b8540
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 21 16:14:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 21 16:14:43 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=76b0dad5

dev-libs/appstream: fix qt6 test deps

No need for USE=test for this, that's just for building qt's tests.

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

 dev-libs/appstream/appstream-.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index bde07617b8..ba6c4e52a5 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -36,9 +36,7 @@ RDEPEND="
qt6? ( dev-qt/qtbase:6 )
systemd? ( sys-apps/systemd:= )
 "
-DEPEND="${RDEPEND}
-   test? ( qt6? ( dev-qt/qtbase:6[test] ) )
-"
+DEPEND="${RDEPEND}"
 BDEPEND="
dev-libs/appstream-glib
dev-libs/libxslt



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/files/, dev-libs/appstream/

2023-11-28 Thread Andreas Sturmlechner
commit: 33086404d42b4a6fea1cca7766e9fc911140f542
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 28 21:40:53 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 28 22:10:12 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=33086404

dev-libs/appstream: Switch to Qt6, bump subslot, add new dependency

Rebase disable-Werror-flags.patch

Bug: https://bugs.gentoo.org/914646
Closes: https://bugs.gentoo.org/914610
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-libs/appstream/appstream-.ebuild   | 23 ++-
 .../appstream-0.14.3-disable-Werror-flags.patch| 12 --
 .../appstream-1.0.0-disable-Werror-flags.patch | 47 ++
 3 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index cf8b0253b6..bde07617b8 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
 else
MY_PN="AppStream"

SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz;
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
@@ -20,22 +20,24 @@ 
HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/;
 
 LICENSE="LGPL-2.1+ GPL-2+"
 # check as_api_level
-SLOT="0/4"
-IUSE="apt doc +introspection qt5 test"
+SLOT="0/5"
+IUSE="apt doc +introspection qt6 systemd test"
 RESTRICT="test" # bug 691962
 
 RDEPEND="
+   app-arch/zstd:=
>=dev-libs/glib-2.62:2
dev-libs/libxml2:2
-   >=dev-libs/libxmlb-0.3.6:=
+   >=dev-libs/libxmlb-0.3.14:=
dev-libs/libyaml
dev-libs/snowball-stemmer:=
>=net-misc/curl-7.62
introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-   qt5? ( dev-qt/qtcore:5 )
+   qt6? ( dev-qt/qtbase:6 )
+   systemd? ( sys-apps/systemd:= )
 "
 DEPEND="${RDEPEND}
-   test? ( qt5? ( dev-qt/qttest:5 ) )
+   test? ( qt6? ( dev-qt/qtbase:6[test] ) )
 "
 BDEPEND="
dev-libs/appstream-glib
@@ -43,12 +45,10 @@ BDEPEND="
dev-util/itstool
>=sys-devel/gettext-0.19.8
doc? ( app-text/docbook-xml-dtd:4.5 )
-   test? ( dev-qt/linguist-tools:5 )
+   test? ( dev-qt/qttools:6[linguist] )
 "
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.14.3-disable-Werror-flags.patch # bug 733774
-)
+PATCHES=( "${FILESDIR}"/${PN}-1.0.0-disable-Werror-flags.patch ) # bug 733774
 
 src_prepare() {
default
@@ -72,7 +72,8 @@ src_configure() {
-Dapt-support=$(usex apt true false)
-Dinstall-docs=$(usex doc true false)
-Dgir=$(usex introspection true false)
-   -Dqt=$(usex qt5 true false)
+   -Dqt=$(usex qt6 true false)
+   -Dsystemd=$(usex systemd true false)
)
 
meson_src_configure

diff --git 
a/dev-libs/appstream/files/appstream-0.14.3-disable-Werror-flags.patch 
b/dev-libs/appstream/files/appstream-0.14.3-disable-Werror-flags.patch
deleted file mode 100644
index 4e5a117061..00
--- a/dev-libs/appstream/files/appstream-0.14.3-disable-Werror-flags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 a/meson.build
-+++ b/meson.build
-@@ -52,9 +52,6 @@
- add_project_arguments(maintainer_c_args, language: 'cpp')
- endif
- 
--# a few compiler warning flags we always want enabled
--add_project_arguments('-Werror=implicit-function-declaration', 
'-Wno-unused-parameter', language: 'c')
--add_project_arguments('-Wno-unused-parameter', language: 'cpp')
- add_project_arguments('-DAS_COMPILATION', language: 'c')
- 
- # Vendor extensions in system headers

diff --git 
a/dev-libs/appstream/files/appstream-1.0.0-disable-Werror-flags.patch 
b/dev-libs/appstream/files/appstream-1.0.0-disable-Werror-flags.patch
new file mode 100644
index 00..309d365c28
--- /dev/null
+++ b/dev-libs/appstream/files/appstream-1.0.0-disable-Werror-flags.patch
@@ -0,0 +1,47 @@
+--- a/meson.build
 b/meson.build
+@@ -90,44 +90,6 @@
+   endif
+ endif
+ 
+-# a few compiler warning flags we always want enabled
+-add_project_arguments(
+-  cc.get_supported_arguments([
+-'-Werror=shadow',
+-'-Werror=empty-body',
+-'-Werror=strict-prototypes',
+-'-Werror=missing-prototypes',
+-'-Werror=implicit-function-declaration',
+-'-Werror=pointer-arith',
+-'-Werror=missing-declarations',
+-'-Werror=return-type',
+-'-Werror=int-conversion',
+-'-Werror=incompatible-pointer-types',
+-'-Werror=misleading-indentation',
+-'-Werror=missing-include-dirs',
+-'-Werror=declaration-after-statement',
+-'-Werror=format-security',
+-
+-'-Wno-missing-field-initializers',
+-'-Wno-error=missing-field-initializers',
+-'-Wno-unused-parameter',
+-'-Wno-error=unused-parameter',

[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2022-09-14 Thread Andreas Sturmlechner
commit: 756ae67e21e4f59ec3fbfba68dc613846df23189
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 14 07:24:53 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 14 07:25:39 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=756ae67e

dev-libs/appstream: Update dependencies for 0.15.5 release

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

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

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index b92b74a81e..cd741e46c5 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
 else
MY_PN="AppStream"

SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz;
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
@@ -25,12 +25,12 @@ IUSE="apt doc +introspection qt5 test"
 RESTRICT="test" # bug 691962
 
 RDEPEND="
-   dev-db/lmdb:=
-   >=dev-libs/glib-2.58:2
+   >=dev-libs/glib-2.62:2
dev-libs/libxml2:2
+   >=dev-libs/libxmlb-0.3.6:=
dev-libs/libyaml
dev-libs/snowball-stemmer:=
-   net-misc/curl
+   >=net-misc/curl-7.62
introspection? ( >=dev-libs/gobject-introspection-1.56:= )
qt5? ( dev-qt/qtcore:5 )
 "
@@ -66,6 +66,7 @@ src_configure() {
-Ddocs=false
-Dcompose=false
-Dmaintainer=false
+   -Dstatic-analysis=false
-Dstemming=true
-Dvapi=false
-Dapt-support=$(usex apt true false)



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2022-09-14 Thread Andreas Sturmlechner
commit: 8ef5df9c067fde19404c77d1a12f31611aafc319
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Sep 16 09:27:44 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 14 06:41:07 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8ef5df9c

dev-libs/appstream: keyword 0.14.5 for ~riscv

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

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

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 035517337d..899e3ef181 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
 else
MY_PN="AppStream"

SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz;
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2022-09-14 Thread Andreas Sturmlechner
commit: 7f64e2b64ce88814c0f10e9d7e01a499dc8c6a5d
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Jan 25 22:12:18 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 14 06:38:43 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f64e2b6

dev-libs/appstream: keyword on ~ppc64

1/7 as-test_basic   OK   0.03 s
2/7 as-test_xml OK   0.03 s
3/7 as-test_yamlOK   0.04 s
4/7 as-test_poolOK   0.09 s
5/7 as-test_validateOK   0.03 s
6/7 as-test_perfOK   0.03 s
7/7 as-test_miscOK   0.02 s

Ok:7
Expected Fail: 0
Fail:  0
Unexpected Pass:   0
Skipped:   0
Timeout:   0
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 595477b561..035517337d 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
 else
MY_PN="AppStream"

SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz;
-   KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2022-09-14 Thread Andreas Sturmlechner
commit: 12326a591dc95e392b029e5bb9d9adc9a1b46cbc
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Apr  6 06:43:28 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 14 06:41:45 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=12326a59

dev-libs/appstream: Keyword 0.14.6 ppc

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

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

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 899e3ef181..b92b74a81e 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
 else
MY_PN="AppStream"

SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz;
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2022-09-13 Thread Andreas Sturmlechner
commit: e63913737fb1741975b20ffb82eacb328b31bb66
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Sep 13 18:37:56 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 13 19:25:01 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e6391373

dev-libs/appstream: Add IUSE doc, add missing and cleanup BDEPEND

Backport from Gentoo ebuild repo; introduced with 0.12.9 version bump.

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

 dev-libs/appstream/appstream-.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 3de4ee41a3..11de9316c1 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -21,7 +21,7 @@ 
HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/;
 LICENSE="LGPL-2.1+ GPL-2+"
 # check as_api_level
 SLOT="0/4"
-IUSE="apt +introspection qt5 test"
+IUSE="apt doc +introspection qt5 test"
 
 RESTRICT="!test? ( test )"
 
@@ -39,11 +39,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-   app-text/docbook-xml-dtd:4.5
dev-libs/appstream-glib
+   dev-libs/libxslt
dev-util/itstool
-   >=dev-util/meson-0.42.0
>=sys-devel/gettext-0.19.8
+   doc? ( app-text/docbook-xml-dtd:4.5 )
test? ( dev-qt/linguist-tools:5 )
 "
 
@@ -65,6 +65,7 @@ src_configure() {
-Dstemming=true
-Dvapi=false
-Dapt-support=$(usex apt true false)
+   -Dinstall-docs=$(usex doc true false)
-Dgir=$(usex introspection true false)
-Dqt=$(usex qt5 true false)
)



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2022-09-13 Thread Andreas Sturmlechner
commit: f6f0609b50da9425d34ca5e7512c6e46cf85f15a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec  5 22:58:00 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 13 19:25:02 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f6f0609b

dev-libs/appstream: test remains broken

Bug: https://bugs.gentoo.org/691962
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-libs/appstream/appstream-.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index e06e8d177c..21d9383262 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -22,8 +22,7 @@ LICENSE="LGPL-2.1+ GPL-2+"
 # check as_api_level
 SLOT="0/4"
 IUSE="apt doc +introspection qt5 test"
-
-RESTRICT="!test? ( test )"
+RESTRICT="test" # bug 691962
 
 RDEPEND="
dev-db/lmdb:=



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2022-09-13 Thread Andreas Sturmlechner
commit: 0cc87e71040d35de43ea01c7e22580713020c6ce
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Sep 13 19:03:51 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 13 19:25:02 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0cc87e71

dev-libs/appstream: Update DEPEND, meson args

Backport from Gentoo ebuild repo; introduced with 0.14.3 version bump.

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

 dev-libs/appstream/appstream-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 21d9383262..53ddd3f800 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
dev-libs/libxml2:2
dev-libs/libyaml
dev-libs/snowball-stemmer
-   >=net-libs/libsoup-2.56:2.4
+   net-misc/curl
introspection? ( >=dev-libs/gobject-introspection-1.56:= )
qt5? ( dev-qt/qtcore:5 )
 "
@@ -60,6 +60,7 @@ src_configure() {
local emesonargs=(
-Dapidocs=false
-Ddocs=false
+   -Dcompose=false
-Dmaintainer=false
-Dstemming=true
-Dvapi=false



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2022-09-13 Thread Andreas Sturmlechner
commit: cc4c649e593e120ae7e773127aa28f3d48a5305c
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug 27 20:45:08 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 13 19:25:02 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cc4c649e

dev-libs/appstream: subscribe to snowball-stemmer subslot

We need to be rebuilt when snowball-stemmer changes ABI.

Bug: https://bugs.gentoo.org/719402
Signed-off-by: Sam James  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 8e73bd4596..595477b561 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
>=dev-libs/glib-2.58:2
dev-libs/libxml2:2
dev-libs/libyaml
-   dev-libs/snowball-stemmer
+   dev-libs/snowball-stemmer:=
net-misc/curl
introspection? ( >=dev-libs/gobject-introspection-1.56:= )
qt5? ( dev-qt/qtcore:5 )



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2022-09-13 Thread Andreas Sturmlechner
commit: 2785de0f2450565c828386adda3a859372fcad2f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Sep 13 18:49:09 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 13 19:25:01 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2785de0f

dev-libs/appstream: Add missing DEPEND, raise min dev-libs/glib to 2.54

Backport from Gentoo ebuild repo; introduced with 0.12.7 version bump.

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

 dev-libs/appstream/appstream-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 669548c9d8..3de4ee41a3 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -26,7 +26,8 @@ IUSE="apt +introspection qt5 test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-   dev-libs/glib:2
+   dev-db/lmdb:=
+   >=dev-libs/glib-2.54:2
dev-libs/libxml2:2
dev-libs/libyaml
dev-libs/snowball-stemmer



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2022-09-13 Thread Andreas Sturmlechner
commit: 91da170ad423a1a3bbbc1fbd098ed2f3261a4e7e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Sep 13 18:27:04 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 13 18:27:55 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=91da170a

dev-libs/appstream: add missing remote ID reference to metadata.xml

Signed-off-by: Justin Lecher  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>
(cherry-picked from Gentoo ebuild repo commit 
92715265f5e37292e57673f39c5372a268778c44)

 dev-libs/appstream/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-libs/appstream/metadata.xml b/dev-libs/appstream/metadata.xml
index 96c5a8527f..fc47b80bd7 100644
--- a/dev-libs/appstream/metadata.xml
+++ b/dev-libs/appstream/metadata.xml
@@ -8,4 +8,7 @@

Enables Debians APT support

+   
+   ximion/appstream
+   
 



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/files/, dev-libs/appstream/

2022-09-13 Thread Andreas Sturmlechner
commit: d9d2e959055b84b0bd6a4cafeea89e207f7d1aff
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar 26 20:00:50 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 13 19:25:02 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d9d2e959

dev-libs/appstream: Add disable-Werror-flags.patch

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

 dev-libs/appstream/appstream-.ebuild |  4 
 .../files/appstream-0.14.3-disable-Werror-flags.patch| 12 
 2 files changed, 16 insertions(+)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 53ddd3f800..8e73bd4596 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
test? ( dev-qt/linguist-tools:5 )
 "
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.14.3-disable-Werror-flags.patch # bug 733774
+)
+
 src_prepare() {
default
sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || 
die

diff --git 
a/dev-libs/appstream/files/appstream-0.14.3-disable-Werror-flags.patch 
b/dev-libs/appstream/files/appstream-0.14.3-disable-Werror-flags.patch
new file mode 100644
index 00..4e5a117061
--- /dev/null
+++ b/dev-libs/appstream/files/appstream-0.14.3-disable-Werror-flags.patch
@@ -0,0 +1,12 @@
+--- a/meson.build
 b/meson.build
+@@ -52,9 +52,6 @@
+ add_project_arguments(maintainer_c_args, language: 'cpp')
+ endif
+ 
+-# a few compiler warning flags we always want enabled
+-add_project_arguments('-Werror=implicit-function-declaration', 
'-Wno-unused-parameter', language: 'c')
+-add_project_arguments('-Wno-unused-parameter', language: 'cpp')
+ add_project_arguments('-DAS_COMPILATION', language: 'c')
+ 
+ # Vendor extensions in system headers



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2022-09-13 Thread Andreas Sturmlechner
commit: 5003b38bcf6b4df25dd3bf575b33757c41096378
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Sep 13 18:55:55 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 13 19:25:02 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5003b38b

dev-libs/appstream: Add missing DEPEND, raise min dev-libs/glib to 2.58

Move dev-qt/qttest:5 to DEPEND-only where it belongs.
Backport from Gentoo ebuild repo; introduced with 0.12.10 version bump.

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

 dev-libs/appstream/appstream-.ebuild | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 11de9316c1..e06e8d177c 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -25,19 +25,19 @@ IUSE="apt doc +introspection qt5 test"
 
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
dev-db/lmdb:=
-   >=dev-libs/glib-2.54:2
+   >=dev-libs/glib-2.58:2
dev-libs/libxml2:2
dev-libs/libyaml
dev-libs/snowball-stemmer
+   >=net-libs/libsoup-2.56:2.4
introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-   qt5? (
-   dev-qt/qtcore:5
-   test? ( dev-qt/qttest:5 )
-   )
+   qt5? ( dev-qt/qtcore:5 )
+"
+DEPEND="${RDEPEND}
+   test? ( qt5? ( dev-qt/qttest:5 ) )
 "
-RDEPEND="${DEPEND}"
 BDEPEND="
dev-libs/appstream-glib
dev-libs/libxslt



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2022-09-13 Thread Andreas Sturmlechner
commit: 15c2c6034d134844ec33db482a48611a7f703928
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan 24 23:16:28 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 13 18:33:13 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=15c2c603

dev-libs/appstream: Fix build with USE !test

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

 dev-libs/appstream/appstream-.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index ad3a68301a..669548c9d8 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -49,6 +49,9 @@ BDEPEND="
 src_prepare() {
default
sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || 
die
+   if ! use test; then
+   sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || 
die # bug 675944
+   fi
 }
 
 src_configure() {



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2021-08-05 Thread Andreas Sturmlechner
commit: 47d270f6631196df66da4dee74cfc5cd6c28eef2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug  5 09:37:05 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug  5 09:45:37 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=47d270f6

dev-libs/appstream: EAPI-8 bump

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

 dev-libs/appstream/appstream-.ebuild | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 2bc89c8eec..3d01a9ad62 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson xdg-utils
 
-if [[ ${PV} =  ]]; then
+if [[ ${PV} == ** ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ximion/${PN};
 else
@@ -25,14 +25,6 @@ IUSE="apt +introspection qt5 test"
 
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-   app-text/docbook-xml-dtd:4.5
-   dev-libs/appstream-glib
-   dev-util/itstool
-   >=dev-util/meson-0.42.0
-   >=sys-devel/gettext-0.19.8
-   test? ( dev-qt/linguist-tools:5 )
-"
 DEPEND="
dev-libs/glib:2
dev-libs/libxml2:2
@@ -45,6 +37,14 @@ DEPEND="
)
 "
 RDEPEND="${DEPEND}"
+BDEPEND="
+   app-text/docbook-xml-dtd:4.5
+   dev-libs/appstream-glib
+   dev-util/itstool
+   >=dev-util/meson-0.42.0
+   >=sys-devel/gettext-0.19.8
+   test? ( dev-qt/linguist-tools:5 )
+"
 
 src_prepare() {
default



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2019-02-17 Thread Andreas Sturmlechner
commit: 63cef5f6550e875d5be47a3c1114f846c6bff93a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 17 10:14:14 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 17 10:14:14 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=63cef5f6

dev-libs/appstream: Fix USE qt5,test DEPENDs

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

 dev-libs/appstream/appstream-.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 315dc0c2ac..a98e941d75 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -29,10 +29,7 @@ BDEPEND="
dev-util/itstool
>=dev-util/meson-0.42.0
>=sys-devel/gettext-0.19.8
-   test? (
-   dev-qt/linguist-tools:5
-   qt5? ( dev-qt/qttest:5 )
-   )
+   test? ( dev-qt/linguist-tools:5 )
 "
 DEPEND="
dev-libs/glib:2
@@ -40,7 +37,10 @@ DEPEND="
dev-libs/libyaml
dev-libs/snowball-stemmer
introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-   qt5? ( dev-qt/qtcore:5 )
+   qt5? (
+   dev-qt/qtcore:5
+   test? ( dev-qt/qttest:5 )
+   )
 "
 RDEPEND="${DEPEND}"
 



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2019-01-26 Thread Andreas Sturmlechner
commit: 5544f61f31d01f379f6b17a06540979dc2afa0f5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan 19 16:38:43 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 26 20:28:42 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5544f61f

dev-libs/appstream: EAPI-7 bump

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

 dev-libs/appstream/appstream-.ebuild | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index e8d78d06d0..315dc0c2ac 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -23,15 +23,6 @@ LICENSE="LGPL-2.1+ GPL-2+"
 SLOT="0/4"
 IUSE="apt +introspection qt5 test"
 
-RDEPEND="
-   dev-libs/glib:2
-   dev-libs/libxml2:2
-   dev-libs/libyaml
-   dev-libs/snowball-stemmer
-   introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-   qt5? ( dev-qt/qtcore:5 )
-"
-DEPEND="${RDEPEND}"
 BDEPEND="
app-text/docbook-xml-dtd:4.5
dev-libs/appstream-glib
@@ -43,6 +34,15 @@ BDEPEND="
qt5? ( dev-qt/qttest:5 )
)
 "
+DEPEND="
+   dev-libs/glib:2
+   dev-libs/libxml2:2
+   dev-libs/libyaml
+   dev-libs/snowball-stemmer
+   introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+   qt5? ( dev-qt/qtcore:5 )
+"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
default



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2018-09-12 Thread Andreas Sturmlechner
commit: 32fa777021b52351dbba778a39f5334cdeab19e2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 12 07:16:15 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 12 08:56:54 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=32fa7770

dev-libs/appstream: Sync with Gentoo ebuild repo

Closes: https://bugs.gentoo.org/646252
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-libs/appstream/appstream-.ebuild | 24 +++-
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 96d764b8fe..230751c476 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -3,17 +3,16 @@
 
 EAPI=6
 
-inherit meson xdg-utils eapi7-ver
+inherit meson xdg-utils
 
 if [[ ${PV} =  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ximion/${PN};
 else
-   MY_PV="$(ver_rs 1- _)"
-   MY_P="APPSTREAM_${MY_PV}"
-   SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> 
${P}.tar.gz"
+   MY_PN="AppStream"
+   
SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz;
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-   S="${WORKDIR}/${PN}-${MY_P}"
+   S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
 DESCRIPTION="Cross-distro effort for providing metadata for software in the 
Linux ecosystem"
@@ -22,36 +21,43 @@ 
HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/;
 LICENSE="LGPL-2.1+ GPL-2+"
 # check as_api_level
 SLOT="0/4"
-IUSE="apt doc qt5 test"
+IUSE="apt +introspection qt5 test"
 
 RDEPEND="
dev-libs/glib:2
-   dev-libs/gobject-introspection
dev-libs/libxml2:2
dev-libs/libyaml
dev-libs/snowball-stemmer
+   introspection? ( >=dev-libs/gobject-introspection-1.56:= )
qt5? ( dev-qt/qtcore:5 )
 "
 DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
+   dev-libs/appstream-glib
dev-util/itstool
>=dev-util/meson-0.42.0
-   sys-devel/gettext
+   >=sys-devel/gettext-0.19.8
test? (
qt5? ( dev-qt/qttest:5 )
)
 "
 
+src_prepare() {
+   default
+   sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || 
die
+}
+
 src_configure() {
xdg_environment_reset
 
local emesonargs=(
+   -Dapidocs=false
-Ddocs=false
-Dmaintainer=false
-Dstemming=true
-Dvapi=false
-Dapt-support=$(usex apt true false)
-   -Dapidocs=$(usex doc true false)
+   -Dgir=$(usex introspection true false)
-Dqt=$(usex qt5 true false)
)
 



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2018-05-06 Thread Andreas Sturmlechner
commit: ccf4775522529a028a7a62cefc7836fed69d5967
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May  6 09:54:14 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May  6 09:54:30 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ccf47755

dev-libs/appstream: Remove obsolete versionator.eclass

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 dev-libs/appstream/appstream-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 184c0c96b5..96d764b8fe 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -9,7 +9,6 @@ if [[ ${PV} =  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ximion/${PN};
 else
-   inherit versionator
MY_PV="$(ver_rs 1- _)"
MY_P="APPSTREAM_${MY_PV}"
SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> 
${P}.tar.gz"



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2018-03-06 Thread Andreas Sturmlechner
commit: f2f3bf3c2ef168a8b1b8ad8e8ecc1c19c6f1db4a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar  6 21:58:27 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar  6 22:10:38 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f2f3bf3c

dev-libs/appstream: versionator -> eapi7-ver

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index cf22f18a99..184c0c96b5 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=6
 
-inherit meson xdg-utils
+inherit meson xdg-utils eapi7-ver
 
 if [[ ${PV} =  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ximion/${PN};
 else
inherit versionator
-   MY_PV="$(replace_all_version_separators '_')"
+   MY_PV="$(ver_rs 1- _)"
MY_P="APPSTREAM_${MY_PV}"
SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2017-09-13 Thread Johannes Huber
commit: f10d2bc405508faf6c993ed948156d9581e07251
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Sep 13 17:02:44 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Sep 13 17:02:44 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f10d2bc4

dev-libs/appstream: DEPEND on >=dev-util/meson-0.42.0

Reported-by: Elias Probst  eliasprobst.eu>
Bug: https://bugs.gentoo.org/630876
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-libs/appstream/appstream-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index ea9eee6a1d..38ed49ca6a 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -36,6 +36,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
dev-util/itstool
+   >=dev-util/meson-0.42.0
sys-devel/gettext
test? (
qt5? ( dev-qt/qttest:5 )



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2017-09-10 Thread Johannes Huber
commit: 715b09c808b1d1d9633314c7ec5f95ca573f794c
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Sep 10 13:20:20 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Sep 10 13:22:35 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=715b09c8

dev-libs/appstream: Migrate to meson

Upstream commit bca85429424ecd64d43a686c490f363233da97b1

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-libs/appstream/appstream-.ebuild | 36 +++-
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 662af169e1..ea9eee6a1d 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils xdg-utils
+inherit meson xdg-utils
 
 if [[ ${PV} =  ]]; then
inherit git-r3
@@ -13,7 +13,7 @@ else
MY_PV="$(replace_all_version_separators '_')"
MY_P="APPSTREAM_${MY_PV}"
SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~x86"
S="${WORKDIR}/${PN}-${MY_P}"
 fi
 
@@ -21,7 +21,7 @@ DESCRIPTION="Cross-distro effort for providing metadata for 
software in the Linu
 HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/;
 
 LICENSE="LGPL-2.1+ GPL-2+"
-# check APPSTREAM_LIB_API_LEVEL
+# check as_api_level
 SLOT="0/4"
 IUSE="apt doc qt5 test"
 
@@ -42,30 +42,18 @@ DEPEND="${RDEPEND}
)
 "
 
-src_prepare() {
-   cmake-utils_src_prepare
-
-   if ! use test; then
-   pushd qt > /dev/null || die
-   cmake_comment_add_subdirectory tests
-   popd > /dev/null || die
-   fi
-}
-
 src_configure() {
xdg_environment_reset
 
-   local mycmakeargs=(
-   -DSTEMMING=ON
-   -DL18N=ON
-   -DVAPI=OFF
-   -DMAINTAINER=OFF
-   -DSANITIZERS=OFF
-   -DDOCUMENTATION=OFF
-   -DAPT_SUPPORT=$(usex apt)
-   -DINSTALL_PREBUILT_DOCS=$(usex doc)
-   -DQT=$(usex qt5)
+   local emesonargs=(
+   -Ddocs=false
+   -Dmaintainer=false
+   -Dstemming=true
+   -Dvapi=false
+   -Dapt-support=$(usex apt true false)
+   -Dapidocs=$(usex doc true false)
+   -Dqt=$(usex qt5 true false)
)
 
-   cmake-utils_src_configure
+   meson_src_configure
 }



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2017-02-17 Thread Michael Palimaka
commit: 15287e56093d5cfb85487a8b65113a07f1d7fea4
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Feb 18 03:59:30 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Feb 18 03:59:38 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=15287e56

dev-libs/appstream: fix two issues

revision bump fixing two issues

* Fixes a build failure LINGUAS=""
* Adds a missing dependency

Gentoo-bug: 606624
Gentoo-bug: 609358

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/appstream/appstream-.ebuild | 22 --
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index c2cf4a6505..5e83584ee6 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -4,11 +4,10 @@
 
 EAPI=6
 
-KDE_AUTODEPS="false"
-KDE_TEST="forceoptional-recursive"
-inherit kde5 xdg-utils
+inherit cmake-utils xdg-utils
 
-if [[ ${KDE_BUILD_TYPE} = live ]]; then
+if [[ ${PV} =  ]]; then
+   inherit git-r3
EGIT_REPO_URI="https://github.com/ximion/${PN};
 else
inherit versionator
@@ -25,10 +24,11 @@ 
HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/;
 LICENSE="LGPL-2.1+ GPL-2+"
 # check APPSTREAM_LIB_API_LEVEL
 SLOT="0/4"
-IUSE="apt doc qt5"
+IUSE="apt doc qt5 test"
 
 RDEPEND="
dev-libs/glib:2
+   dev-libs/gobject-introspection
dev-libs/libxml2:2
dev-libs/libyaml
dev-libs/snowball-stemmer
@@ -43,6 +43,16 @@ DEPEND="${RDEPEND}
)
 "
 
+src_prepare() {
+   cmake-utils_src_prepare
+
+   if ! use test; then
+   pushd qt > /dev/null || die
+   cmake_comment_add_subdirectory tests
+   popd > /dev/null || die
+   fi
+}
+
 src_configure() {
xdg_environment_reset
 
@@ -58,5 +68,5 @@ src_configure() {
-DQT=$(usex qt5)
)
 
-   kde5_src_configure
+   cmake-utils_src_configure
 }



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2017-01-18 Thread Michael Palimaka
commit: f703209fabc1aa0b9cc8fafe104923f008a78365
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jan 18 10:54:50 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jan 18 10:54:54 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f703209f

dev-libs/appstream: add missing dependency

Gentoo-bug: 605700

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/appstream/appstream-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index b656665..c2cf4a6 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -35,6 +35,7 @@ RDEPEND="
qt5? ( dev-qt/qtcore:5 )
 "
 DEPEND="${RDEPEND}
+   app-text/docbook-xml-dtd:4.5
dev-util/itstool
sys-devel/gettext
test? (



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2017-01-18 Thread Michael Palimaka
commit: 909d2c6d7cd9220f2569a419a1ca5eaaf473d87c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jan 18 10:49:20 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jan 18 10:49:23 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=909d2c6d

dev-libs/appstream: improve testing handling

Gentoo-bug: 605714

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/appstream/appstream-.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 5f17a40..b656665 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 
 KDE_AUTODEPS="false"
-KDE_TEST="true"
+KDE_TEST="forceoptional-recursive"
 inherit kde5 xdg-utils
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
@@ -37,6 +37,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
dev-util/itstool
sys-devel/gettext
+   test? (
+   qt5? ( dev-qt/qttest:5 )
+   )
 "
 
 src_configure() {



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2017-01-18 Thread Michael Palimaka
commit: 813c1f6045273fcb7c2bcee50fc82447a9fcce5f
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jan 18 10:40:03 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jan 18 10:40:09 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=813c1f60

dev-libs/appstream: sync KEYWORDS with main tree

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 55ce02d..5f17a40 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -15,7 +15,7 @@ else
MY_PV="$(replace_all_version_separators '_')"
MY_P="APPSTREAM_${MY_PV}"
SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 ~arm ~x86"
S="${WORKDIR}/${PN}-${MY_P}"
 fi
 



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2017-01-18 Thread Michael Palimaka
commit: 352c3e6afcbddbaf06b71f85ee4ffc69f34ec07b
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jan 18 10:39:54 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jan 18 10:40:09 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=352c3e6a

dev-libs/appstream: reset XDG env vars

Gentoo-bug: 605702

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/appstream/appstream-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 55829e7..55ce02d 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 
 KDE_AUTODEPS="false"
 KDE_TEST="true"
-inherit kde5
+inherit kde5 xdg-utils
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
EGIT_REPO_URI="https://github.com/ximion/${PN};
@@ -40,6 +40,8 @@ DEPEND="${RDEPEND}
 "
 
 src_configure() {
+   xdg_environment_reset
+
local mycmakeargs=(
-DSTEMMING=ON
-DL18N=ON



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2017-01-14 Thread Johannes Huber
commit: c83f229ad603779dd6cef0da61713c8e81c1e4a0
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Jan 14 10:14:01 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Jan 14 10:14:01 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c83f229a

dev-libs/appstream: Remove 0.10.4

Moved to gentoo main tree.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/appstream/appstream-0.10.5.ebuild | 56 --
 1 file changed, 56 deletions(-)

diff --git a/dev-libs/appstream/appstream-0.10.5.ebuild 
b/dev-libs/appstream/appstream-0.10.5.ebuild
deleted file mode 100644
index 55829e7..000
--- a/dev-libs/appstream/appstream-0.10.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_TEST="true"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = live ]]; then
-   EGIT_REPO_URI="https://github.com/ximion/${PN};
-else
-   inherit versionator
-   MY_PV="$(replace_all_version_separators '_')"
-   MY_P="APPSTREAM_${MY_PV}"
-   SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-   S="${WORKDIR}/${PN}-${MY_P}"
-fi
-
-DESCRIPTION="Cross-distro effort for providing metadata for software in the 
Linux ecosystem"
-HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/;
-
-LICENSE="LGPL-2.1+ GPL-2+"
-# check APPSTREAM_LIB_API_LEVEL
-SLOT="0/4"
-IUSE="apt doc qt5"
-
-RDEPEND="
-   dev-libs/glib:2
-   dev-libs/libxml2:2
-   dev-libs/libyaml
-   dev-libs/snowball-stemmer
-   qt5? ( dev-qt/qtcore:5 )
-"
-DEPEND="${RDEPEND}
-   dev-util/itstool
-   sys-devel/gettext
-"
-
-src_configure() {
-   local mycmakeargs=(
-   -DSTEMMING=ON
-   -DL18N=ON
-   -DVAPI=OFF
-   -DMAINTAINER=OFF
-   -DSANITIZERS=OFF
-   -DDOCUMENTATION=OFF
-   -DAPT_SUPPORT=$(usex apt)
-   -DINSTALL_PREBUILT_DOCS=$(usex doc)
-   -DQT=$(usex qt5)
-   )
-
-   kde5_src_configure
-}



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2017-01-05 Thread Johannes Huber
commit: 725815a868fac759fbc76e291d70077536cb0e4f
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Jan  5 17:05:42 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Jan  5 17:05:42 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=725815a8

dev-libs/appstream: DEPEND on dev-util/itstool

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/appstream/appstream-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index ffb3c55..46ec519 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
qt5? ( dev-qt/qtcore:5 )
 "
 DEPEND="${RDEPEND}
+   dev-util/itstool
sys-devel/gettext
 "
 



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2017-01-05 Thread Johannes Huber
commit: 3e86f40a5693c6e2afb7affd5fda0132ef4041b9
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Jan  5 17:58:02 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Jan  5 17:58:02 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3e86f40a

dev-libs/appstream: Version 0.10.5

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../{appstream-.ebuild => appstream-0.10.5.ebuild}   | 12 +++-
 dev-libs/appstream/appstream-.ebuild | 12 +++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-0.10.5.ebuild
similarity index 72%
copy from dev-libs/appstream/appstream-.ebuild
copy to dev-libs/appstream/appstream-0.10.5.ebuild
index 46ec519..55829e7 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-0.10.5.ebuild
@@ -8,9 +8,19 @@ KDE_AUTODEPS="false"
 KDE_TEST="true"
 inherit kde5
 
+if [[ ${KDE_BUILD_TYPE} = live ]]; then
+   EGIT_REPO_URI="https://github.com/ximion/${PN};
+else
+   inherit versionator
+   MY_PV="$(replace_all_version_separators '_')"
+   MY_P="APPSTREAM_${MY_PV}"
+   SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+   S="${WORKDIR}/${PN}-${MY_P}"
+fi
+
 DESCRIPTION="Cross-distro effort for providing metadata for software in the 
Linux ecosystem"
 HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/;
-EGIT_REPO_URI="https://github.com/ximion/${PN};
 
 LICENSE="LGPL-2.1+ GPL-2+"
 # check APPSTREAM_LIB_API_LEVEL

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
index 46ec519..55829e7 100644
--- a/dev-libs/appstream/appstream-.ebuild
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -8,9 +8,19 @@ KDE_AUTODEPS="false"
 KDE_TEST="true"
 inherit kde5
 
+if [[ ${KDE_BUILD_TYPE} = live ]]; then
+   EGIT_REPO_URI="https://github.com/ximion/${PN};
+else
+   inherit versionator
+   MY_PV="$(replace_all_version_separators '_')"
+   MY_P="APPSTREAM_${MY_PV}"
+   SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+   S="${WORKDIR}/${PN}-${MY_P}"
+fi
+
 DESCRIPTION="Cross-distro effort for providing metadata for software in the 
Linux ecosystem"
 HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/;
-EGIT_REPO_URI="https://github.com/ximion/${PN};
 
 LICENSE="LGPL-2.1+ GPL-2+"
 # check APPSTREAM_LIB_API_LEVEL



[gentoo-commits] proj/kde:master commit in: dev-libs/appstream/

2017-01-03 Thread Johannes Huber
commit: cad59fecc6388aa2c98be7c918bfa7067bdaee87
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Jan  3 09:27:54 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Jan  3 09:27:54 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cad59fec

dev-libs/appstream: New package

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/appstream/appstream-.ebuild | 45 
 dev-libs/appstream/metadata.xml  | 11 
 2 files changed, 56 insertions(+)

diff --git a/dev-libs/appstream/appstream-.ebuild 
b/dev-libs/appstream/appstream-.ebuild
new file mode 100644
index 000..ffb3c55
--- /dev/null
+++ b/dev-libs/appstream/appstream-.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Cross-distro effort for providing metadata for software in the 
Linux ecosystem"
+HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/;
+EGIT_REPO_URI="https://github.com/ximion/${PN};
+
+LICENSE="LGPL-2.1+ GPL-2+"
+# check APPSTREAM_LIB_API_LEVEL
+SLOT="0/4"
+IUSE="apt doc qt5"
+
+RDEPEND="
+   dev-libs/glib:2
+   dev-libs/libxml2:2
+   dev-libs/libyaml
+   dev-libs/snowball-stemmer
+   qt5? ( dev-qt/qtcore:5 )
+"
+DEPEND="${RDEPEND}
+   sys-devel/gettext
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DSTEMMING=ON
+   -DL18N=ON
+   -DVAPI=OFF
+   -DMAINTAINER=OFF
+   -DSANITIZERS=OFF
+   -DDOCUMENTATION=OFF
+   -DAPT_SUPPORT=$(usex apt)
+   -DINSTALL_PREBUILT_DOCS=$(usex doc)
+   -DQT=$(usex qt5)
+   )
+
+   kde5_src_configure
+}

diff --git a/dev-libs/appstream/metadata.xml b/dev-libs/appstream/metadata.xml
new file mode 100644
index 000..245719f
--- /dev/null
+++ b/dev-libs/appstream/metadata.xml
@@ -0,0 +1,11 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   k...@gentoo.org
+   Gentoo KDE Project
+   
+   
+   Enables Debians APT support
+   
+