summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Reffett <creffett@gentoo.org>2014-01-06 02:02:01 +0000
committerChris Reffett <creffett@gentoo.org>2014-01-06 02:02:01 +0000
commita2a38040f66f2b58e245a1a65e1459df24c372ff (patch)
tree3a32df43601691cec737150e370bb2b2c94cceda /app-text/xiphos
parentfixed remote denial of ssh service (CVE-2013-6890, bug #495130), added purge ... (diff)
downloadhistorical-a2a38040f66f2b58e245a1a65e1459df24c372ff.tar.gz
historical-a2a38040f66f2b58e245a1a65e1459df24c372ff.tar.bz2
historical-a2a38040f66f2b58e245a1a65e1459df24c372ff.zip
Bump to EAPI 5, change to python-single-r1
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0x42618354
Diffstat (limited to 'app-text/xiphos')
-rw-r--r--app-text/xiphos/ChangeLog8
-rw-r--r--app-text/xiphos/Manifest16
-rw-r--r--app-text/xiphos/xiphos-3.1.5.ebuild24
3 files changed, 33 insertions, 15 deletions
diff --git a/app-text/xiphos/ChangeLog b/app-text/xiphos/ChangeLog
index 1d6a6d569f52..fd676d5934a0 100644
--- a/app-text/xiphos/ChangeLog
+++ b/app-text/xiphos/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-text/xiphos
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/ChangeLog,v 1.14 2012/05/04 03:33:12 jdhore Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/ChangeLog,v 1.15 2014/01/06 02:01:51 creffett Exp $
+
+ 06 Jan 2014; Chris Reffett <creffett@gentoo.org> xiphos-3.1.5.ebuild:
+ Bump to EAPI 5, change to python-single-r1
04 May 2012; Jeff Horelick <jdhore@gentoo.org> xiphos-3.1.5.ebuild:
dev-util/pkgconfig -> virtual/pkgconfig
@@ -62,4 +65,3 @@
+metadata.xml:
Initial commit, bug 263309; Thanks to Greg <greg.hellings@gmail.com> for
original ebuild
-
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 19b17559c6de..666b0286fd7f 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST xiphos-3.1.5.tar.gz 6720533 SHA256 2887426908e269f25d2d191be445112027b2b7e80356823d4942b1803a359d8c SHA512 2183125a1076660cf0448ee5f2df3ded9ee58c389716a8ceefe0185989d6c8267f19082add3fa8a7a9da57693f82b47e26c0fe77154e961b84234afbdf5b3a1d WHIRLPOOL 6a66671ab99cc62f0beb6bdfffcec2ff1048cae66ad6304fd788d005c0d0bf81273856af6373eba0bdf5fd6df0176894e1a99fe633fcd1fbad46c78b89848bbf
-EBUILD xiphos-3.1.5.ebuild 2039 SHA256 ba481ecb0b101e127c939552ac35371644ab78ab8ca8b7b5137d78eea452652e SHA512 192ac80f53366dd1ce5b22d2c8e3001a7d8924703c7ea6dbaf943afb697ea0debbfbef61f30050c3152121108ddf37f7ad4cd0434ca89e8dff5ff875cc65393b WHIRLPOOL 1b269c66a1cc507d134a9a2351f1c7623b07c03853a45953fae68175f1e95dc9075dbc59b37af6f78c262c085aa171b19d901af571cf530126e85bf8050b8e20
-MISC ChangeLog 2207 SHA256 8d8446fe3bc025aec70b4befc5e8055e160049ae1661bee853360a84a6a0c36e SHA512 3880fda20c44f502f705f824df55f02ce77e9cbce169f22aac07acaf651fa3ea218798aefff68a9499987254cda6c7742ecf0562b09c62d4ba004b72fd676c4d WHIRLPOOL 9701f202de8f2b951a20357dc9fc4f3bed3412e3fa54bc01ee57f174597ab37f9e82c05fd4205346b0af9736c2072c5e5f05c0e93da39e6a97f9f80df83398ac
+EBUILD xiphos-3.1.5.ebuild 2075 SHA256 e44809376eb1741c47f86c4694fd1aaa9d49cbcaee547734a01f022817e534f7 SHA512 54e70767852a9a2b930391f4266389431e57ff20ef8dd09d76e40e380393183d423d0d533118c62c8952b6b9a21f32e0edf3cf7bacee91ee7c87ffb80580fe71 WHIRLPOOL 66f052c14ee9bf276ea83f9171cd77997b72df9100a82755313df65332d747fb7de625c5f384299cd806221d75ba8c9ed18cf64134fa3990f7ee8071645f668a
+MISC ChangeLog 2326 SHA256 a5baadd54a3b126f7d45ddb5a0ecac530d16ed6eed8d05973bf240f27365f1ee SHA512 90af325b5829e1b087c6c29536e48a0aa5aa0c55a1a2314680ec38fa98c4a6d27d57ee29707859a2883e9e870ce523bb4d918d45152fd8c40ef2e40de8b95411 WHIRLPOOL 0d881ecbb89374c37a59a1206e5914a67a211733a95ff1152fd1ddf8b2b8e3b11d08aec8b45a65024ee49d8f9dec07185b8fd0369cf88a8c84d7a40d7f49955a
MISC metadata.xml 358 SHA256 b148fed9acaa084618c6f756c36071647f513e0ff421e7766c243ff856191b71 SHA512 78d7cef39c3ae893cf895ba0c4d84caef664fa7d90bba2bc26c390cc2e6da6a73caf434dac191ab7a6a65073a98f45731a30cd044631e189f618da0e87793caf WHIRLPOOL e76674d1fe825921ef5bbaacdaad326a85507ced79836400adcdab179015ae5a8727b4bda082380b405afbb276cb833f7dddbba58f6ad3ff6ac9466a46f6ac8a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iKYEAREIAGYFAlLKDohfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1RGfACgnocNwepxa+HBSH5uSszzWw+O
+k6AAn1434ygx4dcpmUGgQU5umds3/Lew
+=ayw7
+-----END PGP SIGNATURE-----
diff --git a/app-text/xiphos/xiphos-3.1.5.ebuild b/app-text/xiphos/xiphos-3.1.5.ebuild
index c705913b2810..9f708773dc5e 100644
--- a/app-text/xiphos/xiphos-3.1.5.ebuild
+++ b/app-text/xiphos/xiphos-3.1.5.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.5.ebuild,v 1.6 2012/05/04 03:33:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/xiphos-3.1.5.ebuild,v 1.7 2014/01/06 02:01:51 creffett Exp $
# TODO: waf-utils.eclass ?
-EAPI=4
-inherit flag-o-matic gnome2-utils python toolchain-funcs
+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/"
@@ -16,7 +17,10 @@ SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE="dbus debug webkit"
-RDEPEND=">=app-text/sword-1.6.1
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ >=app-text/sword-1.6.1
>=dev-libs/glib-2
dev-libs/libxml2
gnome-base/gconf
@@ -24,7 +28,8 @@ RDEPEND=">=app-text/sword-1.6.1
>=gnome-extra/libgsf-1.14
x11-libs/gtk+:3
dbus? ( dev-libs/dbus-glib )
- webkit? ( net-libs/webkit-gtk:3 )"
+ webkit? ( net-libs/webkit-gtk:3 )
+"
DEPEND="${RDEPEND}
app-text/docbook2X
app-text/gnome-doc-utils
@@ -32,12 +37,11 @@ DEPEND="${RDEPEND}
dev-libs/libxslt
dev-util/intltool
virtual/pkgconfig
- || ( dev-lang/python:2.7 dev-lang/python:2.6 )
- sys-devel/gettext"
+ sys-devel/gettext
+"
pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
+ python-single-r1_pkg_setup
}
src_prepare() {