sys-devel/crosstool-ng: add missing dies; use bison/flex

Signed-off-by: Sam James <sam@gentoo.org>

4 files changed, 64 insertions, 32 deletions

diff --git a/sys-devel/crosstool-ng/crosstool-ng-1.24.0-r2.ebuild b/sys-devel/crosstool-ng/crosstool-ng-1.24.0-r3.ebuild
index 2e09d5c02c72..4c65f6f9438b 100644
--- a/sys-devel/crosstool-ng/crosstool-ng-1.24.0-r2.ebuild
+++ b/sys-devel/crosstool-ng/crosstool-ng-1.24.0-r3.ebuild
@@ -30,14 +30,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 IUSE="curl cvs doc dtc git lzip meson ninja python rsync subversion wget"
 
 BDEPEND="
-	app-alternatives/awk[gawk]
-	app-alternatives/lex
-	app-alternatives/yacc[bison]
 	app-arch/unzip
 	>=app-shells/bash-3.1
 	sys-apps/help2man
 	>=sys-apps/sed-4.0
+	sys-apps/gawk
 	sys-apps/texinfo
+	sys-devel/bison
+	sys-devel/flex
 	curl? (  net-misc/curl )
 	cvs? ( dev-vcs/cvs )
 	dtc? ( sys-apps/dtc )
@@ -54,13 +54,21 @@ RDEPEND="
 	${BDEPEND}
 "
 
+src_configure() {
+	# Needs bison+flex
+	unset YACC LEX
+
+	default
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 
-	use doc && mv "${D}/usr/share/doc/crosstool-ng/crosstool-ng-${PVR}" \
-		"${D}"/usr/share/doc/
+	if use doc ; then
+		mv "${ED}"/usr/share/doc/crosstool-ng/crosstool-ng-${PVR} "${ED}"/usr/share/doc/ || die
+	fi
 
-	rm -rf "${D}"/usr/share/doc/crosstool-ng
-	rm -rf "${D}/usr/share/man/man1/ct-ng.1.gz"
-	cp docs/ct-ng.1 "${D}/usr/share/man/man1/"
+	rm -rf "${ED}"/usr/share/doc/crosstool-ng || die
+	rm -rf "${ED}"/usr/share/man/man1/ct-ng.1.gz || die
+	doman docs/ct-ng.1
 }
diff --git a/sys-devel/crosstool-ng/crosstool-ng-1.25.0.ebuild b/sys-devel/crosstool-ng/crosstool-ng-1.25.0-r1.ebuild
index 2e09d5c02c72..4c65f6f9438b 100644
--- a/sys-devel/crosstool-ng/crosstool-ng-1.25.0.ebuild
+++ b/sys-devel/crosstool-ng/crosstool-ng-1.25.0-r1.ebuild
@@ -30,14 +30,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 IUSE="curl cvs doc dtc git lzip meson ninja python rsync subversion wget"
 
 BDEPEND="
-	app-alternatives/awk[gawk]
-	app-alternatives/lex
-	app-alternatives/yacc[bison]
 	app-arch/unzip
 	>=app-shells/bash-3.1
 	sys-apps/help2man
 	>=sys-apps/sed-4.0
+	sys-apps/gawk
 	sys-apps/texinfo
+	sys-devel/bison
+	sys-devel/flex
 	curl? (  net-misc/curl )
 	cvs? ( dev-vcs/cvs )
 	dtc? ( sys-apps/dtc )
@@ -54,13 +54,21 @@ RDEPEND="
 	${BDEPEND}
 "
 
+src_configure() {
+	# Needs bison+flex
+	unset YACC LEX
+
+	default
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 
-	use doc && mv "${D}/usr/share/doc/crosstool-ng/crosstool-ng-${PVR}" \
-		"${D}"/usr/share/doc/
+	if use doc ; then
+		mv "${ED}"/usr/share/doc/crosstool-ng/crosstool-ng-${PVR} "${ED}"/usr/share/doc/ || die
+	fi
 
-	rm -rf "${D}"/usr/share/doc/crosstool-ng
-	rm -rf "${D}/usr/share/man/man1/ct-ng.1.gz"
-	cp docs/ct-ng.1 "${D}/usr/share/man/man1/"
+	rm -rf "${ED}"/usr/share/doc/crosstool-ng || die
+	rm -rf "${ED}"/usr/share/man/man1/ct-ng.1.gz || die
+	doman docs/ct-ng.1
 }
