From 829e21338223e709ecdab46801749a5543fb4d26 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Tue, 21 Aug 2018 08:25:32 +0300 Subject: app-text/xiphos: fix invalid dev-libs/glib[$PYTHON_USEDEP] deps Also fix >=glib-2 dep to glib:2 and libxml2 dep to libxml2:2 while here Closes: https://bugs.gentoo.org/664088 Package-Manager: Portage-2.3.47, Repoman-2.3.10 --- app-text/xiphos/xiphos-4.0.6a-r1.ebuild | 90 +++++++++++++++++++++++++++++++++ app-text/xiphos/xiphos-4.0.6a.ebuild | 90 --------------------------------- app-text/xiphos/xiphos-4.1.0-r1.ebuild | 88 ++++++++++++++++++++++++++++++++ app-text/xiphos/xiphos-4.1.0.ebuild | 88 -------------------------------- 4 files changed, 178 insertions(+), 178 deletions(-) create mode 100644 app-text/xiphos/xiphos-4.0.6a-r1.ebuild delete mode 100644 app-text/xiphos/xiphos-4.0.6a.ebuild create mode 100644 app-text/xiphos/xiphos-4.1.0-r1.ebuild delete mode 100644 app-text/xiphos/xiphos-4.1.0.ebuild (limited to 'app-text/xiphos') diff --git a/app-text/xiphos/xiphos-4.0.6a-r1.ebuild b/app-text/xiphos/xiphos-4.0.6a-r1.ebuild new file mode 100644 index 000000000000..c8c02b73669a --- /dev/null +++ b/app-text/xiphos/xiphos-4.0.6a-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs + +MY_PV="${PV}-20170820" +MY_P="${PN}-${MY_PV}" +DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)" +HOMEPAGE="http://xiphos.org/" +SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${MY_P}.tar.gz" + +LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1" +SLOT="0" +KEYWORDS="amd64" +IUSE="dbus debug" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + >=app-text/sword-1.7.4 + dev-libs/glib:2 + dev-libs/libxml2:2[${PYTHON_USEDEP}] + gnome-base/gconf[${PYTHON_USEDEP}] + gnome-extra/gtkhtml:4.0 + >=gnome-extra/libgsf-1.14 + net-libs/webkit-gtk:4 + x11-libs/gtk+:3 + dbus? ( dev-libs/dbus-glib ) +" +DEPEND="${RDEPEND} + app-text/docbook2X + app-text/gnome-doc-utils[${PYTHON_USEDEP}] + app-text/rarian + dev-libs/libxslt[${PYTHON_USEDEP}] + dev-util/intltool + >=net-libs/biblesync-1.1.2-r1[-static] + virtual/pkgconfig + sys-devel/gettext +" + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + sed -i \ + -e '/FLAGS_DEBUG/s:-g:-Wall:' \ + -e '/FLAGS_RELEASE/s:-O2:-Wall:' \ + wscript || die + default +} + +src_configure() { + append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1 + + tc-export AR CC CPP CXX RANLIB + + CCFLAGS="${CFLAGS}" \ + LINKFLAGS="${LDFLAGS}" \ + SGML2MAN="$(type -P docbook2man.pl)" \ + ./waf -v \ + --prefix=/usr \ + --gtk=3 \ + --enable-webkit2 \ + --debug-level=$(use debug && echo debug || echo release) \ + $(use dbus || echo --disable-dbus) \ + configure || die +} + +src_compile() { + ./waf -v build || die +} + +src_install() { + ./waf -v --destdir="${D}" install || die + + doman ${PN}.1 + dodoc AUTHORS ChangeLog RELEASE-NOTES TODO + + dodoc Xiphos.ogg + docompress -x /usr/share/doc/${PF}/Xiphos.ogg + + rm -rf "${ED}"/usr/share/doc/${PN} +} + +pkg_preinst() { gnome2_icon_savelist; } +pkg_postinst() { gnome2_icon_cache_update; } +pkg_postrm() { gnome2_icon_cache_update; } diff --git a/app-text/xiphos/xiphos-4.0.6a.ebuild b/app-text/xiphos/xiphos-4.0.6a.ebuild deleted file mode 100644 index 1bd7cf90e5b0..000000000000 --- a/app-text/xiphos/xiphos-4.0.6a.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs - -MY_PV="${PV}-20170820" -MY_P="${PN}-${MY_PV}" -DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)" -HOMEPAGE="http://xiphos.org/" -SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${MY_P}.tar.gz" - -LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1" -SLOT="0" -KEYWORDS="amd64" -IUSE="dbus debug" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - >=app-text/sword-1.7.4 - >=dev-libs/glib-2[${PYTHON_USEDEP}] - dev-libs/libxml2[${PYTHON_USEDEP}] - gnome-base/gconf[${PYTHON_USEDEP}] - gnome-extra/gtkhtml:4.0 - >=gnome-extra/libgsf-1.14 - net-libs/webkit-gtk:4 - x11-libs/gtk+:3 - dbus? ( dev-libs/dbus-glib ) -" -DEPEND="${RDEPEND} - app-text/docbook2X - app-text/gnome-doc-utils[${PYTHON_USEDEP}] - app-text/rarian - dev-libs/libxslt[${PYTHON_USEDEP}] - dev-util/intltool - >=net-libs/biblesync-1.1.2-r1[-static] - virtual/pkgconfig - sys-devel/gettext -" - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - sed -i \ - -e '/FLAGS_DEBUG/s:-g:-Wall:' \ - -e '/FLAGS_RELEASE/s:-O2:-Wall:' \ - wscript || die - default -} - -src_configure() { - append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1 - - tc-export AR CC CPP CXX RANLIB - - CCFLAGS="${CFLAGS}" \ - LINKFLAGS="${LDFLAGS}" \ - SGML2MAN="$(type -P docbook2man.pl)" \ - ./waf -v \ - --prefix=/usr \ - --gtk=3 \ - --enable-webkit2 \ - --debug-level=$(use debug && echo debug || echo release) \ - $(use dbus || echo --disable-dbus) \ - configure || die -} - -src_compile() { - ./waf -v build || die -} - -src_install() { - ./waf -v --destdir="${D}" install || die - - doman ${PN}.1 - dodoc AUTHORS ChangeLog RELEASE-NOTES TODO - - dodoc Xiphos.ogg - docompress -x /usr/share/doc/${PF}/Xiphos.ogg - - rm -rf "${ED}"/usr/share/doc/${PN} -} - -pkg_preinst() { gnome2_icon_savelist; } -pkg_postinst() { gnome2_icon_cache_update; } -pkg_postrm() { gnome2_icon_cache_update; } diff --git a/app-text/xiphos/xiphos-4.1.0-r1.ebuild b/app-text/xiphos/xiphos-4.1.0-r1.ebuild new file mode 100644 index 000000000000..a9f5298597bd --- /dev/null +++ b/app-text/xiphos/xiphos-4.1.0-r1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs + +DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)" +HOMEPAGE="http://xiphos.org/" +SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1" +SLOT="0" +KEYWORDS="~amd64" +IUSE="dbus debug" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + >=app-text/sword-1.8.0 + dev-libs/glib:2 + dev-libs/libxml2:2[${PYTHON_USEDEP}] + gnome-base/gconf[${PYTHON_USEDEP}] + gnome-extra/gtkhtml:4.0 + >=gnome-extra/libgsf-1.14 + net-libs/webkit-gtk:4 + x11-libs/gtk+:3 + dbus? ( dev-libs/dbus-glib ) +" +DEPEND="${RDEPEND} + app-text/docbook2X + app-text/gnome-doc-utils[${PYTHON_USEDEP}] + app-text/rarian + dev-libs/libxslt[${PYTHON_USEDEP}] + dev-util/intltool + >=net-libs/biblesync-1.1.2-r1[-static] + virtual/pkgconfig + sys-devel/gettext +" + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + sed -i \ + -e '/FLAGS_DEBUG/s:-g:-Wall:' \ + -e '/FLAGS_RELEASE/s:-O2:-Wall:' \ + wscript || die + default +} + +src_configure() { + append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1 + + tc-export AR CC CPP CXX RANLIB + + CCFLAGS="${CFLAGS}" \ + LINKFLAGS="${LDFLAGS}" \ + SGML2MAN="$(type -P docbook2man.pl)" \ + ./waf -v \ + --prefix=/usr \ + --gtk=3 \ + --enable-webkit2 \ + --debug-level=$(use debug && echo debug || echo release) \ + $(use dbus || echo --disable-dbus) \ + configure || die +} + +src_compile() { + ./waf -v build || die +} + +src_install() { + ./waf -v --destdir="${D}" install || die + + doman ${PN}.1 + dodoc AUTHORS ChangeLog RELEASE-NOTES TODO + + dodoc Xiphos.ogg + docompress -x /usr/share/doc/${PF}/Xiphos.ogg + + rm -rf "${ED}"/usr/share/doc/${PN} +} + +pkg_preinst() { gnome2_icon_savelist; } +pkg_postinst() { gnome2_icon_cache_update; } +pkg_postrm() { gnome2_icon_cache_update; } diff --git a/app-text/xiphos/xiphos-4.1.0.ebuild b/app-text/xiphos/xiphos-4.1.0.ebuild deleted file mode 100644 index 9824202606e8..000000000000 --- a/app-text/xiphos/xiphos-4.1.0.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs - -DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)" -HOMEPAGE="http://xiphos.org/" -SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1" -SLOT="0" -KEYWORDS="~amd64" -IUSE="dbus debug" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - >=app-text/sword-1.8.0 - >=dev-libs/glib-2[${PYTHON_USEDEP}] - dev-libs/libxml2[${PYTHON_USEDEP}] - gnome-base/gconf[${PYTHON_USEDEP}] - gnome-extra/gtkhtml:4.0 - >=gnome-extra/libgsf-1.14 - net-libs/webkit-gtk:4 - x11-libs/gtk+:3 - dbus? ( dev-libs/dbus-glib ) -" -DEPEND="${RDEPEND} - app-text/docbook2X - app-text/gnome-doc-utils[${PYTHON_USEDEP}] - app-text/rarian - dev-libs/libxslt[${PYTHON_USEDEP}] - dev-util/intltool - >=net-libs/biblesync-1.1.2-r1[-static] - virtual/pkgconfig - sys-devel/gettext -" - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - sed -i \ - -e '/FLAGS_DEBUG/s:-g:-Wall:' \ - -e '/FLAGS_RELEASE/s:-O2:-Wall:' \ - wscript || die - default -} - -src_configure() { - append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1 - - tc-export AR CC CPP CXX RANLIB - - CCFLAGS="${CFLAGS}" \ - LINKFLAGS="${LDFLAGS}" \ - SGML2MAN="$(type -P docbook2man.pl)" \ - ./waf -v \ - --prefix=/usr \ - --gtk=3 \ - --enable-webkit2 \ - --debug-level=$(use debug && echo debug || echo release) \ - $(use dbus || echo --disable-dbus) \ - configure || die -} - -src_compile() { - ./waf -v build || die -} - -src_install() { - ./waf -v --destdir="${D}" install || die - - doman ${PN}.1 - dodoc AUTHORS ChangeLog RELEASE-NOTES TODO - - dodoc Xiphos.ogg - docompress -x /usr/share/doc/${PF}/Xiphos.ogg - - rm -rf "${ED}"/usr/share/doc/${PN} -} - -pkg_preinst() { gnome2_icon_savelist; } -pkg_postinst() { gnome2_icon_cache_update; } -pkg_postrm() { gnome2_icon_cache_update; } -- cgit v1.2.3-65-gdbad