From 3b7e4cedc5e55cf7a5cb49eea7b2132022e7faf3 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 22 Mar 2010 05:32:53 +0000 Subject: [PATCH] Version bump wrt #310623, #282279, #295758 and #300412. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- app-text/xiphos/ChangeLog | 9 ++++- app-text/xiphos/Manifest | 8 ++-- app-text/xiphos/xiphos-3.1.1.ebuild | 62 ----------------------------- app-text/xiphos/xiphos-3.1.2.ebuild | 53 ++++++++++++++++++++++++ app-text/xiphos/xiphos-3.1.ebuild | 62 ----------------------------- 5 files changed, 63 insertions(+), 131 deletions(-) delete mode 100644 app-text/xiphos/xiphos-3.1.1.ebuild create mode 100644 app-text/xiphos/xiphos-3.1.2.ebuild delete mode 100644 app-text/xiphos/xiphos-3.1.ebuild diff --git a/app-text/xiphos/ChangeLog b/app-text/xiphos/ChangeLog index 7eb2b516823f..39d3f28d6ee3 100644 --- a/app-text/xiphos/ChangeLog +++ b/app-text/xiphos/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-text/xiphos -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/ChangeLog,v 1.4 2009/08/10 00:39:05 beandog Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/ChangeLog,v 1.5 2010/03/22 05:32:53 ssuominen Exp $ + +*xiphos-3.1.2 (22 Mar 2010) + + 22 Mar 2010; Samuli Suominen +xiphos-3.1.2.ebuild: + Version bump wrt #310623, #282279, #295758 and #300412. *xiphos-3.1.1 (10 Aug 2009) diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest index 3082c4d7e28e..3d1eae762f6f 100644 --- a/app-text/xiphos/Manifest +++ b/app-text/xiphos/Manifest @@ -1,6 +1,4 @@ -DIST xiphos-3.1.1.tar.gz 5407696 RMD160 8713699c57efd303b5aa25d60c533f57c4a4dfa5 SHA1 2709246b46d278f2c0e17e56084a7e684ae956e5 SHA256 720c6184aa8a769d7b3842240672309c3ada31f6f336629158f6c945740a6458 -DIST xiphos-3.1.tar.gz 5380369 RMD160 15f58384ecfb06f9183a00b05903c0d4142a6f56 SHA1 ef99f70f283f0a3b9f62e744cd63afea80d2f2a0 SHA256 28669619864c51326a4aa7a1f865e1a3e81b7945aee90acd0d1e7b5a6f9b071b -EBUILD xiphos-3.1.1.ebuild 1910 RMD160 092e6cf21f1d7bd7fa1cc2ac4d266cd29ca0ab6e SHA1 a19c19fa7b0d17f522d45f987ce27e1e0899136e SHA256 8333e50e72d3c6a18c4f3c53d7db8bb6ccc7b7ba7b56b9ef9ce80444494b8bf5 -EBUILD xiphos-3.1.ebuild 1908 RMD160 2705d640c516a5d66a1e1f49361bac8a011dd185 SHA1 36a52955089a1d54fecde93685f6a22954124437 SHA256 d8e0166bff1a784457eeb1d7d765e15d2331aa5fbe7aeb145877022b45cd89ec -MISC ChangeLog 768 RMD160 f41e3425fd4a009c8724ab28f83b8eb75c7be095 SHA1 739814685edba6992354cdf0c6a0e03ed91a9e4c SHA256 4b8b8ed055652bf4368eff6cef080eb496ba1b9bce8f664ea46371cf2ebf6cc3 +DIST xiphos-3.1.2.tar.gz 4308575 RMD160 d045307738d7bda4b7747f080c6a3b6941ba07c8 SHA1 85906be12bf51a1613cabc74d388a633f7105ebe SHA256 002f520db9aa833eab672daf68f7f75b3a9db687f2e8cd3d6c961405180fad8e +EBUILD xiphos-3.1.2.ebuild 1310 RMD160 df9a00e3d79f5c0ababa020e88f1be01b736886e SHA1 e8f7c9fb0a771edc62ab1d862dc4ea26e0d329a4 SHA256 2a41ee4035359eec476b31768141b767a8d57816be1b70727a2279a914eee0a0 +MISC ChangeLog 934 RMD160 9a047769df1fd82ebb84d48c5316818d60837860 SHA1 674e8bc9c893c016c6f11715c3b1d556eebe9dd5 SHA256 1650b6d2e66abc3353bc00b2f5ecd53aae5a20bf3fa3abd40cf40a0e346faea0 MISC metadata.xml 225 RMD160 85b15c992c3c155290f10acea186147d766b0620 SHA1 31c995eec7e4afb352888c1d9c65e9107f894d0b SHA256 1dab477a800b766fe838154618bd7769afe79f427f3c05fa155ee1a411f5c006 diff --git a/app-text/xiphos/xiphos-3.1.1.ebuild b/app-text/xiphos/xiphos-3.1.1.ebuild deleted file mode 100644 index 1da66e98892c..000000000000 --- a/app-text/xiphos/xiphos-3.1.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/xiphos-3.1.1.ebuild,v 1.1 2009/08/10 00:39:05 beandog Exp $ - -EAPI="2" - -inherit libtool gnome2 eutils - -DESCRIPTION="GTK+ based Bible study software, formerly gnomesword" -HOMEPAGE="http://xiphos.org" -SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="firefox seamonkey spell xulrunner +gtkhtml" -RDEPEND=" - =app-text/sword-1.6.0 - >=x11-libs/gtk+-2 - >=gnome-base/libgnomeui-2 - >=gnome-base/libgnomeprintui-2.2 - >=gnome-base/libglade-2 - app-text/gnome-doc-utils - dev-libs/libxml2 - xulrunner? ( net-libs/xulrunner:1.8 ) - !xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) ) - !xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1* ) ) ) - !xulrunner? ( !firefox? ( !seamonkey? ( gtkhtml? ( >=gnome-extra/gtkhtml-3.18 ) ) ) ) - spell? ( - app-text/gnome-spell - >=gnome-base/libbonoboui-2 )" -DEPEND="${RDEPEND} - !app-text/gnomesword - >=dev-util/pkgconfig-0.12 - >=dev-util/intltool-0.29 - >=app-text/scrollkeeper-0.3.14" - -pkg_setup() { - if use xulrunner; then - G2CONF="${G2CONF} --with-gecko=xulrunner" - elif use firefox; then - G2CONF="${G2CONF} --with-gecko=firefox" - elif use seamonkey; then - G2CONF="${G2CONF} --with-gecko=seamonkey" - elif use gtkhtml; then - G2CONF="${G2CONF} --enable-gtkhtml" - else - eerror "Setup your USE flags to specify a backend to use:" - eerror "xulrunner, firefox, seamonkey or gtkhtml" - die "Fix USE flags" - fi - G2CONF="${G2CONF} $(use_enable spell pspell)" - DOCS="NEWS ChangeLog README TODO" - -} - -pkg_postinst() { - gnome2_pkg_postinst - - einfo "Xiphos requires modules to be of any use. You may install the" - einfo "sword modules packages in app-dicts/, or download modules" - einfo "individually from the sword website: http://crosswire.org/sword/" -} diff --git a/app-text/xiphos/xiphos-3.1.2.ebuild b/app-text/xiphos/xiphos-3.1.2.ebuild new file mode 100644 index 000000000000..2604359e29c8 --- /dev/null +++ b/app-text/xiphos/xiphos-3.1.2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/xiphos-3.1.2.ebuild,v 1.1 2010/03/22 05:32:53 ssuominen Exp $ + +EAPI=2 +GCONF_DEBUG=no +inherit gnome2 + +DESCRIPTION="GTK+ based Bible study software, formerly gnomesword" +HOMEPAGE="http://xiphos.org/" +SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz" + +LICENSE="GPL-2 FDL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="xulrunner" + +RDEPEND="dev-libs/glib:2 + >=x11-libs/gtk+-2.14:2 + dev-libs/libxml2 + >=gnome-base/libglade-2 + >=gnome-extra/gtkhtml-3.23 + >=app-text/sword-1.6 + dev-libs/dbus-glib + gnome-extra/libgsf + xulrunner? ( >=net-libs/xulrunner-1.9.1.3:1.9 )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + dev-util/intltool + sys-devel/gettext + app-text/rarian + >=app-text/gnome-doc-utils-0.3.2" + +pkg_setup() { + G2CONF="--docdir=/usr/share/doc/${PF} + --disable-dependency-tracking" + + if ! use xulrunner; then + G2CONF="${G2CONF} --without-gecko" + fi +} + +src_install() { + gnome2_src_install + prepalldocs +} + +pkg_postinst() { + gnome2_pkg_postinst + elog "Xiphos requires modules to be of any use. You may install the" + elog "sword modules packages in app-dicts/, or download modules" + elog "individually from the sword website: http://crosswire.org/sword/" +} diff --git a/app-text/xiphos/xiphos-3.1.ebuild b/app-text/xiphos/xiphos-3.1.ebuild deleted file mode 100644 index 87e91f010daa..000000000000 --- a/app-text/xiphos/xiphos-3.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/xiphos-3.1.ebuild,v 1.3 2009/08/01 04:59:11 beandog Exp $ - -EAPI="2" - -inherit libtool gnome2 eutils - -DESCRIPTION="GTK+ based Bible study software, formerly gnomesword" -HOMEPAGE="http://xiphos.org" -SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="firefox seamonkey spell xulrunner +gtkhtml" -RDEPEND=" - =app-text/sword-1.6.0 - >=x11-libs/gtk+-2 - >=gnome-base/libgnomeui-2 - >=gnome-base/libgnomeprintui-2.2 - >=gnome-base/libglade-2 - app-text/gnome-doc-utils - dev-libs/libxml2 - xulrunner? ( net-libs/xulrunner:1.8 ) - !xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) ) - !xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1* ) ) ) - !xulrunner? ( !firefox? ( !seamonkey? ( gtkhtml? ( >=gnome-extra/gtkhtml-3.18 ) ) ) ) - spell? ( - app-text/gnome-spell - >=gnome-base/libbonoboui-2 )" -DEPEND="${RDEPEND} - !app-text/gnomesword - >=dev-util/pkgconfig-0.12 - >=dev-util/intltool-0.29 - >=app-text/scrollkeeper-0.3.14" - -pkg_setup() { - if use xulrunner; then - G2CONF="${G2CONF} --with-gecko=xulrunner" - elif use firefox; then - G2CONF="${G2CONF} --with-gecko=firefox" - elif use seamonkey; then - G2CONF="${G2CONF} --with-gecko=seamonkey" - elif use gtkhtml; then - G2CONF="${G2CONF} --enable-gtkhtml" - else - eerror "Setup your USE flags to specify a backend to use:" - eerror "xulrunner, firefox, seamonkey or gtkhtml" - die "Fix USE flags" - fi - G2CONF="${G2CONF} $(use_enable spell pspell)" - DOCS="NEWS ChangeLog README TODO" - -} - -pkg_postinst() { - gnome2_pkg_postinst - - einfo "Xiphos requires modules to be of any use. You may install the" - einfo "sword modules packages in app-dicts/, or download modules" - einfo "individually from the sword website: http://crosswire.org/sword/" -} -- 2.26.2