Drop the depend on yacc as we work fine with bison.

  Stop using the versionator eclass.

Package-Manager: portage-2.1.2.2

diff --git a/app-shells/dash/ChangeLog b/app-shells/dash/ChangeLog
index f7ebd8c80f34177548e5dbf5017102cb9f8d8e38..bf23c5559ca8262dd2b5d762116b3d8983d4600f 100644 (file)
--- a/app-shells/dash/ChangeLog
+++ b/app-shells/dash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/dash
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.36 2007/03/15 22:01:18 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.37 2007/03/16 10:17:28 uberlord Exp $
+
+  16 Mar 2007; Roy Marples <uberlord@gentoo.org> dash-0.5.3.7.ebuild:
+  Drop the depend on yacc as we work fine with bison.
+  Stop using the versionator eclass.
 
 *dash-0.5.3.7 (15 Mar 2007)
 

diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index a4fa8866aae2652e5a8e8ff60579a657163f2fa5..0f46e6dcd0a75226f6f6c9638b6108f8d98ca37b 100644 (file)
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -28,14 +28,14 @@ EBUILD dash-0.5.3.3.ebuild 1099 RMD160 8bb384391ceeb2d7fbaa80b2dc8e7c855d669d7e
 MD5 a65294aad870440d0f30eb87b11f27e7 dash-0.5.3.3.ebuild 1099
 RMD160 8bb384391ceeb2d7fbaa80b2dc8e7c855d669d7e dash-0.5.3.3.ebuild 1099
 SHA256 127bc18ab2e3cd02dac31013f7dd82efc79bb0f85b63d35387d6b88356f9a93a dash-0.5.3.3.ebuild 1099
-EBUILD dash-0.5.3.7.ebuild 1190 RMD160 90ff470d996cdd1cbd83822d0dff2a0f8d7abd35 SHA1 ed9147beb21e0ef593acedb6c470250789ffa9db SHA256 d19d72a0b85854a7a75ef2bedad340c809c0317169610c5597e4626e616f66f3
-MD5 2efd761e111ad22329a726343ad1a13f dash-0.5.3.7.ebuild 1190
-RMD160 90ff470d996cdd1cbd83822d0dff2a0f8d7abd35 dash-0.5.3.7.ebuild 1190
-SHA256 d19d72a0b85854a7a75ef2bedad340c809c0317169610c5597e4626e616f66f3 dash-0.5.3.7.ebuild 1190
-MISC ChangeLog 5268 RMD160 77e74611d5a9ae65afe57760c9c934761987fe8d SHA1 43d4e01d9514df247476eb049fdfaf881b86a8be SHA256 7badb25bcbe15884f6f813f87bfe58c431f5df2556bf5243f98cf2ff1230a7a6
-MD5 c2766155f2d766f08d77fba3eab41595 ChangeLog 5268
-RMD160 77e74611d5a9ae65afe57760c9c934761987fe8d ChangeLog 5268
-SHA256 7badb25bcbe15884f6f813f87bfe58c431f5df2556bf5243f98cf2ff1230a7a6 ChangeLog 5268
+EBUILD dash-0.5.3.7.ebuild 1182 RMD160 1818d33b59d00717ff0d192790194d7375fee8fe SHA1 25c173c367f529ca2d1f092cd99fc8e48e8989f5 SHA256 eff4e022dc97ada5b30017d45a69c32968369c29c6977df208282485fb00e990
+MD5 68d33d66e1ea0ae5370e5089e1c24909 dash-0.5.3.7.ebuild 1182
+RMD160 1818d33b59d00717ff0d192790194d7375fee8fe dash-0.5.3.7.ebuild 1182
+SHA256 eff4e022dc97ada5b30017d45a69c32968369c29c6977df208282485fb00e990 dash-0.5.3.7.ebuild 1182
+MISC ChangeLog 5430 RMD160 8cec8a2c920ac0e65845f2ff04c017478ae4916b SHA1 98ed55fe3a7268e564b5e33f83a0ef17e8f74594 SHA256 2e7c9ccce952586bd33020727de923c1dd9ffb7b09a07371fec356480652666c
+MD5 871234f1d9aa8d51f122229551b18544 ChangeLog 5430
+RMD160 8cec8a2c920ac0e65845f2ff04c017478ae4916b ChangeLog 5430
+SHA256 2e7c9ccce952586bd33020727de923c1dd9ffb7b09a07371fec356480652666c ChangeLog 5430
 MISC metadata.xml 258 RMD160 e7b127d711ee0b16caa139b012afebf6f7de5678 SHA1 217134894bc43bed379c823c1abaa6d3f3d7adcc SHA256 ea9f5f0425c3cefc3f50cf2a2792634bf47b9a373948f04c524d0407f6e8d1d6
 MD5 50ddf6de7cdf5ef045d0189c47e4e452 metadata.xml 258
 RMD160 e7b127d711ee0b16caa139b012afebf6f7de5678 metadata.xml 258

diff --git a/app-shells/dash/dash-0.5.3.7.ebuild b/app-shells/dash/dash-0.5.3.7.ebuild
index 78b10b102ccf07592bac69d570749f083f32eae0..0316d040490976a51e95242f8012965245a0f43b 100644 (file)
--- a/app-shells/dash/dash-0.5.3.7.ebuild
+++ b/app-shells/dash/dash-0.5.3.7.ebuild
@@ -1,31 +1,32 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.3.7.ebuild,v 1.2 2007/03/16 07:55:04 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.3.7.ebuild,v 1.3 2007/03/16 10:17:28 uberlord Exp $
 
-inherit eutils versionator flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs
 
-DEB_P="${PN}_$(replace_version_separator 3 '-')"
-MY_P2="${DEB_P%-*}"
-MY_P="${MY_P2/_/-}"
+DEB_PV=${PV%.*}
+DEB_PATCH=${PV##*.}
+DEB_PF="${PN}_${DEB_PV}-${DEB_PATCH}"
+MY_P="${PN}-${DEB_PV}"
 
 DESCRIPTION="Debian-version of NetBSD's lightweight bourne shell"
 HOMEPAGE="http://ftp.debian.org/debian/pool/main/d/dash/"
-SRC_URI="mirror://debian/pool/main/d/dash/${MY_P2}.orig.tar.gz \
-       mirror://debian/pool/main/d/dash/${DEB_P}.diff.gz"
+SRC_URI="mirror://debian/pool/main/d/dash/${PN}_${DEB_PV}.orig.tar.gz \
+       mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="static"
 
-DEPEND="dev-util/yacc"
+DEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
        unpack ${A}
        cd "${S}"
-       epatch "${WORKDIR}/${DEB_P}".diff
+       epatch "${WORKDIR}/${DEB_PF}".diff
 
        # Below patch sorts the builtincmd structure correctly when LC_ALL isn't C
        epatch "${FILESDIR}/${MY_P}"-sort-locale.patch