[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
commit: 8e378e2ee36fffd0adbfd6d42382584930554273
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Wed Nov 28 13:02:54 2018 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Wed Nov 28 13:08:05 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8e378e2e
games-board/aisleriot: 3.22.5 → 3.22.7
Switch to guile-2.2. Drop unneeded USE-flag dependencies. Add missing
glib-utils and libxml2 to DEPEND.
Closes: https://bugs.gentoo.org/644068
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Manifest-Sign-Key: 0x5A56C8CD0C13248A
Signed-off-by: Gilles Dartiguelongue gentoo.org>
games-board/aisleriot/aisleriot-3.22.7.ebuild | 11 ++-
games-board/aisleriot/aisleriot-.ebuild | 11 ++-
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/games-board/aisleriot/aisleriot-3.22.7.ebuild
b/games-board/aisleriot/aisleriot-3.22.7.ebuild
index 5f9a65ab..d103a6a9 100644
--- a/games-board/aisleriot/aisleriot-3.22.7.ebuild
+++ b/games-board/aisleriot/aisleriot-3.22.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,11 +15,10 @@ KEYWORDS="~amd64 ~x86"
IUSE="debug gnome qt5"
# FIXME: quartz support?
-# Does not build with guile-2.0.0 or 2.0.1
+# Lookup guile modules grep "use-modules" *.scm
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
- >=dev-scheme/guile-2.0.5:12[deprecated,regex]
- =dev-scheme/guile-2.2:12
>=gnome-base/librsvg-2.32:2
>=media-libs/libcanberra-0.26[gtk3]
>=x11-libs/cairo-1.10
@@ -30,6 +29,8 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
app-arch/gzip
app-text/yelp-tools
+ dev-libs/libxml2:2
+ dev-util/glib-utils
>=dev-util/intltool-0.40.4
gnome-base/gnome-common
sys-apps/lsb-release
@@ -72,7 +73,7 @@ src_configure() {
gnome2_src_configure \
--with-gtk=3.0 \
- --with-guile=2.0 \
+ --with-guile=2.2 \
$(usex debug --enable-debug=yes --enable-debug=minimum) \
--enable-sound \
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
diff --git a/games-board/aisleriot/aisleriot-.ebuild
b/games-board/aisleriot/aisleriot-.ebuild
index 16094c91..3ace1d8e 100644
--- a/games-board/aisleriot/aisleriot-.ebuild
+++ b/games-board/aisleriot/aisleriot-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -22,11 +22,10 @@ fi
IUSE="debug gnome qt5"
# FIXME: quartz support?
-# Does not build with guile-2.0.0 or 2.0.1
+# Lookup guile modules grep "use-modules" *.scm
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
- >=dev-scheme/guile-2.0.5:12[deprecated,regex]
- =dev-scheme/guile-2.2:12
>=gnome-base/librsvg-2.32:2
>=media-libs/libcanberra-0.26[gtk3]
>=x11-libs/cairo-1.10
@@ -37,6 +36,8 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
app-arch/gzip
app-text/yelp-tools
+ dev-libs/libxml2:2
+ dev-util/glib-utils
>=dev-util/intltool-0.40.4
gnome-base/gnome-common
sys-apps/lsb-release
@@ -79,7 +80,7 @@ src_configure() {
gnome2_src_configure \
--with-gtk=3.0 \
- --with-guile=2.0 \
+ --with-guile=2.2 \
$(usex debug --enable-debug=yes --enable-debug=minimum) \
--enable-sound \
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/, dev-util/gnome-devel-docs/
commit: 581d45ea65532745bf2ab0fccb07b955ad4288c9
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Mon Nov 19 15:54:19 2018 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Mon Nov 19 16:00:16 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=581d45ea
dev-util/gnome-devel-docs: moved to gentoo repository
Signed-off-by: Gilles Dartiguelongue gentoo.org>
.../gnome-devel-docs-3.26.0.ebuild | 31
dev-util/gnome-devel-docs/metadata.xml | 8 --
games-board/aisleriot/aisleriot-3.22.7.ebuild | 87 ++
3 files changed, 87 insertions(+), 39 deletions(-)
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.26.0.ebuild
b/dev-util/gnome-devel-docs/gnome-devel-docs-3.26.0.ebuild
deleted file mode 100644
index 27e5133e..
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.26.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Documentation for developing for the GNOME desktop environment"
-HOMEPAGE="https://developer.gnome.org/;
-
-LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
- app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xml-dtd:4.2
- app-text/yelp-tools
- dev-libs/libxslt
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_configure() {
- # Wants to build demo samples
- gnome2_src_configure ac_cv_path_CC=""
-}
diff --git a/dev-util/gnome-devel-docs/metadata.xml
b/dev-util/gnome-devel-docs/metadata.xml
deleted file mode 100644
index 39980802..
--- a/dev-util/gnome-devel-docs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-
- gn...@gentoo.org
- Gentoo GNOME Desktop
-
-
diff --git a/games-board/aisleriot/aisleriot-3.22.7.ebuild
b/games-board/aisleriot/aisleriot-3.22.7.ebuild
new file mode 100644
index ..5f9a65ab
--- /dev/null
+++ b/games-board/aisleriot/aisleriot-3.22.7.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="A collection of solitaire card games for GNOME"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot;
+
+LICENSE="GPL-3 LGPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gnome qt5"
+
+# FIXME: quartz support?
+# Does not build with guile-2.0.0 or 2.0.1
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
+ >=dev-scheme/guile-2.0.5:12[deprecated,regex]
+ =gnome-base/librsvg-2.32:2
+ >=media-libs/libcanberra-0.26[gtk3]
+ >=x11-libs/cairo-1.10
+ >=x11-libs/gtk+-3.4:3
+ gnome? ( >=gnome-base/gconf-2.0:2 )
+ qt5? ( >=dev-qt/qtsvg-5:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ app-arch/gzip
+ app-text/yelp-tools
+ >=dev-util/intltool-0.40.4
+ gnome-base/gnome-common
+ sys-apps/lsb-release
+ sys-devel/autoconf-archive
+ >=sys-devel/gettext-0.12
+ virtual/pkgconfig
+ gnome? ( app-text/docbook-xml-dtd:4.3 )
+"
+
+PATCHES=(
+ # Fix SVG detection and usage
+ "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
+ # Fix build with Qt5, bug #617256
+ "${FILESDIR}"/${PN}-3.22.2-qt5-requires-cxx11.patch
+)
+
+src_configure() {
+ local myconf=()
+
+ if use gnome; then
+ myconf+=(
+ --with-platform=gnome
+ --with-help-method=ghelp
+ )
+ else
+ myconf+=(
+ --with-platform=gtk-only
+ --with-help-method=library
+ )
+ fi
+
+ if use qt5 ; then
+ myconf+=(
+ --with-card-theme-formats=all
+
--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
+ )
+ else
+ myconf+=( --with-card-theme-formats=svg,fixed,pysol )
+ fi
+
+ gnome2_src_configure \
+ --with-gtk=3.0 \
+ --with-guile=2.0 \
+ $(usex debug --enable-debug=yes --enable-debug=minimum) \
+ --enable-sound \
+
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
+ ${myconf[@]}
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ elog "Aisleriot can use additional card themes from games-board/pysolfc"
+ elog "and kde-base/libkdegames."
+}
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
commit: 3381ce5b7bc9122097faefde49835aa8b8f59df1
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Sat May 26 17:29:00 2018 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Sat May 26 17:29:00 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3381ce5b
games-board/aisleriot: fix license
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0x5A56C8CD0C13248A
games-board/aisleriot/aisleriot-3.22.5.ebuild | 2 +-
games-board/aisleriot/aisleriot-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-board/aisleriot/aisleriot-3.22.5.ebuild
b/games-board/aisleriot/aisleriot-3.22.5.ebuild
index 615ee328..5f9a65ab 100644
--- a/games-board/aisleriot/aisleriot-3.22.5.ebuild
+++ b/games-board/aisleriot/aisleriot-3.22.5.ebuild
@@ -9,7 +9,7 @@ inherit gnome2
DESCRIPTION="A collection of solitaire card games for GNOME"
HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot;
-LICENSE="GPL-3 LGPL-3 FDL-1.1"
+LICENSE="GPL-3 LGPL-3 FDL-1.3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug gnome qt5"
diff --git a/games-board/aisleriot/aisleriot-.ebuild
b/games-board/aisleriot/aisleriot-.ebuild
index 9226f8de..16094c91 100644
--- a/games-board/aisleriot/aisleriot-.ebuild
+++ b/games-board/aisleriot/aisleriot-.ebuild
@@ -12,7 +12,7 @@ fi
DESCRIPTION="A collection of solitaire card games for GNOME"
HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot;
-LICENSE="GPL-3 LGPL-3 FDL-1.1"
+LICENSE="GPL-3 LGPL-3 FDL-1.3"
SLOT="0"
if [[ ${PV} = ]]; then
KEYWORDS=""
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
commit: 369f9ca13aebaacc902d52f5db8a9a44e4ea048c
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Sat May 26 17:26:07 2018 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Sat May 26 17:26:07 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=369f9ca1
games-board/aisleriot: set upper version limit for guile
Upstream still does not support Guile 2.2+
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0x5A56C8CD0C13248A
.../aisleriot/{aisleriot-3.22.3.ebuild => aisleriot-3.22.5.ebuild} | 3 ++-
games-board/aisleriot/aisleriot-.ebuild| 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/games-board/aisleriot/aisleriot-3.22.3.ebuild
b/games-board/aisleriot/aisleriot-3.22.5.ebuild
similarity index 96%
rename from games-board/aisleriot/aisleriot-3.22.3.ebuild
rename to games-board/aisleriot/aisleriot-3.22.5.ebuild
index f4b0ea75..615ee328 100644
--- a/games-board/aisleriot/aisleriot-3.22.3.ebuild
+++ b/games-board/aisleriot/aisleriot-3.22.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,6 +19,7 @@ IUSE="debug gnome qt5"
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
>=dev-scheme/guile-2.0.5:12[deprecated,regex]
+ =gnome-base/librsvg-2.32:2
>=media-libs/libcanberra-0.26[gtk3]
>=x11-libs/cairo-1.10
diff --git a/games-board/aisleriot/aisleriot-.ebuild
b/games-board/aisleriot/aisleriot-.ebuild
index 643bd89d..9226f8de 100644
--- a/games-board/aisleriot/aisleriot-.ebuild
+++ b/games-board/aisleriot/aisleriot-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -26,6 +26,7 @@ IUSE="debug gnome qt5"
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
>=dev-scheme/guile-2.0.5:12[deprecated,regex]
+ =gnome-base/librsvg-2.32:2
>=media-libs/libcanberra-0.26[gtk3]
>=x11-libs/cairo-1.10
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
commit: 86a10fc62e8c7f634494ceea82e1eaa7cd2513ca
Author: Dennis Lamm gentoo org>
AuthorDate: Fri Jan 12 11:43:12 2018 +
Commit: Dennis Lamm gentoo org>
CommitDate: Fri Jan 12 11:43:12 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=86a10fc6
games-board/aisleriot: drop old
Package-Manager: Portage-2.3.13, Repoman-2.3.3
games-board/aisleriot/aisleriot-3.22.2.ebuild | 86 ---
1 file changed, 86 deletions(-)
diff --git a/games-board/aisleriot/aisleriot-3.22.2.ebuild
b/games-board/aisleriot/aisleriot-3.22.2.ebuild
deleted file mode 100644
index f4b0ea75..
--- a/games-board/aisleriot/aisleriot-3.22.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="A collection of solitaire card games for GNOME"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot;
-
-LICENSE="GPL-3 LGPL-3 FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gnome qt5"
-
-# FIXME: quartz support?
-# Does not build with guile-2.0.0 or 2.0.1
-COMMON_DEPEND="
- >=dev-libs/glib-2.32:2
- >=dev-scheme/guile-2.0.5:12[deprecated,regex]
- >=gnome-base/librsvg-2.32:2
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/cairo-1.10
- >=x11-libs/gtk+-3.4:3
- gnome? ( >=gnome-base/gconf-2.0:2 )
- qt5? ( >=dev-qt/qtsvg-5:5 )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/gzip
- app-text/yelp-tools
- >=dev-util/intltool-0.40.4
- gnome-base/gnome-common
- sys-apps/lsb-release
- sys-devel/autoconf-archive
- >=sys-devel/gettext-0.12
- virtual/pkgconfig
- gnome? ( app-text/docbook-xml-dtd:4.3 )
-"
-
-PATCHES=(
- # Fix SVG detection and usage
- "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
- # Fix build with Qt5, bug #617256
- "${FILESDIR}"/${PN}-3.22.2-qt5-requires-cxx11.patch
-)
-
-src_configure() {
- local myconf=()
-
- if use gnome; then
- myconf+=(
- --with-platform=gnome
- --with-help-method=ghelp
- )
- else
- myconf+=(
- --with-platform=gtk-only
- --with-help-method=library
- )
- fi
-
- if use qt5 ; then
- myconf+=(
- --with-card-theme-formats=all
-
--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
- )
- else
- myconf+=( --with-card-theme-formats=svg,fixed,pysol )
- fi
-
- gnome2_src_configure \
- --with-gtk=3.0 \
- --with-guile=2.0 \
- $(usex debug --enable-debug=yes --enable-debug=minimum) \
- --enable-sound \
-
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
- ${myconf[@]}
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- elog "Aisleriot can use additional card themes from games-board/pysolfc"
- elog "and kde-base/libkdegames."
-}
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
commit: 9d917ab77382716dd66bdba8ecb52b03249169ab
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Tue Sep 12 06:18:15 2017 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Tue Sep 12 06:18:15 2017 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9d917ab7
games-board/aisleriot: version bump 3.22.2 → 3.22.3
Translation updates.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Manifest-Sign-Key: 0x5A56C8CD0C13248A
games-board/aisleriot/aisleriot-3.22.3.ebuild | 86 +++
1 file changed, 86 insertions(+)
diff --git a/games-board/aisleriot/aisleriot-3.22.3.ebuild
b/games-board/aisleriot/aisleriot-3.22.3.ebuild
new file mode 100644
index ..f4b0ea75
--- /dev/null
+++ b/games-board/aisleriot/aisleriot-3.22.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="A collection of solitaire card games for GNOME"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot;
+
+LICENSE="GPL-3 LGPL-3 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gnome qt5"
+
+# FIXME: quartz support?
+# Does not build with guile-2.0.0 or 2.0.1
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
+ >=dev-scheme/guile-2.0.5:12[deprecated,regex]
+ >=gnome-base/librsvg-2.32:2
+ >=media-libs/libcanberra-0.26[gtk3]
+ >=x11-libs/cairo-1.10
+ >=x11-libs/gtk+-3.4:3
+ gnome? ( >=gnome-base/gconf-2.0:2 )
+ qt5? ( >=dev-qt/qtsvg-5:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ app-arch/gzip
+ app-text/yelp-tools
+ >=dev-util/intltool-0.40.4
+ gnome-base/gnome-common
+ sys-apps/lsb-release
+ sys-devel/autoconf-archive
+ >=sys-devel/gettext-0.12
+ virtual/pkgconfig
+ gnome? ( app-text/docbook-xml-dtd:4.3 )
+"
+
+PATCHES=(
+ # Fix SVG detection and usage
+ "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
+ # Fix build with Qt5, bug #617256
+ "${FILESDIR}"/${PN}-3.22.2-qt5-requires-cxx11.patch
+)
+
+src_configure() {
+ local myconf=()
+
+ if use gnome; then
+ myconf+=(
+ --with-platform=gnome
+ --with-help-method=ghelp
+ )
+ else
+ myconf+=(
+ --with-platform=gtk-only
+ --with-help-method=library
+ )
+ fi
+
+ if use qt5 ; then
+ myconf+=(
+ --with-card-theme-formats=all
+
--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
+ )
+ else
+ myconf+=( --with-card-theme-formats=svg,fixed,pysol )
+ fi
+
+ gnome2_src_configure \
+ --with-gtk=3.0 \
+ --with-guile=2.0 \
+ $(usex debug --enable-debug=yes --enable-debug=minimum) \
+ --enable-sound \
+
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
+ ${myconf[@]}
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ elog "Aisleriot can use additional card themes from games-board/pysolfc"
+ elog "and kde-base/libkdegames."
+}
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
commit: 5a9a794f707f4c7e851ba1400f8a12136ee1a2a8
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Sun Sep 3 10:27:50 2017 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Sun Sep 3 10:27:50 2017 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5a9a794f
games-board/aisleriot: cleanup old revisions
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Manifest-Sign-Key: 0x5A56C8CD0C13248A
games-board/aisleriot/aisleriot-3.22.0.ebuild | 86 ---
games-board/aisleriot/aisleriot-3.22.1.ebuild | 86 ---
2 files changed, 172 deletions(-)
diff --git a/games-board/aisleriot/aisleriot-3.22.0.ebuild
b/games-board/aisleriot/aisleriot-3.22.0.ebuild
deleted file mode 100644
index 9e0f323c..
--- a/games-board/aisleriot/aisleriot-3.22.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools gnome2
-
-DESCRIPTION="A collection of solitaire card games for GNOME"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot;
-
-LICENSE="GPL-3 LGPL-3 FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gnome qt5"
-
-# FIXME: quartz support?
-# Does not build with guile-2.0.0 or 2.0.1
-COMMON_DEPEND="
- >=dev-libs/glib-2.32:2
- >=dev-scheme/guile-2.0.5:12[deprecated,regex]
- >=gnome-base/librsvg-2.32:2
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/cairo-1.10
- >=x11-libs/gtk+-3.4:3
- gnome? ( >=gnome-base/gconf-2.0:2 )
- qt5? ( >=dev-qt/qtsvg-5:5 )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/gzip
- app-text/yelp-tools
- >=dev-util/intltool-0.40.4
- gnome-base/gnome-common
- sys-apps/lsb-release
- >=sys-devel/gettext-0.12
- virtual/pkgconfig
- gnome? ( app-text/docbook-xml-dtd:4.3 )
-"
-
-src_prepare() {
- # Fix SVG detection and usage
- eapply "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- local myconf=()
-
- if use gnome; then
- myconf+=(
- --with-platform=gnome
- --with-help-method=ghelp
- )
- else
- myconf+=(
- --with-platform=gtk-only
- --with-help-method=library
- )
- fi
-
- if use qt5 ; then
- myconf+=(
- --with-card-theme-formats=all
-
--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
- )
- else
- myconf+=( --with-card-theme-formats=svg,fixed,pysol )
- fi
-
- gnome2_src_configure \
- --with-gtk=3.0 \
- --with-guile=2.0 \
- $(usex debug --enable-debug=yes --enable-debug=minimum) \
- --enable-sound \
-
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
- ${myconf[@]}
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- elog "Aisleriot can use additional card themes from games-board/pysolfc"
- elog "and kde-base/libkdegames."
-}
diff --git a/games-board/aisleriot/aisleriot-3.22.1.ebuild
b/games-board/aisleriot/aisleriot-3.22.1.ebuild
deleted file mode 100644
index 9e0f323c..
--- a/games-board/aisleriot/aisleriot-3.22.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools gnome2
-
-DESCRIPTION="A collection of solitaire card games for GNOME"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot;
-
-LICENSE="GPL-3 LGPL-3 FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gnome qt5"
-
-# FIXME: quartz support?
-# Does not build with guile-2.0.0 or 2.0.1
-COMMON_DEPEND="
- >=dev-libs/glib-2.32:2
- >=dev-scheme/guile-2.0.5:12[deprecated,regex]
- >=gnome-base/librsvg-2.32:2
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/cairo-1.10
- >=x11-libs/gtk+-3.4:3
- gnome? ( >=gnome-base/gconf-2.0:2 )
- qt5? ( >=dev-qt/qtsvg-5:5 )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/gzip
- app-text/yelp-tools
- >=dev-util/intltool-0.40.4
- gnome-base/gnome-common
- sys-apps/lsb-release
- >=sys-devel/gettext-0.12
- virtual/pkgconfig
- gnome? ( app-text/docbook-xml-dtd:4.3 )
-"
-
-src_prepare() {
- # Fix SVG detection and usage
- eapply "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- local myconf=()
-
- if use gnome; then
- myconf+=(
- --with-platform=gnome
- --with-help-method=ghelp
- )
- else
-
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
commit: 3b9cedf4da105de40fe70438aae8b36b59575638
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Sun Sep 3 10:28:49 2017 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Sun Sep 3 10:28:49 2017 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3b9cedf4
games-board/aisleriot: sync live ebuild
Drop CVS era $Id$.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Manifest-Sign-Key: 0x5A56C8CD0C13248A
games-board/aisleriot/aisleriot-3.22.2.ebuild | 3 +--
games-board/aisleriot/aisleriot-.ebuild | 20 ++--
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/games-board/aisleriot/aisleriot-3.22.2.ebuild
b/games-board/aisleriot/aisleriot-3.22.2.ebuild
index c492247a..99832f9a 100644
--- a/games-board/aisleriot/aisleriot-3.22.2.ebuild
+++ b/games-board/aisleriot/aisleriot-3.22.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
+# Distributed under the terms of the GNU General Public License v2
EAPI=6
GNOME2_EAUTORECONF="yes"
diff --git a/games-board/aisleriot/aisleriot-.ebuild
b/games-board/aisleriot/aisleriot-.ebuild
index 77df6e25..235e0ac6 100644
--- a/games-board/aisleriot/aisleriot-.ebuild
+++ b/games-board/aisleriot/aisleriot-.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
EAPI=6
+GNOME2_EAUTORECONF="yes"
-inherit autotools gnome2
+inherit gnome2
if [[ ${PV} = ]]; then
inherit gnome2-live
fi
@@ -39,18 +39,18 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/intltool-0.40.4
gnome-base/gnome-common
sys-apps/lsb-release
+ sys-devel/autoconf-archive
>=sys-devel/gettext-0.12
virtual/pkgconfig
gnome? ( app-text/docbook-xml-dtd:4.3 )
"
-src_prepare() {
+PATCHES=(
# Fix SVG detection and usage
- eapply "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
-
- eautoreconf
- gnome2_src_prepare
-}
+ "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
+ # Fix build with Qt5, bug #617256
+ "${FILESDIR}"/${PN}-3.22.2-qt5-requires-cxx11.patch
+)
src_configure() {
local myconf=()
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/, games-board/aisleriot/files/
commit: 922da42611a6f519be2cc3f70c2b383e98b089c9
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Sun Sep 3 10:27:18 2017 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Sun Sep 3 10:27:18 2017 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=922da426
games-board/aisleriot: version bump 3.22.1 → 3.22.2
Add missing dependency on autoconf-archive, bug #627182.
Add C++11 requirement due to Qt5, bug #617256.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Manifest-Sign-Key: 0x5A56C8CD0C13248A
games-board/aisleriot/aisleriot-3.22.2.ebuild | 87 ++
.../aisleriot-3.22.2-qt5-requires-cxx11.patch | 27 +++
2 files changed, 114 insertions(+)
diff --git a/games-board/aisleriot/aisleriot-3.22.2.ebuild
b/games-board/aisleriot/aisleriot-3.22.2.ebuild
new file mode 100644
index ..c492247a
--- /dev/null
+++ b/games-board/aisleriot/aisleriot-3.22.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="A collection of solitaire card games for GNOME"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot;
+
+LICENSE="GPL-3 LGPL-3 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gnome qt5"
+
+# FIXME: quartz support?
+# Does not build with guile-2.0.0 or 2.0.1
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
+ >=dev-scheme/guile-2.0.5:12[deprecated,regex]
+ >=gnome-base/librsvg-2.32:2
+ >=media-libs/libcanberra-0.26[gtk3]
+ >=x11-libs/cairo-1.10
+ >=x11-libs/gtk+-3.4:3
+ gnome? ( >=gnome-base/gconf-2.0:2 )
+ qt5? ( >=dev-qt/qtsvg-5:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ app-arch/gzip
+ app-text/yelp-tools
+ >=dev-util/intltool-0.40.4
+ gnome-base/gnome-common
+ sys-apps/lsb-release
+ sys-devel/autoconf-archive
+ >=sys-devel/gettext-0.12
+ virtual/pkgconfig
+ gnome? ( app-text/docbook-xml-dtd:4.3 )
+"
+
+PATCHES=(
+ # Fix SVG detection and usage
+ "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
+ # Fix build with Qt5, bug #617256
+ "${FILESDIR}"/${PN}-3.22.2-qt5-requires-cxx11.patch
+)
+
+src_configure() {
+ local myconf=()
+
+ if use gnome; then
+ myconf+=(
+ --with-platform=gnome
+ --with-help-method=ghelp
+ )
+ else
+ myconf+=(
+ --with-platform=gtk-only
+ --with-help-method=library
+ )
+ fi
+
+ if use qt5 ; then
+ myconf+=(
+ --with-card-theme-formats=all
+
--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
+ )
+ else
+ myconf+=( --with-card-theme-formats=svg,fixed,pysol )
+ fi
+
+ gnome2_src_configure \
+ --with-gtk=3.0 \
+ --with-guile=2.0 \
+ $(usex debug --enable-debug=yes --enable-debug=minimum) \
+ --enable-sound \
+
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
+ ${myconf[@]}
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ elog "Aisleriot can use additional card themes from games-board/pysolfc"
+ elog "and kde-base/libkdegames."
+}
diff --git
a/games-board/aisleriot/files/aisleriot-3.22.2-qt5-requires-cxx11.patch
b/games-board/aisleriot/files/aisleriot-3.22.2-qt5-requires-cxx11.patch
new file mode 100644
index ..adf4f651
--- /dev/null
+++ b/games-board/aisleriot/files/aisleriot-3.22.2-qt5-requires-cxx11.patch
@@ -0,0 +1,27 @@
+From 4f747c66d41f50d017191583e670fec2468c9815 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue
+Date: Sun, 3 Sep 2017 12:21:17 +0200
+Subject: [PATCH] Building against Qt5 requires c++11
+
+---
+ configure.ac | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index ce3209b6..88cecedc 100644
+--- a/configure.ac
b/configure.ac
+@@ -44,6 +44,10 @@ LT_INIT
+ LT_LANG([C])
+ LT_LANG([C++])
+
++AC_LANG_CPLUSPLUS
++AC_LANG_COMPILER_REQUIRE
++AX_CXX_COMPILE_STDCXX_11([], [mandatory])
++
+ #
+ # Dependencies
+ #
+--
+2.14.1
+
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
commit: 3ff4042b6e4975d7c85aae8b5e405d590931d91a Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Sep 3 10:30:08 2017 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Sep 3 10:30:08 2017 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3ff4042b games-board/aisleriot: fix repoman warning about license Package-Manager: Portage-2.3.8, Repoman-2.3.3 Manifest-Sign-Key: 0x5A56C8CD0C13248A games-board/aisleriot/aisleriot-3.22.2.ebuild | 2 +- games-board/aisleriot/aisleriot-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/games-board/aisleriot/aisleriot-3.22.2.ebuild b/games-board/aisleriot/aisleriot-3.22.2.ebuild index 99832f9a..f4b0ea75 100644 --- a/games-board/aisleriot/aisleriot-3.22.2.ebuild +++ b/games-board/aisleriot/aisleriot-3.22.2.ebuild @@ -1,5 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 +# Distributed under the terms of the GNU General Public License v2 EAPI=6 GNOME2_EAUTORECONF="yes" diff --git a/games-board/aisleriot/aisleriot-.ebuild b/games-board/aisleriot/aisleriot-.ebuild index 235e0ac6..643bd89d 100644 --- a/games-board/aisleriot/aisleriot-.ebuild +++ b/games-board/aisleriot/aisleriot-.ebuild @@ -1,5 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 +# Distributed under the terms of the GNU General Public License v2 EAPI=6 GNOME2_EAUTORECONF="yes"
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
commit: 795629e8e3040f4c60db7a265e51e89cb917f3a7
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Sun Sep 3 10:25:07 2017 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Sun Sep 3 10:25:07 2017 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=795629e8
games-board/aisleriot: version bump 3.22.1 → 3.22.2
Add missing dependency on autoconf-archive, bug #627182.
Add C++11 requirement due to Qt5, bug #617256.
games-board/aisleriot/aisleriot-3.22.2.ebuild | 86 +++
1 file changed, 86 insertions(+)
diff --git a/games-board/aisleriot/aisleriot-3.22.2.ebuild
b/games-board/aisleriot/aisleriot-3.22.2.ebuild
new file mode 100644
index ..9e0f323c
--- /dev/null
+++ b/games-board/aisleriot/aisleriot-3.22.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools gnome2
+
+DESCRIPTION="A collection of solitaire card games for GNOME"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot;
+
+LICENSE="GPL-3 LGPL-3 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gnome qt5"
+
+# FIXME: quartz support?
+# Does not build with guile-2.0.0 or 2.0.1
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
+ >=dev-scheme/guile-2.0.5:12[deprecated,regex]
+ >=gnome-base/librsvg-2.32:2
+ >=media-libs/libcanberra-0.26[gtk3]
+ >=x11-libs/cairo-1.10
+ >=x11-libs/gtk+-3.4:3
+ gnome? ( >=gnome-base/gconf-2.0:2 )
+ qt5? ( >=dev-qt/qtsvg-5:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ app-arch/gzip
+ app-text/yelp-tools
+ >=dev-util/intltool-0.40.4
+ gnome-base/gnome-common
+ sys-apps/lsb-release
+ >=sys-devel/gettext-0.12
+ virtual/pkgconfig
+ gnome? ( app-text/docbook-xml-dtd:4.3 )
+"
+
+src_prepare() {
+ # Fix SVG detection and usage
+ eapply "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ local myconf=()
+
+ if use gnome; then
+ myconf+=(
+ --with-platform=gnome
+ --with-help-method=ghelp
+ )
+ else
+ myconf+=(
+ --with-platform=gtk-only
+ --with-help-method=library
+ )
+ fi
+
+ if use qt5 ; then
+ myconf+=(
+ --with-card-theme-formats=all
+
--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
+ )
+ else
+ myconf+=( --with-card-theme-formats=svg,fixed,pysol )
+ fi
+
+ gnome2_src_configure \
+ --with-gtk=3.0 \
+ --with-guile=2.0 \
+ $(usex debug --enable-debug=yes --enable-debug=minimum) \
+ --enable-sound \
+
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
+ ${myconf[@]}
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ elog "Aisleriot can use additional card themes from games-board/pysolfc"
+ elog "and kde-base/libkdegames."
+}
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/, games-board/aisleriot/files/
commit: 36ce83be8a80ec774affb91b7474e84361a49594
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Sat Nov 12 12:43:11 2016 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Sat Nov 12 12:43:30 2016 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=36ce83be
games-board/aisleriot: cleanup old revision
Package-Manager: portage-2.3.2
Manifest-Sign-Key: C6085806
games-board/aisleriot/aisleriot-3.20.2.ebuild | 89 --
.../files/aisleriot-3.16.2-detect-svg.patch| 28 ---
2 files changed, 117 deletions(-)
diff --git a/games-board/aisleriot/aisleriot-3.20.2.ebuild
b/games-board/aisleriot/aisleriot-3.20.2.ebuild
deleted file mode 100644
index dc2b6e1..000
--- a/games-board/aisleriot/aisleriot-3.20.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools gnome2
-
-DESCRIPTION="A collection of solitaire card games for GNOME"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot;
-
-LICENSE="GPL-3 LGPL-3 FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gnome qt4"
-
-# FIXME: quartz support?
-# Does not build with guile-2.0.0 or 2.0.1
-COMMON_DEPEND="
- >=dev-libs/glib-2.32:2
- >=dev-scheme/guile-2.0.5:12[deprecated,regex]
- >=gnome-base/librsvg-2.32:2
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/cairo-1.10
- >=x11-libs/gtk+-3.4:3
- gnome? ( >=gnome-base/gconf-2.0:2 )
- qt4? ( >=dev-qt/qtsvg-4.4:4 )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/gzip
- dev-libs/libxml2
- >=dev-util/intltool-0.40.4
- dev-util/itstool
- sys-apps/lsb-release
- >=sys-devel/gettext-0.12
- virtual/pkgconfig
- gnome? ( app-text/docbook-xml-dtd:4.3 )
-"
-# dev-util/itstool really needed for help file generation
-# >=app-text/yelp-tools-3.1.1
-
-src_prepare() {
- # Fix SVG detection and usage
- eapply "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- local myconf=()
-
- if use gnome; then
- myconf+=(
- --with-platform=gnome
- --with-help-method=ghelp
- )
- else
- myconf+=(
- --with-platform=gtk-only
- --with-help-method=library
- )
- fi
-
- if use qt4 ; then
- myconf+=(
- --with-card-theme-formats=all
-
--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
- )
- else
- myconf+=( --with-card-theme-formats=svg,fixed,pysol )
- fi
-
- gnome2_src_configure \
- --with-gtk=3.0 \
- --with-guile=2.0 \
- $(usex debug --enable-debug=yes --enable-debug=minimum) \
- --enable-sound \
-
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
- GUILE=$(type -P guile-2.0) \
- ${myconf[@]}
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- elog "Aisleriot can use additional card themes from games-board/pysolfc"
- elog "and kde-base/libkdegames."
-}
diff --git a/games-board/aisleriot/files/aisleriot-3.16.2-detect-svg.patch
b/games-board/aisleriot/files/aisleriot-3.16.2-detect-svg.patch
deleted file mode 100644
index 2dd9001..000
--- a/games-board/aisleriot/files/aisleriot-3.16.2-detect-svg.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Do not require a particular SVG library unless actually found.
-
a/configure.ac 2015-05-11 00:13:51.180002639 +0200
-+++ b/configure.ac 2015-05-11 00:13:40.365069049 +0200
-@@ -319,7 +319,9 @@
-
- PKG_CHECK_EXISTS([librsvg-2.0 >=
$RSVG_REQUIRED],[have_rsvg=yes],[have_rsvg=no])
-
-- PKGS="$PKGS librsvg-2.0 >= $RSVG_REQUIRED cairo >= $CAIRO_REQUIRED"
-+ if test "$have_rsvg" = "yes" ; then
-+PKGS="$PKGS librsvg-2.0 >= $RSVG_REQUIRED cairo >= $CAIRO_REQUIRED"
-+ fi
-
- AC_DEFINE([HAVE_RSVG],[1],[Refine if librsvg is available])
- fi
-@@ -334,8 +336,10 @@
-
- PKG_CHECK_EXISTS([QtSvg >=
$QT_SVG_REQUIRED],[have_qtsvg=yes],[have_qtsvg=no])
-
-- PKGS="$PKGS QtSvg >= $QT_SVG_REQUIRED"
-- EXTRA_CXX_LIBS="$EXTRA_CXX_LIBS -lstdc++"
-+ if test "$have_qtsvg" = "yes" ; then
-+PKGS="$PKGS QtSvg >= $QT_SVG_REQUIRED"
-+EXTRA_CXX_LIBS="$EXTRA_CXX_LIBS -lstdc++"
-+ fi
-
- AC_DEFINE([HAVE_QTSVG],[1],[Refine if QtSvg is available])
- fi
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
commit: c1beb3384a0d192ec6bbbfa1cfbbbdd158415bee
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Sat Nov 12 12:42:32 2016 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Sat Nov 12 12:42:32 2016 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=c1beb338
games-board/aisleriot: 3.22.0 → 3.22.1
Package-Manager: portage-2.3.2
Manifest-Sign-Key: C6085806
games-board/aisleriot/aisleriot-3.22.1.ebuild | 86 +++
1 file changed, 86 insertions(+)
diff --git a/games-board/aisleriot/aisleriot-3.22.1.ebuild
b/games-board/aisleriot/aisleriot-3.22.1.ebuild
new file mode 100644
index 000..9e0f323
--- /dev/null
+++ b/games-board/aisleriot/aisleriot-3.22.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools gnome2
+
+DESCRIPTION="A collection of solitaire card games for GNOME"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot;
+
+LICENSE="GPL-3 LGPL-3 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gnome qt5"
+
+# FIXME: quartz support?
+# Does not build with guile-2.0.0 or 2.0.1
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
+ >=dev-scheme/guile-2.0.5:12[deprecated,regex]
+ >=gnome-base/librsvg-2.32:2
+ >=media-libs/libcanberra-0.26[gtk3]
+ >=x11-libs/cairo-1.10
+ >=x11-libs/gtk+-3.4:3
+ gnome? ( >=gnome-base/gconf-2.0:2 )
+ qt5? ( >=dev-qt/qtsvg-5:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ app-arch/gzip
+ app-text/yelp-tools
+ >=dev-util/intltool-0.40.4
+ gnome-base/gnome-common
+ sys-apps/lsb-release
+ >=sys-devel/gettext-0.12
+ virtual/pkgconfig
+ gnome? ( app-text/docbook-xml-dtd:4.3 )
+"
+
+src_prepare() {
+ # Fix SVG detection and usage
+ eapply "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ local myconf=()
+
+ if use gnome; then
+ myconf+=(
+ --with-platform=gnome
+ --with-help-method=ghelp
+ )
+ else
+ myconf+=(
+ --with-platform=gtk-only
+ --with-help-method=library
+ )
+ fi
+
+ if use qt5 ; then
+ myconf+=(
+ --with-card-theme-formats=all
+
--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
+ )
+ else
+ myconf+=( --with-card-theme-formats=svg,fixed,pysol )
+ fi
+
+ gnome2_src_configure \
+ --with-gtk=3.0 \
+ --with-guile=2.0 \
+ $(usex debug --enable-debug=yes --enable-debug=minimum) \
+ --enable-sound \
+
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
+ ${myconf[@]}
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ elog "Aisleriot can use additional card themes from games-board/pysolfc"
+ elog "and kde-base/libkdegames."
+}
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/, games-board/aisleriot/files/
commit: 2bd5ae6c73645e1da9961bdbbd5002ac287b7229
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Sun Oct 30 11:37:21 2016 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Mon Oct 31 10:28:23 2016 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2bd5ae6c
games-board/aisleriot: 3.20.2 → 3.22.0
Package-Manager: portage-2.3.2
Manifest-Sign-Key: C6085806
...sleriot-.ebuild => aisleriot-3.22.0.ebuild} | 32 ++---
games-board/aisleriot/aisleriot-.ebuild| 23 ++---
.../files/aisleriot-3.22.0-detect-svg.patch| 40 ++
3 files changed, 61 insertions(+), 34 deletions(-)
diff --git a/games-board/aisleriot/aisleriot-.ebuild
b/games-board/aisleriot/aisleriot-3.22.0.ebuild
similarity index 75%
copy from games-board/aisleriot/aisleriot-.ebuild
copy to games-board/aisleriot/aisleriot-3.22.0.ebuild
index 535d6b4..9e0f323 100644
--- a/games-board/aisleriot/aisleriot-.ebuild
+++ b/games-board/aisleriot/aisleriot-3.22.0.ebuild
@@ -1,26 +1,18 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
-GCONF_DEBUG="yes"
+EAPI=6
-inherit autotools eutils gnome-games
-if [[ ${PV} = ]]; then
- inherit gnome2-live
-fi
+inherit autotools gnome2
DESCRIPTION="A collection of solitaire card games for GNOME"
HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot;
LICENSE="GPL-3 LGPL-3 FDL-1.1"
SLOT="0"
-if [[ ${PV} = ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~x86"
-fi
-IUSE="gnome qt4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gnome qt5"
# FIXME: quartz support?
# Does not build with guile-2.0.0 or 2.0.1
@@ -32,24 +24,22 @@ COMMON_DEPEND="
>=x11-libs/cairo-1.10
>=x11-libs/gtk+-3.4:3
gnome? ( >=gnome-base/gconf-2.0:2 )
- qt4? ( >=dev-qt/qtsvg-4.4:4 )
+ qt5? ( >=dev-qt/qtsvg-5:5 )
"
DEPEND="${COMMON_DEPEND}
app-arch/gzip
- dev-libs/libxml2
+ app-text/yelp-tools
>=dev-util/intltool-0.40.4
- dev-util/itstool
+ gnome-base/gnome-common
sys-apps/lsb-release
>=sys-devel/gettext-0.12
virtual/pkgconfig
gnome? ( app-text/docbook-xml-dtd:4.3 )
"
-# dev-util/itstool really needed for help file generation
-# >=app-text/yelp-tools-3.1.1
src_prepare() {
# Fix SVG detection and usage
- epatch "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch
+ eapply "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
eautoreconf
gnome2_src_prepare
@@ -70,7 +60,7 @@ src_configure() {
)
fi
- if use qt4 ; then
+ if use qt5 ; then
myconf+=(
--with-card-theme-formats=all
--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
@@ -82,9 +72,9 @@ src_configure() {
gnome2_src_configure \
--with-gtk=3.0 \
--with-guile=2.0 \
+ $(usex debug --enable-debug=yes --enable-debug=minimum) \
--enable-sound \
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
- GUILE=$(type -P guile-2.0) \
${myconf[@]}
}
diff --git a/games-board/aisleriot/aisleriot-.ebuild
b/games-board/aisleriot/aisleriot-.ebuild
index 535d6b4..77df6e2 100644
--- a/games-board/aisleriot/aisleriot-.ebuild
+++ b/games-board/aisleriot/aisleriot-.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
-GCONF_DEBUG="yes"
+EAPI=6
-inherit autotools eutils gnome-games
+inherit autotools gnome2
if [[ ${PV} = ]]; then
inherit gnome2-live
fi
@@ -20,7 +19,7 @@ if [[ ${PV} = ]]; then
else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="gnome qt4"
+IUSE="debug gnome qt5"
# FIXME: quartz support?
# Does not build with guile-2.0.0 or 2.0.1
@@ -32,24 +31,22 @@ COMMON_DEPEND="
>=x11-libs/cairo-1.10
>=x11-libs/gtk+-3.4:3
gnome? ( >=gnome-base/gconf-2.0:2 )
- qt4? ( >=dev-qt/qtsvg-4.4:4 )
+ qt5? ( >=dev-qt/qtsvg-5:5 )
"
DEPEND="${COMMON_DEPEND}
app-arch/gzip
- dev-libs/libxml2
+ app-text/yelp-tools
>=dev-util/intltool-0.40.4
- dev-util/itstool
+ gnome-base/gnome-common
sys-apps/lsb-release
>=sys-devel/gettext-0.12
virtual/pkgconfig
gnome? ( app-text/docbook-xml-dtd:4.3 )
"
-# dev-util/itstool really needed for help file generation
-# >=app-text/yelp-tools-3.1.1
src_prepare() {
# Fix SVG detection and usage
- epatch "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch
+ eapply "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
eautoreconf
gnome2_src_prepare
@@
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
commit: 5f91463ce08bba389425a9b806b914e267bfa8d9
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Mon Sep 5 21:42:46 2016 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Mon Sep 5 21:55:20 2016 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5f91463c
games-board/aisleriot: 3.18.2 → 3.20.2
games-board/aisleriot/aisleriot-3.18.2.ebuild | 89 --
...eriot-3.16.2.ebuild => aisleriot-3.20.2.ebuild} | 14 ++--
games-board/aisleriot/aisleriot-.ebuild| 2 +-
3 files changed, 8 insertions(+), 97 deletions(-)
diff --git a/games-board/aisleriot/aisleriot-3.18.2.ebuild
b/games-board/aisleriot/aisleriot-3.18.2.ebuild
deleted file mode 100644
index e7535d4..000
--- a/games-board/aisleriot/aisleriot-3.18.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome-games
-
-DESCRIPTION="A collection of solitaire card games for GNOME"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot;
-
-LICENSE="GPL-3 LGPL-3 FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome qt4"
-
-# FIXME: quartz support?
-# Does not build with guile-2.0.0 or 2.0.1
-COMMON_DEPEND="
- >=dev-libs/glib-2.32:2
- >=dev-scheme/guile-2.0.5:2[deprecated,regex]
- >=gnome-base/librsvg-2.32:2
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/cairo-1.10
- >=x11-libs/gtk+-3.4:3
- gnome? ( >=gnome-base/gconf-2.0:2 )
- qt4? ( >=dev-qt/qtsvg-4.4:4 )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/gzip
- dev-libs/libxml2
- >=dev-util/intltool-0.40.4
- dev-util/itstool
- sys-apps/lsb-release
- >=sys-devel/gettext-0.12
- virtual/pkgconfig
- gnome? ( app-text/docbook-xml-dtd:4.3 )
-"
-# dev-util/itstool really needed for help file generation
-# >=app-text/yelp-tools-3.1.1
-
-src_prepare() {
- # Fix SVG detection and usage
- epatch "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- local myconf=()
-
- if use gnome; then
- myconf+=(
- --with-platform=gnome
- --with-help-method=ghelp
- )
- else
- myconf+=(
- --with-platform=gtk-only
- --with-help-method=library
- )
- fi
-
- if use qt4 ; then
- myconf+=(
- --with-card-theme-formats=all
-
--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
- )
- else
- myconf+=( --with-card-theme-formats=svg,fixed,pysol )
- fi
-
- gnome2_src_configure \
- --with-gtk=3.0 \
- --with-guile=2.0 \
- --enable-sound \
-
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
- GUILE=$(type -P guile-2.0) \
- ${myconf[@]}
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- elog "Aisleriot can use additional card themes from games-board/pysolfc"
- elog "and kde-base/libkdegames."
-}
diff --git a/games-board/aisleriot/aisleriot-3.16.2.ebuild
b/games-board/aisleriot/aisleriot-3.20.2.ebuild
similarity index 87%
rename from games-board/aisleriot/aisleriot-3.16.2.ebuild
rename to games-board/aisleriot/aisleriot-3.20.2.ebuild
index e7535d4..dc2b6e1 100644
--- a/games-board/aisleriot/aisleriot-3.16.2.ebuild
+++ b/games-board/aisleriot/aisleriot-3.20.2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
-GCONF_DEBUG="yes"
+EAPI=6
-inherit autotools eutils gnome-games
+inherit autotools gnome2
DESCRIPTION="A collection of solitaire card games for GNOME"
HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot;
@@ -13,13 +12,13 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot;
LICENSE="GPL-3 LGPL-3 FDL-1.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="gnome qt4"
+IUSE="debug gnome qt4"
# FIXME: quartz support?
# Does not build with guile-2.0.0 or 2.0.1
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
- >=dev-scheme/guile-2.0.5:2[deprecated,regex]
+ >=dev-scheme/guile-2.0.5:12[deprecated,regex]
>=gnome-base/librsvg-2.32:2
>=media-libs/libcanberra-0.26[gtk3]
>=x11-libs/cairo-1.10
@@ -42,7 +41,7 @@ DEPEND="${COMMON_DEPEND}
src_prepare() {
# Fix SVG detection and usage
- epatch "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch
+ eapply "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch
eautoreconf
gnome2_src_prepare
@@ -75,6 +74,7 @@ src_configure() {
gnome2_src_configure \
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
commit: 2d63d9e07c76d9d5211ba8f35859af48328f2784 Author: Mart Raudsepp gentoo org> AuthorDate: Thu Mar 17 21:26:05 2016 + Commit: Mart Raudsepp gentoo org> CommitDate: Thu Mar 17 21:26:05 2016 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2d63d9e0 games-board/aisleriot: GLEP 67ify metadata.xml games-board/aisleriot/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/games-board/aisleriot/metadata.xml b/games-board/aisleriot/metadata.xml index da6fd63..3998080 100644 --- a/games-board/aisleriot/metadata.xml +++ b/games-board/aisleriot/metadata.xml @@ -1,5 +1,8 @@ http://www.gentoo.org/dtd/metadata.dtd;> -gnome + + gn...@gentoo.org + Gentoo GNOME Desktop +
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
commit: f15a11a81963166b85224a77685ed5ba6d391639
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Wed Nov 25 14:42:18 2015 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Wed Nov 25 14:42:18 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f15a11a8
games-board/aisleriot: version bump to 3.18.2
Package-Manager: portage-2.2.25
RepoMan-Options: --force
Manifest-Sign-Key: C6085806
games-board/aisleriot/aisleriot-3.18.2.ebuild | 89 +++
1 file changed, 89 insertions(+)
diff --git a/games-board/aisleriot/aisleriot-3.18.2.ebuild
b/games-board/aisleriot/aisleriot-3.18.2.ebuild
new file mode 100644
index 000..e7535d4
--- /dev/null
+++ b/games-board/aisleriot/aisleriot-3.18.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils gnome-games
+
+DESCRIPTION="A collection of solitaire card games for GNOME"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot;
+
+LICENSE="GPL-3 LGPL-3 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome qt4"
+
+# FIXME: quartz support?
+# Does not build with guile-2.0.0 or 2.0.1
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
+ >=dev-scheme/guile-2.0.5:2[deprecated,regex]
+ >=gnome-base/librsvg-2.32:2
+ >=media-libs/libcanberra-0.26[gtk3]
+ >=x11-libs/cairo-1.10
+ >=x11-libs/gtk+-3.4:3
+ gnome? ( >=gnome-base/gconf-2.0:2 )
+ qt4? ( >=dev-qt/qtsvg-4.4:4 )
+"
+DEPEND="${COMMON_DEPEND}
+ app-arch/gzip
+ dev-libs/libxml2
+ >=dev-util/intltool-0.40.4
+ dev-util/itstool
+ sys-apps/lsb-release
+ >=sys-devel/gettext-0.12
+ virtual/pkgconfig
+ gnome? ( app-text/docbook-xml-dtd:4.3 )
+"
+# dev-util/itstool really needed for help file generation
+# >=app-text/yelp-tools-3.1.1
+
+src_prepare() {
+ # Fix SVG detection and usage
+ epatch "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ local myconf=()
+
+ if use gnome; then
+ myconf+=(
+ --with-platform=gnome
+ --with-help-method=ghelp
+ )
+ else
+ myconf+=(
+ --with-platform=gtk-only
+ --with-help-method=library
+ )
+ fi
+
+ if use qt4 ; then
+ myconf+=(
+ --with-card-theme-formats=all
+
--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
+ )
+ else
+ myconf+=( --with-card-theme-formats=svg,fixed,pysol )
+ fi
+
+ gnome2_src_configure \
+ --with-gtk=3.0 \
+ --with-guile=2.0 \
+ --enable-sound \
+
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
+ GUILE=$(type -P guile-2.0) \
+ ${myconf[@]}
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ elog "Aisleriot can use additional card themes from games-board/pysolfc"
+ elog "and kde-base/libkdegames."
+}
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
commit: 758875980be70df8c5294bc4fbf6fe4703e14f85
Author: Alexandre Rostovtsev tetromino AT gentoo DOT org
AuthorDate: Sat Aug 15 05:11:10 2015 +
Commit: Alexandre Rostovtsev tetromino AT gentoo DOT org
CommitDate: Sat Aug 15 05:11:10 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=75887598
games-board/aisleriot: do not override ITSTOOL, it's needed for help files
games-board/aisleriot/aisleriot-3.16.2.ebuild | 3 ++-
games-board/aisleriot/aisleriot-.ebuild | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/games-board/aisleriot/aisleriot-3.16.2.ebuild
b/games-board/aisleriot/aisleriot-3.16.2.ebuild
index 9c3ff07..fde1051 100644
--- a/games-board/aisleriot/aisleriot-3.16.2.ebuild
+++ b/games-board/aisleriot/aisleriot-3.16.2.ebuild
@@ -31,11 +31,13 @@ DEPEND=${COMMON_DEPEND}
app-arch/gzip
dev-libs/libxml2
=dev-util/intltool-0.40.4
+ dev-util/itstool
sys-apps/lsb-release
=sys-devel/gettext-0.12
virtual/pkgconfig
gnome? ( app-text/docbook-xml-dtd:4.3 )
+# dev-util/itstool really needed for help file generation
# =app-text/yelp-tools-3.1.1
src_prepare() {
@@ -76,7 +78,6 @@ src_configure() {
--enable-sound \
--with-pysol-card-theme-path=${EPREFIX}${GAMES_DATADIR}/pysolfc \
GUILE=$(type -P guile-2.0) \
- ITSTOOL=$(type -P true) \
${myconf[@]}
}
diff --git a/games-board/aisleriot/aisleriot-.ebuild
b/games-board/aisleriot/aisleriot-.ebuild
index d1c76ca..771cf44 100644
--- a/games-board/aisleriot/aisleriot-.ebuild
+++ b/games-board/aisleriot/aisleriot-.ebuild
@@ -38,11 +38,13 @@ DEPEND=${COMMON_DEPEND}
app-arch/gzip
dev-libs/libxml2
=dev-util/intltool-0.40.4
+ dev-util/itstool
sys-apps/lsb-release
=sys-devel/gettext-0.12
virtual/pkgconfig
gnome? ( app-text/docbook-xml-dtd:4.3 )
+# dev-util/itstool really needed for help file generation
# =app-text/yelp-tools-3.1.1
src_prepare() {
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
commit: f1e607fa1eedc95d96fcf567f6a42b7f386caab2
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun May 24 10:06:41 2015 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun May 24 10:06:41 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f1e607fa
games-board/aisleriot: fix build failures when all themes are enabled
games-board/aisleriot/aisleriot-3.16.2.ebuild | 28 +++---
games-board/aisleriot/aisleriot-.ebuild | 29 +++
2 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/games-board/aisleriot/aisleriot-3.16.2.ebuild
b/games-board/aisleriot/aisleriot-3.16.2.ebuild
index ccf1878..9c3ff07 100644
--- a/games-board/aisleriot/aisleriot-3.16.2.ebuild
+++ b/games-board/aisleriot/aisleriot-3.16.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE=https://wiki.gnome.org/action/show/Apps/Aisleriot;
LICENSE=GPL-3 LGPL-3 FDL-1.1
SLOT=0
KEYWORDS=~amd64 ~x86
-IUSE=gnome
+IUSE=gnome qt4
# FIXME: quartz support?
# Does not build with guile-2.0.0 or 2.0.1
@@ -25,6 +25,7 @@ COMMON_DEPEND=
=x11-libs/cairo-1.10
=x11-libs/gtk+-3.4:3
gnome? ( =gnome-base/gconf-2.0:2 )
+ qt4? ( =dev-qt/qtsvg-4.4:4 )
DEPEND=${COMMON_DEPEND}
app-arch/gzip
@@ -46,24 +47,37 @@ src_prepare() {
}
src_configure() {
- local myconf
+ local myconf=()
if use gnome; then
- myconf=--with-platform=gnome --with-help-method=ghelp
+ myconf+=(
+ --with-platform=gnome
+ --with-help-method=ghelp
+ )
else
- myconf=--with-platform=gtk-only --with-help-method=library
+ myconf+=(
+ --with-platform=gtk-only
+ --with-help-method=library
+ )
+ fi
+
+ if use qt4 ; then
+ myconf+=(
+ --with-card-theme-formats=all
+
--with-kde-card-theme-path=${EPREFIX}/usr/share/apps/carddecks
+ )
+ else
+ myconf+=( --with-card-theme-formats=svg,fixed,pysol )
fi
gnome2_src_configure \
--with-gtk=3.0 \
--with-guile=2.0 \
--enable-sound \
- --with-card-theme-formats=all \
-
--with-kde-card-theme-path=${EPREFIX}/usr/share/apps/carddecks \
--with-pysol-card-theme-path=${EPREFIX}${GAMES_DATADIR}/pysolfc \
GUILE=$(type -P guile-2.0) \
ITSTOOL=$(type -P true) \
- ${myconf}
+ ${myconf[@]}
}
pkg_postinst() {
diff --git a/games-board/aisleriot/aisleriot-.ebuild
b/games-board/aisleriot/aisleriot-.ebuild
index e5e5334..d1c76ca 100644
--- a/games-board/aisleriot/aisleriot-.ebuild
+++ b/games-board/aisleriot/aisleriot-.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} = ]]; then
else
KEYWORDS=~amd64 ~x86
fi
-IUSE=gnome
+IUSE=gnome qt4
# FIXME: quartz support?
# Does not build with guile-2.0.0 or 2.0.1
@@ -32,6 +32,7 @@ COMMON_DEPEND=
=x11-libs/cairo-1.10
=x11-libs/gtk+-3.4:3
gnome? ( =gnome-base/gconf-2.0:2 )
+ qt4? ( =dev-qt/qtsvg-4.4:4 )
DEPEND=${COMMON_DEPEND}
app-arch/gzip
@@ -53,24 +54,36 @@ src_prepare() {
}
src_configure() {
- local myconf
+ local myconf=()
if use gnome; then
- myconf=--with-platform=gnome --with-help-method=ghelp
+ myconf+=(
+ --with-platform=gnome
+ --with-help-method=ghelp
+ )
else
- myconf=--with-platform=gtk-only --with-help-method=library
+ myconf+=(
+ --with-platform=gtk-only
+ --with-help-method=library
+ )
+ fi
+
+ if use qt4 ; then
+ myconf+=(
+ --with-card-theme-formats=all
+
--with-kde-card-theme-path=${EPREFIX}/usr/share/apps/carddecks
+ )
+ else
+ myconf+=( --with-card-theme-formats=svg,fixed,pysol )
fi
gnome2_src_configure \
--with-gtk=3.0 \
--with-guile=2.0 \
--enable-sound \
- --with-card-theme-formats=all \
-
--with-kde-card-theme-path=${EPREFIX}/usr/share/apps/carddecks \
--with-pysol-card-theme-path=${EPREFIX}${GAMES_DATADIR}/pysolfc \
GUILE=$(type -P guile-2.0) \
- ITSTOOL=$(type -P true) \
- ${myconf}
+ ${myconf[@]}
}
pkg_postinst() {
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/
commit: f76a846837dfd585a2965f60f9514a1b341b7482
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Tue May 19 18:45:43 2015 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Tue May 19 18:50:48 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f76a8468
games-board/aisleriot: do not override XMLLINT anymore
It is used for glib-compile-resources to strip blanks from xml files.
games-board/aisleriot/aisleriot-3.16.2.ebuild | 1 -
games-board/aisleriot/aisleriot-.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/games-board/aisleriot/aisleriot-3.16.2.ebuild
b/games-board/aisleriot/aisleriot-3.16.2.ebuild
index f4a5f8a..ccf1878 100644
--- a/games-board/aisleriot/aisleriot-3.16.2.ebuild
+++ b/games-board/aisleriot/aisleriot-3.16.2.ebuild
@@ -63,7 +63,6 @@ src_configure() {
--with-pysol-card-theme-path=${EPREFIX}${GAMES_DATADIR}/pysolfc \
GUILE=$(type -P guile-2.0) \
ITSTOOL=$(type -P true) \
- XMLLINT=$(type -P true) \
${myconf}
}
diff --git a/games-board/aisleriot/aisleriot-.ebuild
b/games-board/aisleriot/aisleriot-.ebuild
index 0cf9ad6..e5e5334 100644
--- a/games-board/aisleriot/aisleriot-.ebuild
+++ b/games-board/aisleriot/aisleriot-.ebuild
@@ -70,7 +70,6 @@ src_configure() {
--with-pysol-card-theme-path=${EPREFIX}${GAMES_DATADIR}/pysolfc \
GUILE=$(type -P guile-2.0) \
ITSTOOL=$(type -P true) \
- XMLLINT=$(type -P true) \
${myconf}
}
[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/, games-board/aisleriot/files/
commit: b3277001ace571abba8a04bc07e4f5c5616b2cae
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun May 10 22:26:47 2015 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun May 10 22:26:47 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b3277001
games-board/aisleriot: → 3.16.2
Try to package aisleriot again for bug #475324.
Currently fails due to undefined references due to card theme handling.
games-board/aisleriot/aisleriot-3.16.2.ebuild | 75 ++
games-board/aisleriot/aisleriot-.ebuild| 72 +++--
.../files/aisleriot-3.16.2-detect-svg.patch| 28
3 files changed, 140 insertions(+), 35 deletions(-)
diff --git a/games-board/aisleriot/aisleriot-3.16.2.ebuild
b/games-board/aisleriot/aisleriot-3.16.2.ebuild
new file mode 100644
index 000..f4a5f8a
--- /dev/null
+++ b/games-board/aisleriot/aisleriot-3.16.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+GCONF_DEBUG=yes
+
+inherit autotools eutils gnome-games
+
+DESCRIPTION=A collection of solitaire card games for GNOME
+HOMEPAGE=https://wiki.gnome.org/action/show/Apps/Aisleriot;
+
+LICENSE=GPL-3 LGPL-3 FDL-1.1
+SLOT=0
+KEYWORDS=~amd64 ~x86
+IUSE=gnome
+
+# FIXME: quartz support?
+# Does not build with guile-2.0.0 or 2.0.1
+COMMON_DEPEND=
+ =dev-libs/glib-2.32:2
+ =dev-scheme/guile-2.0.5:2[deprecated,regex]
+ =gnome-base/librsvg-2.32:2
+ =media-libs/libcanberra-0.26[gtk3]
+ =x11-libs/cairo-1.10
+ =x11-libs/gtk+-3.4:3
+ gnome? ( =gnome-base/gconf-2.0:2 )
+
+DEPEND=${COMMON_DEPEND}
+ app-arch/gzip
+ dev-libs/libxml2
+ =dev-util/intltool-0.40.4
+ sys-apps/lsb-release
+ =sys-devel/gettext-0.12
+ virtual/pkgconfig
+ gnome? ( app-text/docbook-xml-dtd:4.3 )
+
+# =app-text/yelp-tools-3.1.1
+
+src_prepare() {
+ # Fix SVG detection and usage
+ epatch ${FILESDIR}/${PN}-3.16.2-detect-svg.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ local myconf
+
+ if use gnome; then
+ myconf=--with-platform=gnome --with-help-method=ghelp
+ else
+ myconf=--with-platform=gtk-only --with-help-method=library
+ fi
+
+ gnome2_src_configure \
+ --with-gtk=3.0 \
+ --with-guile=2.0 \
+ --enable-sound \
+ --with-card-theme-formats=all \
+
--with-kde-card-theme-path=${EPREFIX}/usr/share/apps/carddecks \
+
--with-pysol-card-theme-path=${EPREFIX}${GAMES_DATADIR}/pysolfc \
+ GUILE=$(type -P guile-2.0) \
+ ITSTOOL=$(type -P true) \
+ XMLLINT=$(type -P true) \
+ ${myconf}
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ elog Aisleriot can use additional card themes from games-board/pysolfc
+ elog and kde-base/libkdegames.
+}
diff --git a/games-board/aisleriot/aisleriot-.ebuild
b/games-board/aisleriot/aisleriot-.ebuild
index fc4de84..0cf9ad6 100644
--- a/games-board/aisleriot/aisleriot-.ebuild
+++ b/games-board/aisleriot/aisleriot-.ebuild
@@ -1,20 +1,17 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=3
-GNOME_TARBALL_SUFFIX=xz
+EAPI=5
GCONF_DEBUG=yes
-# make sure games is inherited first so that the gnome2
-# functions will be called if they are not overridden
-inherit eutils games gnome2
+inherit autotools eutils gnome-games
if [[ ${PV} = ]]; then
inherit gnome2-live
fi
DESCRIPTION=A collection of solitaire card games for GNOME
-HOMEPAGE=http://live.gnome.org/Aisleriot;
+HOMEPAGE=https://wiki.gnome.org/action/show/Apps/Aisleriot;
LICENSE=GPL-3 LGPL-3 FDL-1.1
SLOT=0
@@ -27,20 +24,15 @@ IUSE=gnome
# FIXME: quartz support?
# Does not build with guile-2.0.0 or 2.0.1
-COMMON_DEPEND==dev-libs/glib-2.31.13:2
+COMMON_DEPEND=
+ =dev-libs/glib-2.32:2
=dev-scheme/guile-2.0.5:2[deprecated,regex]
- =gnome-base/librsvg-2.32.0:2
- =x11-libs/cairo-1.10.0
- x11-libs/gdk-pixbuf:2
- =x11-libs/gtk+-3.0.0:3
- x11-libs/libICE
- x11-libs/libSM
+ =gnome-base/librsvg-2.32:2
=media-libs/libcanberra-0.26[gtk3]
- gnome? ( =gnome-base/gconf-2.0:2 )
-# aisleriot was split off from gnome-games
-RDEPEND=${COMMON_DEPEND}
- !gnome-extra/gnome-games-3.1.1[aisleriot]
- !gnome-extra/gnome-games-3
+ =x11-libs/cairo-1.10
+ =x11-libs/gtk+-3.4:3
+ gnome? ( =gnome-base/gconf-2.0:2 )
+
DEPEND=${COMMON_DEPEND}
app-arch/gzip
dev-libs/libxml2
@@ -48,28 +40,38 @@ DEPEND=${COMMON_DEPEND}
sys-apps/lsb-release
=sys-devel/gettext-0.12
