Added a notice to compile emacs with USE="Xaw3d", closing bug #18518

5 files changed, 81 insertions, 47 deletions

diff --git a/app-emacs/auctex/ChangeLog b/app-emacs/auctex/ChangeLog
index f8fd73a1651a..de8f0d82eeb3 100644
--- a/app-emacs/auctex/ChangeLog
+++ b/app-emacs/auctex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/auctex
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/ChangeLog,v 1.7 2003/10/09 15:24:27 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/ChangeLog,v 1.8 2003/10/31 14:02:31 usata Exp $
+
+  31 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> auctex-10.0g.ebuild,
+  auctex-11.13.ebuild, auctex-11.14.ebuild:
+  Added pkg_setup to let people recompile emacs with USE="Xaw3d".
+  Fixed info breakage. This closed Bug #18518.
 
   10 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> auctex-10.0g.ebuild,
   auctex-11.13.ebuild, auctex-11.14.ebuild:
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index 0a1ccec1c578..86a6970360f3 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -1,7 +1,7 @@
-MD5 1a1a07cc75584d892123e1b599663674 ChangeLog 1172
-MD5 60ecc58040cb8da3d119974c518c3ac2 auctex-10.0g.ebuild 1302
-MD5 6f05222247d002d5d327c4d47e40526d auctex-11.13.ebuild 1256
-MD5 b39101492691eb42f333988c156b3981 auctex-11.14.ebuild 1197
+MD5 56d8f4cfc22ece4356c873e4ca64d440 ChangeLog 1400
+MD5 ac2974627f6f0362fbf30d7ecf54f1fb auctex-10.0g.ebuild 1479
+MD5 474751c92d265d5e6765ba178e3f7336 auctex-11.13.ebuild 1431
+MD5 b463cede65d4143b4494be5e17ec2966 auctex-11.14.ebuild 1431
 MD5 58f3ddc03b5e54563fc8a9764e687dd5 metadata.xml 183
 MD5 07f98857b9cd7c49631f6b5cb42f9778 files/50auctex-gentoo.el 57
 MD5 2adfd6cfa41ffa3bdf82aabf5b998430 files/digest-auctex-10.0g 64
diff --git a/app-emacs/auctex/auctex-10.0g.ebuild b/app-emacs/auctex/auctex-10.0g.ebuild
index d1970fb832b2..92514a3d55a5 100644
--- a/app-emacs/auctex/auctex-10.0g.ebuild
+++ b/app-emacs/auctex/auctex-10.0g.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-10.0g.ebuild,v 1.6 2003/10/09 15:24:27 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-10.0g.ebuild,v 1.7 2003/10/31 14:02:31 usata Exp $
 
 inherit elisp
 
@@ -13,34 +13,42 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 
-DEPEND="virtual/emacs
+DEPEND=">=sys-apps/sed-4
+	virtual/emacs
 	virtual/tetex"
 
 S="${WORKDIR}/${P}"
 
