Fix dependencies wrt bug # 146628, fix metadata.xml herd

Package-Manager: portage-2.1-r2

diff --git a/app-text/biblestudy/ChangeLog b/app-text/biblestudy/ChangeLog
index 94fe36ee70d4fff6997f25a850a5e22f27a1b013..e3fb40f3c633bb37d9537056b73b3f0477ee396c 100644 (file)
--- a/app-text/biblestudy/ChangeLog
+++ b/app-text/biblestudy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/biblestudy
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/biblestudy/ChangeLog,v 1.6 2006/06/03 05:15:44 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/biblestudy/ChangeLog,v 1.7 2006/09/07 04:09:03 beandog Exp $
+
+  07 Sep 2006; Steve Dibb <beandog@gentoo.org> metadata.xml,
+  biblestudy-1.0.ebuild:
+  Fix dependencies, add message aboug emerging modules.
+  See bug #146628
 
   03 Jun 2006; Alec Warner <antarus@gentoo.org> +metadata.xml,
   biblestudy-1.0.ebuild:

diff --git a/app-text/biblestudy/Manifest b/app-text/biblestudy/Manifest
index f2190c8018c975365f1fbf1394ba87e77390cc69..1768a05fd31367d8cd902e3915789e66d1076e6e 100644 (file)
--- a/app-text/biblestudy/Manifest
+++ b/app-text/biblestudy/Manifest
@@ -1,16 +1,16 @@
-DIST biblestudy-1.0.tar.bz2 353500
-EBUILD biblestudy-1.0.ebuild 939 RMD160 882151248c64ba25bf267406847d85b97ea09173 SHA1 8c7a621edab277ea729727fc8b09aa3bffedb4a4 SHA256 83200ef12b69cefbc690fda891c1a9a1c2f50f4b6a8f6bf9591cb17e86b7f350
-MD5 fc76529bebfa40de8a6fdf5ead11b322 biblestudy-1.0.ebuild 939
-RMD160 882151248c64ba25bf267406847d85b97ea09173 biblestudy-1.0.ebuild 939
-SHA256 83200ef12b69cefbc690fda891c1a9a1c2f50f4b6a8f6bf9591cb17e86b7f350 biblestudy-1.0.ebuild 939
-MISC ChangeLog 680 RMD160 f7ce11535061e831c9d82325348c53be95eb8cb6 SHA1 ee28569e23b2029bb205eebccb4d6838da96039f SHA256 9ea92aa8153e068fb3b7050be5458a39049cde82d9507e895318a31d5ed530c6
-MD5 9aa46d24b5b023530afe8e3b589a0ed3 ChangeLog 680
-RMD160 f7ce11535061e831c9d82325348c53be95eb8cb6 ChangeLog 680
-SHA256 9ea92aa8153e068fb3b7050be5458a39049cde82d9507e895318a31d5ed530c6 ChangeLog 680
-MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
-MD5 4eda2fda81ea6a89d8f1f4a2dcd12a85 metadata.xml 233
-RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 metadata.xml 233
-SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b metadata.xml 233
-MD5 4ce3856aabaac60d563fce705a065065 files/digest-biblestudy-1.0 67
-RMD160 c06b991834702f78e59d732bb25b8ba954982290 files/digest-biblestudy-1.0 67
-SHA256 5d132dc3be469bd005c884640c5b46cdc069440d071bb35c8066a49f0d53c83e files/digest-biblestudy-1.0 67
+DIST biblestudy-1.0.tar.bz2 353500 RMD160 70a694585598fa3998aa7b0d4f864c84eac3bf7c SHA1 082963931699a615979c234784c918eeefe15c4e SHA256 d520e5af3893c8c8850886477faa835e6799d1a1048004a71248527b5715e745
+EBUILD biblestudy-1.0.ebuild 1029 RMD160 0f5916b1e7570419182b980d1bd1e281c4d7d8bb SHA1 f4c49ed9ff5d892f4da52f6d3d064f03045b8e9f SHA256 a78198c9f47783ecddafc8d50ec27f8ef33fd6121fd2c6b814cbda657f7cd6e3
+MD5 1cf5f51140fa7541b10916350e97a639 biblestudy-1.0.ebuild 1029
+RMD160 0f5916b1e7570419182b980d1bd1e281c4d7d8bb biblestudy-1.0.ebuild 1029
+SHA256 a78198c9f47783ecddafc8d50ec27f8ef33fd6121fd2c6b814cbda657f7cd6e3 biblestudy-1.0.ebuild 1029
+MISC ChangeLog 841 RMD160 626ff36196f7f094557d99f033230854261a17c0 SHA1 2081f3687402dc5664b6d87e737bf179bc6a9133 SHA256 db6a8fffc36d73ff89ed4a48e843c41e98a6c26144ac9b9f85823a5cbd1c721c
+MD5 f7b5b7c6eb825cb72b1629f3b8422e92 ChangeLog 841
+RMD160 626ff36196f7f094557d99f033230854261a17c0 ChangeLog 841
+SHA256 db6a8fffc36d73ff89ed4a48e843c41e98a6c26144ac9b9f85823a5cbd1c721c ChangeLog 841
+MISC metadata.xml 212 RMD160 f278ca2a473dd949f7d0f359c432cfe4ed026e71 SHA1 b67d9ec2368a50032f536d14dbd7f105b25191cf SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757
+MD5 cf0e58a86f2a1a7f183cd0ad2f0e5b99 metadata.xml 212
+RMD160 f278ca2a473dd949f7d0f359c432cfe4ed026e71 metadata.xml 212
+SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757 metadata.xml 212
+MD5 431be3ba1f2df5197b588c253cfe333b files/digest-biblestudy-1.0 247
+RMD160 ef2a615f5714b12dff548a52816c2af9992e2ddc files/digest-biblestudy-1.0 247
+SHA256 6aa0587ea98286be8a0351f32b234535ddf2fcb82e05a4d5f70c8e38ba0ee396 files/digest-biblestudy-1.0 247