diff --git a/sys-devel/crosstool-ng/crosstool-ng-1.26.0_rc2.ebuild b/sys-devel/crosstool-ng/crosstool-ng-1.26.0_rc2-r1.ebuild
index 2e09d5c02c72..4c65f6f9438b 100644
--- a/sys-devel/crosstool-ng/crosstool-ng-1.26.0_rc2.ebuild
+++ b/sys-devel/crosstool-ng/crosstool-ng-1.26.0_rc2-r1.ebuild
@@ -30,14 +30,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 IUSE="curl cvs doc dtc git lzip meson ninja python rsync subversion wget"
 
 BDEPEND="
-	app-alternatives/awk[gawk]
-	app-alternatives/lex
-	app-alternatives/yacc[bison]
 	app-arch/unzip
 	>=app-shells/bash-3.1
 	sys-apps/help2man
 	>=sys-apps/sed-4.0
+	sys-apps/gawk
 	sys-apps/texinfo
+	sys-devel/bison
+	sys-devel/flex
 	curl? (  net-misc/curl )
 	cvs? ( dev-vcs/cvs )
 	dtc? ( sys-apps/dtc )
@@ -54,13 +54,21 @@ RDEPEND="
 	${BDEPEND}
 "
 
+src_configure() {
+	# Needs bison+flex
+	unset YACC LEX
+
+	default
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 
-	use doc && mv "${D}/usr/share/doc/crosstool-ng/crosstool-ng-${PVR}" \
-		"${D}"/usr/share/doc/
+	if use doc ; then
+		mv "${ED}"/usr/share/doc/crosstool-ng/crosstool-ng-${PVR} "${ED}"/usr/share/doc/ || die
+	fi
 
-	rm -rf "${D}"/usr/share/doc/crosstool-ng
-	rm -rf "${D}/usr/share/man/man1/ct-ng.1.gz"
-	cp docs/ct-ng.1 "${D}/usr/share/man/man1/"
+	rm -rf "${ED}"/usr/share/doc/crosstool-ng || die
+	rm -rf "${ED}"/usr/share/man/man1/ct-ng.1.gz || die
+	doman docs/ct-ng.1
 }
diff --git a/sys-devel/crosstool-ng/crosstool-ng-9999.ebuild b/sys-devel/crosstool-ng/crosstool-ng-9999.ebuild
index 2e09d5c02c72..4c65f6f9438b 100644
--- a/sys-devel/crosstool-ng/crosstool-ng-9999.ebuild
+++ b/sys-devel/crosstool-ng/crosstool-ng-9999.ebuild
@@ -30,14 +30,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 IUSE="curl cvs doc dtc git lzip meson ninja python rsync subversion wget"
 
 BDEPEND="
-	app-alternatives/awk[gawk]
-	app-alternatives/lex
-	app-alternatives/yacc[bison]
 	app-arch/unzip
 	>=app-shells/bash-3.1
 	sys-apps/help2man
 	>=sys-apps/sed-4.0
+	sys-apps/gawk
 	sys-apps/texinfo
+	sys-devel/bison
+	sys-devel/flex
 	curl? (  net-misc/curl )
 	cvs? ( dev-vcs/cvs )
 	dtc? ( sys-apps/dtc )
@@ -54,13 +54,21 @@ RDEPEND="
 	${BDEPEND}
 "
 
+src_configure() {
+	# Needs bison+flex
+	unset YACC LEX
+
+	default
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 
-	use doc && mv "${D}/usr/share/doc/crosstool-ng/crosstool-ng-${PVR}" \
-		"${D}"/usr/share/doc/
+	if use doc ; then
+		mv "${ED}"/usr/share/doc/crosstool-ng/crosstool-ng-${PVR} "${ED}"/usr/share/doc/ || die
+	fi
 
-	rm -rf "${D}"/usr/share/doc/crosstool-ng
-	rm -rf "${D}/usr/share/man/man1/ct-ng.1.gz"
-	cp docs/ct-ng.1 "${D}/usr/share/man/man1/"
+	rm -rf "${ED}"/usr/share/doc/crosstool-ng || die
+	rm -rf "${ED}"/usr/share/man/man1/ct-ng.1.gz || die
+	doman docs/ct-ng.1
 }