Specify --infodir for configure.

(Portage version: 2.1.2.9)

5 files changed, 22 insertions, 33 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 72ccf0f84c7c..ab6a20dfccce 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.128 2007/05/31 17:20:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.129 2007/06/01 18:42:08 ulm Exp $
+
+  01 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.990.ebuild,
+  emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-22.1.50.ebuild,
+  emacs-cvs-23.0.0-r6.ebuild:
+  Specify --infodir for configure.
 
   31 May 2007; Diego Pettenò <flameeyes@gentoo.org>
   emacs-cvs-22.0.990.ebuild:
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild
index 4bed8dad7ba7..dae9cc936eb5 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild,v 1.7 2007/06/01 06:09:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild,v 1.8 2007/06/01 18:42:08 ulm Exp $
 
 WANT_AUTOCONF="2.61"
 WANT_AUTOMAKE="latest"
@@ -137,6 +137,7 @@ src_compile() {
 
 	econf \
 		--program-suffix=-emacs-${SLOT} \
+		--infodir=/usr/share/info/emacs-${SLOT} \
 		--without-carbon \
 		${myconf} || die "econf emacs failed"
 
@@ -153,13 +154,8 @@ src_install () {
 
 	# move info documentation to the correct place
 	einfo "Fixing info documentation ..."
-	dodir /usr/share/info/emacs-${SLOT}
-	mv "${D}"/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed"
-	for i in "${D}"/usr/share/info/*
-	do
-		if [ "${i##*/}" != emacs-${SLOT} ] ; then
-			mv ${i} ${i/info/info/emacs-${SLOT}}.info
-		fi
+	for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do
+		mv ${i} ${i}.info || die "mv info failed"
 	done
 
 	# move man pages to the correct place
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
index 31c69bfe58af..975b48e0653e 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.20 2007/06/01 06:09:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.21 2007/06/01 18:42:08 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -149,6 +149,7 @@ src_compile() {
 
 	econf \
 		--program-suffix=-emacs-${SLOT} \
+		--infodir=/usr/share/info/emacs-${SLOT} \
 		--without-carbon \
 		${myconf} || die "econf emacs failed"
 
@@ -165,13 +166,8 @@ src_install () {
 
 	# move info documentation to the correct place
 	einfo "Fixing info documentation ..."
-	dodir /usr/share/info/emacs-${SLOT}
-	mv "${D}"/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed"
-	for i in "${D}"/usr/share/info/*
-	do
-		if [ "${i##*/}" != emacs-${SLOT} ] ; then
-			mv ${i} ${i/info/info/emacs-${SLOT}}.info
-		fi
+	for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do
+		mv ${i} ${i}.info || die "mv info failed"
 	done
 
 	# move man pages to the correct place
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild
index 8cb33a5dbfe4..ff04fff75959 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild,v 1.13 2007/06/01 06:09:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild,v 1.14 2007/06/01 18:42:08 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -151,6 +151,7 @@ src_compile() {
 
 	econf \
 		--program-suffix=-${EMACS_SUFFIX} \
+		--infodir=/usr/share/info/${EMACS_SUFFIX} \
 		--without-carbon \
 		${myconf} || die "econf emacs failed"
 
@@ -167,13 +168,8 @@ src_install () {
 
 	# move info documentation to the correct place
 	einfo "Fixing info documentation ..."
-	dodir /usr/share/info/${EMACS_SUFFIX}
-	mv "${D}"/usr/share/info/{,${EMACS_SUFFIX}/}dir || die "mv dir failed"
-	for i in "${D}"/usr/share/info/*
-	do
-		if [ "${i##*/}" != ${EMACS_SUFFIX} ] ; then
-			mv ${i} ${i/info/info/${EMACS_SUFFIX}}.info
-		fi
+	for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
+		mv ${i} ${i}.info || die "mv info failed"
 	done
 
 	# move man pages to the correct place
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
index 8ce65b4d9ea9..cb1cf5d789c9 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.18 2007/06/01 06:09:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.19 2007/06/01 18:42:08 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -153,6 +153,7 @@ src_compile() {
 
 	econf \
 		--program-suffix=-emacs-${SLOT} \
+		--infodir=/usr/share/info/emacs-${SLOT} \
 		--without-carbon \
 		${myconf} || die "econf emacs failed"
 
@@ -169,13 +170,8 @@ src_install () {
 
 	# move info documentation to the correct place
 	einfo "Fixing info documentation ..."
-	dodir /usr/share/info/emacs-${SLOT}
-	mv "${D}"/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed"
-	for i in "${D}"/usr/share/info/*
-	do
-		if [ "${i##*/}" != emacs-${SLOT} ] ; then
-			mv ${i} ${i/info/info/emacs-${SLOT}}.info
-		fi
+	for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do
+		mv ${i} ${i}.info || die "mv info failed"
 	done
 
 	# move man pages to the correct place