From f54037e15a37d2e9887b23e2c8740478375eee41 Mon Sep 17 00:00:00 2001 From: Chris Reffett Date: Wed, 18 Feb 2015 15:06:20 +0000 Subject: [PATCH] Make dep on webkit-gtk mandatory, bug 516256. Drop old. Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xD1BAB6B528DB029C --- app-text/xiphos/ChangeLog | 8 ++- app-text/xiphos/Manifest | 34 +++++------ app-text/xiphos/xiphos-3.1.6.ebuild | 91 ----------------------------- app-text/xiphos/xiphos-3.2.2.ebuild | 21 +++---- 4 files changed, 31 insertions(+), 123 deletions(-) delete mode 100644 app-text/xiphos/xiphos-3.1.6.ebuild diff --git a/app-text/xiphos/ChangeLog b/app-text/xiphos/ChangeLog index 0611db384a94..60cc12d73aa8 100644 --- a/app-text/xiphos/ChangeLog +++ b/app-text/xiphos/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/xiphos -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/ChangeLog,v 1.17 2014/10/14 19:01:57 creffett Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/ChangeLog,v 1.18 2015/02/18 15:06:08 creffett Exp $ + + 18 Feb 2015; Chris Reffett -xiphos-3.1.6.ebuild, + xiphos-3.2.2.ebuild: + Make dep on webkit-gtk mandatory, bug 516256. Drop old. *xiphos-3.2.2 (14 Oct 2014) diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest index 0537b5bbe6a5..48acb1713425 100644 --- a/app-text/xiphos/Manifest +++ b/app-text/xiphos/Manifest @@ -2,29 +2,27 @@ Hash: SHA256 DIST xiphos-3.1.5.tar.gz 6720533 SHA256 2887426908e269f25d2d191be445112027b2b7e80356823d4942b1803a359d8c SHA512 2183125a1076660cf0448ee5f2df3ded9ee58c389716a8ceefe0185989d6c8267f19082add3fa8a7a9da57693f82b47e26c0fe77154e961b84234afbdf5b3a1d WHIRLPOOL 6a66671ab99cc62f0beb6bdfffcec2ff1048cae66ad6304fd788d005c0d0bf81273856af6373eba0bdf5fd6df0176894e1a99fe633fcd1fbad46c78b89848bbf -DIST xiphos-3.1.6.tar.gz 6873107 SHA256 21f0024d57b3976526093279ef7ab7f3ed8afe07436ab983bd3049a14c3bdfe5 SHA512 5c25850ba549723993c7574c8629cfa75f4152a46173bfbbed9b62205041edebb34671e8aa5baade7b0aa8fbb218ff7b24292dc0e63ee2bb7e0219a8512feda9 WHIRLPOOL 3d1741e0d07983edfaacb3de85fac1f01352ffa5cb80596eb23b21c6b68a76069eae65d2892a9b987cb8ea41818bd3e92731929cb1c698a37d7886364339241f DIST xiphos-3.2.2.tar.gz 7088153 SHA256 2326efd2bad1b27d6c4231cba68077f71f91ee31f73bdada1cbe2c3bd11eadc6 SHA512 14dd33f99217de4062e6ff6c4030fce748f57bc7e4a984aa7927acb7779f3720da21a51eb2943d5be93eac702dcc32b023f9e39a91acb7182ce59b3c90941dbf WHIRLPOOL 488f3fb65b591a9122cc8fc8a1c118cb461ce1890205d53d5957633bb8ff240166616e4de3169afccf5799fb2db40e1e90ac8cef61f3f133e135dd9578227de8 EBUILD xiphos-3.1.5.ebuild 2075 SHA256 e44809376eb1741c47f86c4694fd1aaa9d49cbcaee547734a01f022817e534f7 SHA512 54e70767852a9a2b930391f4266389431e57ff20ef8dd09d76e40e380393183d423d0d533118c62c8952b6b9a21f32e0edf3cf7bacee91ee7c87ffb80580fe71 WHIRLPOOL 66f052c14ee9bf276ea83f9171cd77997b72df9100a82755313df65332d747fb7de625c5f384299cd806221d75ba8c9ed18cf64134fa3990f7ee8071645f668a -EBUILD xiphos-3.1.6.ebuild 2051 SHA256 b367823e857ddee1f12ead579b23e35a5e0e3633394abe89bc05476bfbedb3d5 SHA512 c2b83d4ccb331069d3639fc7d81463d4f0934f05e2ec4c86dbea6e28e0f3ff80924cee16ab52166d7f8e776e47e442104637c8a4526940c8cfe173fd0373cb8b WHIRLPOOL 710f1d4ba78d59d80d1c452a7772021987fe03ab3f1fe25cd5e61626910c18f86945fb7e7a94173e35434ecb816ea3167142e7cb2c250284c62d73ef5c154896 -EBUILD xiphos-3.2.2.ebuild 2040 SHA256 e7614fc1f6a513ca77a0ee83bd71c54c7b8ddda1efff7407bda9938f3cc93689 SHA512 59320fcd4476cd951f4639a1554c688daac833756daf63c52bd2566c22cfdfad215be9518aa53568981596b96c2ddd65d14828e17cefec948d2c811663d71348 WHIRLPOOL 4c1e1fa1421159c720a581cc4c25ffa9e291fae21fedcc5f883d28edcbe4b51c75978553c1c14dfe6da59c9979ba77211dfacee9d8af84fc2cc376126538c9aa -MISC ChangeLog 2609 SHA256 34c51b3585e9b07c369f970323c54ab68d2ac8b67351166ccf1c0f25a6dd8ac2 SHA512 78e624eb07e1964adb0088671036ae950e56f7d217a0729acf8d35afdc7beac7dc9e65ce047de0f0bc0d4daf34922393edcc1d77fea051d91611173bc99e9fd6 WHIRLPOOL b17a2c5c0289101462b16c16da1dfef38425e66a7cb19a786c7e212f66317a9d2edecb3f5a273d911bc6d29cd05f3cb336853403cb7013ba6258d73eb22c8e38 +EBUILD xiphos-3.2.2.ebuild 2057 SHA256 db566321ecf90bd01e91b79bf4e390b22151bb3ece74157772a36ed4be86c45d SHA512 82d2c5f6659f49e3f050165a22fa4fe5e472fd0105c99c2789d27e1c724348c8321f67d6837d4b5fa9d36a2d55b3f294b6734734867176b3bcd5c54c18291fa6 WHIRLPOOL fa52b021f31960cabc830bfa2e83fbf69045179b2dfb9ae6b54fdcee61b1ee1852be6837cfb5dd6b29d6244d7d589d0573fa9ea3346408f557f6e98964eea26c +MISC ChangeLog 2764 SHA256 29eb3f66078aebf4fb854fb37a9f290bdb7b6cb7fa53a402b9f996fbe7018dd7 SHA512 ab788d22e02ab397d06d4fa85cf1e8dda25395bf3db7a7cfb046493f40b7d6c12760a1979e88c1faa5eee4a18d748e2ce0c79e3e8e4405c180e24888b605851e WHIRLPOOL 202576626a8047b4fff757b2161d9fd33058e95545bf377f5b8d6e293cbdee4c5c7e201e03bf2e302a7aa878d68158088e948e02ae56fdb10579e177423c1a7c MISC metadata.xml 358 SHA256 b148fed9acaa084618c6f756c36071647f513e0ff421e7766c243ff856191b71 SHA512 78d7cef39c3ae893cf895ba0c4d84caef664fa7d90bba2bc26c390cc2e6da6a73caf434dac191ab7a6a65073a98f45731a30cd044631e189f618da0e87793caf WHIRLPOOL e76674d1fe825921ef5bbaacdaad326a85507ced79836400adcdab179015ae5a8727b4bda082380b405afbb276cb833f7dddbba58f6ad3ff6ac9466a46f6ac8a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUPXMjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJU5KpqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzgwNDhGMjg4MzhERTE1NTY2NjA4MkZE -MUJBQjZCNTI4REIwMjlDAAoJENG6trUo2wKcTJcP/3uIqBwvkqLU6Xzlm0orEUvh -6sqPOKUxvb41nuzxc1vWq00NswyVVTJA7ll4zlcVFnghQQsbWg1tQLhVoEdgNth6 -E8g0nx0TxUOKA+UPXg7dBIvCFrss4DKVF/p9RoOoVGgY9y6l/V6cX/k8lGVFjCp1 -Lp+I9aNrjJDLMqOL+62ql136cdqzXrfT4kUCuF4EOZjdyobJ2a4WlDhj/zAdPSKv -23y9ILYcfSXpsbQ25v01fndB80jgKut0Fupkga2n0TnH/N5Hc6sHd+XcYccPFW5H -sG1F113bUju6MR17+GQoPp+f/Yts1n98/JYsYTbt0i7Sn05UJFGy4My/hrD20NK5 -0UF4lEPhejMZmjhldRp8FUlEIGphUrLEXjWly3YMX4lIYP75NoK1EZw7/Pb3qvfp -8swvOEbxHvrkfUl5Ho/jRlGc4unexJgpPIK6HDB3ftnjUi/v/FVGgBkmdcicE2i7 -Y+t7AeNqgduFp6D7A/F5YcLrZKGR7bR9OZtozhS0UVxKhO+zJpD57cd0zzP7CW1Q -eixsqG27ves4Wic64PENrMIXP1QQ5KwZqr6RtSsywpVCFnGkXiMMZfYXNjkTIDRI -2qpKKEjCY/UvZXmiAzoibUguVZFhe58ngpm4fIw+lodquRE0Xn4cJ5h+RQ6mLeG2 -ipnqmQ29boLhIzVioviE -=W9G/ +MUJBQjZCNTI4REIwMjlDAAoJENG6trUo2wKcUtEQAJ36/CVoUhh3P6qgCiwGxF9d +RpDejkW/t2GAGL/u6dIpPcZg2uHuoC1eAFRr5xB7GUCF8KEYgOUcf9tcMU5aTBJH +0TWaAmsPFR+vo+5N90wzVno7izUiQHmccii8BrPBZRcVdZt/Wgz0zVVCqmKWWbBJ +bjHXa+Z0ihWHbvCubMEOYsQnEhwnvVdwu5jBSLIkBGFKOHeU3eVjXIee7mVo9xQk +memMDW/BsfdYYJDoYCtMI8JTIrKnuQKJOKDibN2X3SR7r4QlqMomj9yiOcLWGVN6 +85pzwnF+RbSasCCo78cZxQsiKcirM9OzYNCtFMKIq7WB0pyWQLjhi69m6hYOmw8Y +tCECn2KYU+tL29XqfsF/tbfmn0Ae2JmJUvuIETDa3OQ6EWjWB+9HB2O1l3U9SdtY +44UhfJu5ldAeCgG3j+PVOd+IV2oHrmNwXoEyX27aNuWav4qyjsRc9ScSZUIf/pJT +s0JIFGnNTtJWOPNjmPFp+rWZBOfxOcgkHFUQzkjD90YHwk8yj0rYC6SBNEdCtH+Q +SCF1hg7iHGGTOGbn3f65eEDGisYzuPpzgEjlmiGCtflP9c0/Fmx0eE/qzp7faHSc +pBdBB8MA5tXCIXmchcklS/DW8376dwmdIqhpcJrghqVzdIkn0AZqvUVePkBZfUmg +Hg5eBdLkazlZFkrw5df0 +=MPsT -----END PGP SIGNATURE----- diff --git a/app-text/xiphos/xiphos-3.1.6.ebuild b/app-text/xiphos/xiphos-3.1.6.ebuild deleted file mode 100644 index 4d4d627a236a..000000000000 --- a/app-text/xiphos/xiphos-3.1.6.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/xiphos-3.1.6.ebuild,v 1.1 2014/02/04 23:59:22 creffett Exp $ - -# TODO: waf-utils.eclass ? - -EAPI=5 -PYTHON_COMPAT=( python{2_6,2_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="mirror://sourceforge/gnomesword/${P}.tar.gz" - -LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="dbus debug webkit" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - >=app-text/sword-1.7.2 - >=dev-libs/glib-2 - dev-libs/libxml2 - gnome-base/gconf - gnome-extra/gtkhtml:4.0 - >=gnome-extra/libgsf-1.14 - x11-libs/gtk+:3 - dbus? ( dev-libs/dbus-glib ) - webkit? ( net-libs/webkit-gtk:3 ) -" -DEPEND="${RDEPEND} - app-text/docbook2X - app-text/gnome-doc-utils - app-text/rarian - dev-libs/libxslt - dev-util/intltool - 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 -} - -src_configure() { - append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1 - - tc-export AR CC CPP CXX RANLIB - - local backend=gtkhtml - use webkit && backend=webkit - - CCFLAGS="${CFLAGS}" \ - LINKFLAGS="${LDFLAGS}" \ - SGML2MAN="$(type -P docbook2man.pl)" \ - ./waf -v \ - --prefix=/usr \ - --gtk=3 \ - --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 NEWS README 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-3.2.2.ebuild b/app-text/xiphos/xiphos-3.2.2.ebuild index a2e4fa5cd869..a5127142de89 100644 --- a/app-text/xiphos/xiphos-3.2.2.ebuild +++ b/app-text/xiphos/xiphos-3.2.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/xiphos-3.2.2.ebuild,v 1.1 2014/10/14 19:01:57 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/xiphos-3.2.2.ebuild,v 1.2 2015/02/18 15:06:08 creffett Exp $ # TODO: waf-utils.eclass ? @@ -15,26 +15,26 @@ SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz" LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="dbus debug webkit" +IUSE="dbus debug" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} >=app-text/sword-1.7.3 - >=dev-libs/glib-2 - dev-libs/libxml2 - gnome-base/gconf + >=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:3 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib ) - webkit? ( net-libs/webkit-gtk:3 ) " DEPEND="${RDEPEND} app-text/docbook2X - app-text/gnome-doc-utils + app-text/gnome-doc-utils[${PYTHON_USEDEP}] app-text/rarian - dev-libs/libxslt + dev-libs/libxslt[${PYTHON_USEDEP}] dev-util/intltool virtual/pkgconfig sys-devel/gettext @@ -56,9 +56,6 @@ src_configure() { tc-export AR CC CPP CXX RANLIB - local backend=gtkhtml - use webkit && backend=webkit - CCFLAGS="${CFLAGS}" \ LINKFLAGS="${LDFLAGS}" \ SGML2MAN="$(type -P docbook2man.pl)" \ -- 2.26.2