modified regexp to get correct jaxen, fixes #88157

(Portage version: 2.0.51.19)

6 files changed, 24 insertions, 16 deletions

diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index 015ec690f31c..3fce0de86e3e 100644
--- a/dev-java/jdom/ChangeLog
+++ b/dev-java/jdom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jdom
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.21 2005/04/01 17:20:01 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.22 2005/04/06 19:16:45 luckyduck Exp $
+
+  06 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> jdom-1.0.ebuild,
+  jdom-1.0_beta10-r3.ebuild, jdom-1.0_beta6.ebuild, jdom-1.0_beta9-r1.ebuild:
+  modified regexp to get correct jaxen, fixes #88157
 
   01 Apr 2005; Simon Stelling <blubb@gentoo.org> jdom-1.0_beta10-r3.ebuild:
   stable on amd64
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 081d9cdcf723..b4372d17e812 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,10 +1,10 @@
-MD5 e5c9c835a2222d5fb5b7f5b07022f39f ChangeLog 3468
-MD5 1ef97c59b33b835d529959178d4ad81e jdom-1.0.ebuild 1561
-MD5 2eb886e545279316dd5969adbcae9564 jdom-1.0_beta10-r3.ebuild 1566
-MD5 270acc9b7a83cf45c73eb5ff792d7841 jdom-1.0_beta6.ebuild 1590
-MD5 9d14fccab0b153b52069fc90f38489e9 jdom-1.0_beta9-r1.ebuild 1512
+MD5 4f3db119b0269a003a131d0cd274abfb jdom-1.0.ebuild 1585
+MD5 19c18a9c7278df112caea244073cef2c jdom-1.0_beta10-r3.ebuild 1589
+MD5 f95b6f08b9a4a9281097c3d080faa3f7 jdom-1.0_beta6.ebuild 1613
+MD5 b24f067ecacdda86fcb2db85a2fe14d7 jdom-1.0_beta9-r1.ebuild 1535
+MD5 33ca438ee21bc673af36d94b2e30c976 ChangeLog 3669
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 8841cddf25b660d205766f7468ba608d files/digest-jdom-1.0 61
-MD5 cad484f43c69253a8823f7d668b6c0ab files/digest-jdom-1.0_beta10-r3 61
 MD5 bb9b91ebd19835161b889abf889afda2 files/digest-jdom-1.0_beta6 60
+MD5 cad484f43c69253a8823f7d668b6c0ab files/digest-jdom-1.0_beta10-r3 61
+MD5 8841cddf25b660d205766f7468ba608d files/digest-jdom-1.0 61
 MD5 5387342ae9576c96d6fab009ed1c306f files/digest-jdom-1.0_beta9-r1 60
diff --git a/dev-java/jdom/jdom-1.0.ebuild b/dev-java/jdom/jdom-1.0.ebuild
index 51e8c08506da..dcc5c3a17815 100644
--- a/dev-java/jdom/jdom-1.0.ebuild
+++ b/dev-java/jdom/jdom-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0.ebuild,v 1.2 2005/02/03 23:01:35 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0.ebuild,v 1.3 2005/04/06 19:16:45 luckyduck Exp $
 
 inherit java-pkg
 
@@ -35,7 +35,8 @@ src_unpack() {
 	java-pkg_jar-from xerces-2
 
 	if has_version jaxen; then
-		java-pkg_jar-from `best_version dev-java/jaxen | sed -s s/"dev-java\/"//| sed -e s/_beta.//`
+		jaxenlib="`best_version dev-java/jaxen | sed s/"dev-java\/"//|sed -e s/_beta.-r.//`"
+		java-pkg_jar-from ${jaxenlib}
 	fi
 }
 
diff --git a/dev-java/jdom/jdom-1.0_beta10-r3.ebuild b/dev-java/jdom/jdom-1.0_beta10-r3.ebuild
index 4e68a7290172..657b0eb9998b 100644
--- a/dev-java/jdom/jdom-1.0_beta10-r3.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta10-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta10-r3.ebuild,v 1.3 2005/04/01 17:20:01 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta10-r3.ebuild,v 1.4 2005/04/06 19:16:45 luckyduck Exp $
 
 inherit java-pkg
 
@@ -35,7 +35,8 @@ src_unpack() {
 	java-pkg_jar-from xerces-2
 
 	if has_version jaxen; then
-		java-pkg_jar-from `best_version dev-java/jaxen | sed -s s/"dev-java\/"// | sed -e s/_beta.//`
+		jaxenlib="`best_version dev-java/jaxen | sed s/"dev-java\/"//|sed -e s/_beta.-r.//`"
+		java-pkg_jar-from ${jaxenlib}
 	fi
 }
 
diff --git a/dev-java/jdom/jdom-1.0_beta6.ebuild b/dev-java/jdom/jdom-1.0_beta6.ebuild
index 5a7f0b71f750..b575e9b38e20 100644
--- a/dev-java/jdom/jdom-1.0_beta6.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta6.ebuild,v 1.2 2005/02/03 23:01:35 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta6.ebuild,v 1.3 2005/04/06 19:16:45 luckyduck Exp $
 
 inherit java-pkg
 
@@ -37,7 +37,8 @@ src_unpack() {
 	java-pkg_jar-from xerces-2
 
 	if has_version jaxen; then
-		java-pkg_jar-from `best_version dev-java/jaxen | sed -s s/"dev-java\/"// | sed -e s/_beta.//`
+		jaxenlib="`best_version dev-java/jaxen | sed s/"dev-java\/"//|sed -e s/_beta.-r.//`"
+		java-pkg_jar-from ${jaxenlib}
 	fi
 }
 
diff --git a/dev-java/jdom/jdom-1.0_beta9-r1.ebuild b/dev-java/jdom/jdom-1.0_beta9-r1.ebuild
index fea75ce3a4ff..5970201224dd 100644
--- a/dev-java/jdom/jdom-1.0_beta9-r1.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta9-r1.ebuild,v 1.3 2005/02/06 01:52:04 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta9-r1.ebuild,v 1.4 2005/04/06 19:16:45 luckyduck Exp $
 
 inherit java-pkg
 
@@ -33,7 +33,8 @@ src_unpack() {
 	java-pkg_jar-from xalan
 
 	if has_version jaxen; then
-		java-pkg_jar-from `best_version dev-java/jaxen | sed -s s/"dev-java\/"// | sed -e s/_beta.//`
+		jaxenlib="`best_version dev-java/jaxen | sed s/"dev-java\/"//|sed -e s/_beta.-r.//`"
+		java-pkg_jar-from ${jaxenlib}
 	fi
 }