+pkg_setup() {
+
+	if ! grep ' Xaw3d' /var/db/pkg/app-editors/emacs*/USE >/dev/null 2>&1 ; then
+		ewarn
+		ewarn "Emacs needs to be compiled with Xaw3d support."
+		ewarn "Please emerge emacs with USE=\"Xaw3d\"."
+		ewarn
+		die "Emacs Xaw3d support must be enabled."
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	sed -e 's,/usr/local/lib/texmf/tex/,/usr/share/texmf/tex/,g' tex.el >tex.el.new && \
-		mv tex.el.new tex.el || die
+	sed -i 's,/usr/local/lib/texmf/tex/,/usr/share/texmf/tex/,g' ${S}/tex.el || die
 }
 
 src_compile() {
 	make || die
+	cd doc
+	sed -i "/^auctex/s/\(-.\)/\.info\1/g" auctex
+	for i in auctex* ; do
+		mv $i auctex.info${i#auctex}
+	done
 }
 
 src_install() {
-	dodir ${SITELISP}/auctex
-	make lispdir=${D}/${SITELISP} install install-contrib || die
-	# this is insane...
-	pushd ${D}/${SITELISP}
-	sed -e "s,${D}/,,g" tex-site.el >tex-site.el.new && \
-		mv tex-site.el.new tex-site.el || die
-	popd
-	pushd doc
-	dodir /usr/share/info
-	make infodir=${D}/usr/share/info install || die
-	popd
+	dodir ${SITELISP}/${PN}
+	make lispdir=${D}${SITELISP} install install-contrib || die
+	dosed ${SITELISP}/tex-site.el || die
+	doinfo doc/auctex*
 	elisp-site-file-install ${FILESDIR}/50auctex-gentoo.el
 	dodoc ChangeLog CHANGES COPYING INSTALLATION PROBLEMS README NEWS INSTALL
 }
diff --git a/app-emacs/auctex/auctex-11.13.ebuild b/app-emacs/auctex/auctex-11.13.ebuild
index a1d8d076ab1b..c3696fc20913 100644
--- a/app-emacs/auctex/auctex-11.13.ebuild
+++ b/app-emacs/auctex/auctex-11.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.13.ebuild,v 1.7 2003/10/09 15:24:27 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.13.ebuild,v 1.8 2003/10/31 14:02:31 usata Exp $
 
 inherit elisp
 
@@ -13,33 +13,42 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 
-DEPEND="virtual/emacs
+DEPEND=">=sys-apps/sed-4
+	virtual/emacs
 	virtual/tetex"
 
 S="${WORKDIR}/${P}"
 
+pkg_setup() {
+
+	if ! grep ' Xaw3d' /var/db/pkg/app-editors/emacs*/USE >/dev/null 2>&1 ; then
+		ewarn
+		ewarn "Emacs needs to be compiled with Xaw3d support."
+		ewarn "Please emerge emacs with USE=\"Xaw3d\"."
+		ewarn
+		die "Emacs Xaw3d support must be enabled."
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
-	cd ${S} && sed -e 's,/usr/local/lib/texmf/tex/,/usr/share/texmf/tex/,g' tex.el >tex.el.new \
-		&& mv tex.el.new tex.el || die
+	sed -i 's,/usr/local/lib/texmf/tex/,/usr/share/texmf/tex/,g' ${S}/tex.el || die
 }
 
 src_compile() {
 	make || die
+	cd doc
+	sed -i "/^auctex/s/\(-.\)/\.info\1/g" auctex
+	for i in auctex* ; do
+		mv $i auctex.info${i#auctex}
+	done
 }
 
 src_install() {
-	dodir ${SITELISP}/auctex
-	make lispdir=${D}/${SITELISP} install install-contrib || die
-	# this is insane...
-	pushd ${D}/${SITELISP}
-	sed -e "s,${D}/,,g" tex-site.el >tex-site.el.new && \
-		mv tex-site.el.new tex-site.el || die
-	popd
-	pushd doc
-	dodir /usr/share/info
-	make infodir=${D}/usr/share/info install || die
-	popd
+	dodir ${SITELISP}/${PN}
+	make lispdir=${D}${SITELISP} install install-contrib || die
+	dosed ${SITELISP}/tex-site.el || die
+	doinfo doc/auctex*
 	elisp-site-file-install ${FILESDIR}/50auctex-gentoo.el
 	dodoc ChangeLog CHANGES COPYING INSTALLATION PROBLEMS README
 }
diff --git a/app-emacs/auctex/auctex-11.14.ebuild b/app-emacs/auctex/auctex-11.14.ebuild
index c1086daea880..03ada276b569 100644
--- a/app-emacs/auctex/auctex-11.14.ebuild
+++ b/app-emacs/auctex/auctex-11.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.14.ebuild,v 1.6 2003/10/09 15:24:27 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.14.ebuild,v 1.7 2003/10/31 14:02:31 usata Exp $
 
 inherit elisp
 
@@ -13,12 +13,23 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 
-DEPEND="virtual/emacs
-	>=sys-apps/sed-4
+DEPEND=">=sys-apps/sed-4
+	virtual/emacs
 	virtual/tetex"
 
 S="${WORKDIR}/${P}"
 
+pkg_setup() {
+
+	if ! grep ' Xaw3d' /var/db/pkg/app-editors/emacs*/USE >/dev/null 2>&1 ; then
+		ewarn
+		ewarn "Emacs needs to be compiled with Xaw3d support."
+		ewarn "Please emerge emacs with USE=\"Xaw3d\"."
+		ewarn
+		die "Emacs Xaw3d support must be enabled."
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	sed -i 's,/usr/local/lib/texmf/tex/,/usr/share/texmf/tex/,g' ${S}/tex.el || die
@@ -26,17 +37,18 @@ src_unpack() {
 
 src_compile() {
 	make || die
+	cd doc
+	sed -i "/^auctex/s/\(-.\)/\.info\1/g" auctex
+	for i in auctex* ; do
+		mv $i auctex.info${i#auctex}
+	done
 }
 
 src_install() {
-	dodir ${SITELISP}/auctex
-	make lispdir=${D}/${SITELISP} install install-contrib || die
-	sed -i "s,${D}/,,g" ${D}/${SITELISP}/tex-site.el || die
-	pushd doc
-	dodir /usr/share/info
-	make infodir=${D}/usr/share/info install || die
-	for i in ${D}/usr/share/info/* ; do mv $i $i.info ; done
-	popd
+	dodir ${SITELISP}/${PN}
+	make lispdir=${D}${SITELISP} install install-contrib || die
+	dosed ${SITELISP}/tex-site.el || die
+	doinfo doc/auctex*
 	elisp-site-file-install ${FILESDIR}/50auctex-gentoo.el
 	dodoc ChangeLog CHANGES COPYING INSTALLATION PROBLEMS README
 }