diff --git a/app-text/biblestudy/biblestudy-1.0.ebuild b/app-text/biblestudy/biblestudy-1.0.ebuild
index d385127c43063dc6392dca7ce0c00710a4db8b89..07e0c0a8ae2cc96fa73590476551dd47f7e851ec 100644 (file)
--- a/app-text/biblestudy/biblestudy-1.0.ebuild
+++ b/app-text/biblestudy/biblestudy-1.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/biblestudy/biblestudy-1.0.ebuild,v 1.6 2006/06/03 05:15:44 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/biblestudy/biblestudy-1.0.ebuild,v 1.7 2006/09/07 04:09:03 beandog Exp $
 
 IUSE="unicode"
-DESCRIPTION="biblestudy software based on the sword library"
-HOMEPAGE="http://www.whensdinner.com/"
+DESCRIPTION="Bible study software based on the sword library"
+HOMEPAGE="http://source.emptycrate.com/"
 SRC_URI="mirror://sourceforge/christiangame/${P}.tar.bz2"
 RESTRICT="nomirror"
 LICENSE="GPL-2"
@@ -12,11 +12,10 @@ SLOT="0"
 KEYWORDS="~x86"
 
 DEPEND=">=app-text/sword-1.5.7
-       >=app-text/sword-modules-20040503
        =x11-libs/wxGTK-2.4*"
 
 src_install() {
-       make DESTDIR=${D} install || die "install failed"
+       make DESTDIR="${D}" install || die "install failed"
 }
 
 pkg_postinst() {
@@ -27,4 +26,7 @@ pkg_postinst() {
                ewarn "warnings in biblestudy, though the software is still useable."
                ewarn
        fi
+
+       einfo "If you are looking for some texts to use with biblestudy,"
+       einfo "then you can emerge app-text/sword-modules"
 }

diff --git a/app-text/biblestudy/files/digest-biblestudy-1.0 b/app-text/biblestudy/files/digest-biblestudy-1.0
index ddf28ace0fe6b22d61a744e710f17c98ee4b8077..a68282b9d722d8bfda6bb42b7d5d631f2bf37e9f 100644 (file)
--- a/app-text/biblestudy/files/digest-biblestudy-1.0
+++ b/app-text/biblestudy/files/digest-biblestudy-1.0
@@ -1 +1,3 @@
 MD5 8e411bab327a4d01c43b9d1ea8ea5400 biblestudy-1.0.tar.bz2 353500
+RMD160 70a694585598fa3998aa7b0d4f864c84eac3bf7c biblestudy-1.0.tar.bz2 353500
+SHA256 d520e5af3893c8c8850886477faa835e6799d1a1048004a71248527b5715e745 biblestudy-1.0.tar.bz2 353500

diff --git a/app-text/biblestudy/metadata.xml b/app-text/biblestudy/metadata.xml
index 73420b6cf0f075095e1ff43cf4f5aaf217e65d66..ff62877c67aec5c49dddc7abeb7a508512533bb1 100644 (file)
--- a/app-text/biblestudy/metadata.xml
+++ b/app-text/biblestudy/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
 <maintainer>
   <email>maintainer-needed@gentoo.org</email>
 </maintainer>