Added jdbm ebuild and fixed nntprss-ebuild

svn path=/; revision=84

4 files changed, 7 insertions, 14 deletions

diff --git a/net-news/nntprss/Manifest b/net-news/nntprss/Manifest
index d997327..ee539d6 100644
--- a/net-news/nntprss/Manifest
+++ b/net-news/nntprss/Manifest
@@ -1,7 +1,8 @@
-MD5 fc4a3ea9ddb1617e12d3d40e0b740193 nntprss-0.5.1_beta.ebuild 2465
+MD5 df32fd234ab055ce55670c5496369218 nntprss-0.5.1_beta.ebuild 2360
 MD5 d25e2bd80d0c064185cbf3bbbc60b932 files/digest-nntprss-0.5.1_beta 74
-MD5 d22b687c80875a2a06ebd05c70e4c102 files/nntprss-sanitize.patch 7752
-MD5 8f7e64ab62827eed0a4eb9a58585b226 files/nntprss-config.xml 1482
-MD5 3604ecf21a7a17289883806c3d381313 files/nntprss 814
+MD5 0182cbbacefedba39c66dc277a762ed3 files/nntprss-init 363
+MD5 2875317d9e257f2268e4cae057d83e72 files/nntprss-sanitize.patch 7658
+MD5 3afcf486cce66f80043ce3ac10e0f6b0 files/nntprss-config.xml 1484
+MD5 7fd612d45867470528fcd7d059e6ad3d files/nntprss 489
 MD5 c302376bca1c667dcfd730d13f884237 files/log4j.properties 846
 MD5 86c1887a62d413a103827183c52f9e81 files/jdbm-0.20.jar 84741
diff --git a/net-news/nntprss/files/nntprss b/net-news/nntprss/files/nntprss
index 0faf97d..df487cd 100755
--- a/net-news/nntprss/files/nntprss
+++ b/net-news/nntprss/files/nntprss
@@ -17,7 +17,6 @@ LIBS="
 /usr/share/hsqldb
 /opt/jetty
 /opt/sun-j2ee-1.3.1
-/opt/nntprss
 "
 
 for lib in ${LIBS}
diff --git a/net-news/nntprss/files/nntprss-sanitize.patch b/net-news/nntprss/files/nntprss-sanitize.patch
index 1c903c0..d822ac5 100644
--- a/net-news/nntprss/files/nntprss-sanitize.patch
+++ b/net-news/nntprss/files/nntprss-sanitize.patch
@@ -43,7 +43,7 @@
 +      <fileset dir="/usr/share/commons-pool/lib">

 +        <include name="*.jar"/>

 +      </fileset>

-+      <fileset dir="./lib/">

++      <fileset dir="/usr/share/jdbm/lib/">

          <include name="*.jar"/>

        </fileset>

      </path>

diff --git a/net-news/nntprss/nntprss-0.5.1_beta.ebuild b/net-news/nntprss/nntprss-0.5.1_beta.ebuild
index 855a814..9010fbc 100644
--- a/net-news/nntprss/nntprss-0.5.1_beta.ebuild
+++ b/net-news/nntprss/nntprss-0.5.1_beta.ebuild
@@ -21,6 +21,7 @@ RDEPEND=">=virtual/jre-1.4"
 DEPEND="
 www-servers/jetty
 dev-db/hsqldb
+dev-db/jdbm
 dev-java/log4j
 dev-java/crimson
 dev-java/xmlrpc
@@ -51,9 +52,6 @@ src_unpack() {
 	## java package structure
 	epatch ${FILESDIR}/nntprss-sanitize.patch
 
-	LIBDIR=${S}/lib
-	mkdir ${LIBDIR}
-	cp ${FILESDIR}/jdbm-0.20.jar ${LIBDIR}/
 }
 
 src_compile() {
@@ -68,7 +66,6 @@ src_install() {
 	
 	java-pkg_dojar ${S}/nntprss.jar
 
-	OPTDIR=/opt/${PN}/lib
 	XMLDIR=${shareroot}/xml
 	ETCDIR=/etc/${PN}
 	INIDIR=/etc/init.d
@@ -79,10 +76,6 @@ src_install() {
 
 	cd ${FILESDIR}
 
-	dodir ${OPTDIR}
-	insinto ${OPTDIR}
-	doins jdbm-0.20.jar
-
 	dodir  ${ETCDIR}
 	insinto ${ETCDIR}
 	doins nntprss-config.xml