From ab386955be1969e8a9863bd16cdbadabf195d7ec Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Sun, 26 Nov 2006 13:39:50 +0000 Subject: Modernize ebuild: use autotools, proper quoting, use emake, fix X dependencies. Package-Manager: portage-2.1.1-r2 --- app-editors/xemacs/ChangeLog | 8 +++++++- app-editors/xemacs/Manifest | 18 +++++++++--------- app-editors/xemacs/xemacs-21.4.19.ebuild | 29 +++++++++++++++++------------ 3 files changed, 33 insertions(+), 22 deletions(-) (limited to 'app-editors') diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog index c2afbccabc3b..94d0c235c2e2 100644 --- a/app-editors/xemacs/ChangeLog +++ b/app-editors/xemacs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-editors/xemacs # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.65 2006/09/04 03:40:08 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.66 2006/11/26 13:39:50 graaff Exp $ + + 26 Nov 2006; Hans de Graaff xemacs-21.4.19.ebuild: + Use autotools class to handle support for correct version of autoconf. Support + EXTRA_ECONF, fixing #145205. Use emake again as parallel builds have been + fixed upstream. Add x11-misc/xbitmaps to X dependencies. Quote variables that + may contain spaces. 04 Sep 2006; Michael Sterrett -files/xemacs-21.4.8-ppc.diff, -files/xemacs-21.4.9-ppc.diff, diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest index bd7a9878100c..f4c441a4e3a3 100644 --- a/app-editors/xemacs/Manifest +++ b/app-editors/xemacs/Manifest @@ -16,19 +16,19 @@ RMD160 1cf73cd98df2189c37e98ed198fb3c1941f967b4 files/xemacs-21.4.17-gdbm.patch SHA256 9e7d5cbdf3b8f60e6135187d32f3fe8f83281a14752eb16c0e018eef15491525 files/xemacs-21.4.17-gdbm.patch 639 DIST NeXT_XEmacs.tar.gz 39571 RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 SHA1 619912734b1a1fae5115941b904d41beb4765b47 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 DIST xemacs-21.4.17.tar.gz 10626826 RMD160 d42ca370ba916f0147b368bd7db2cc6c523646ae SHA1 274812bee5f8010ca3d56b517026270d94415f33 SHA256 b4134cf75b69e4a89fbc73c75c84fa8dc3cdcc8bd5f48aa489bf894040aefa17 -DIST xemacs-21.4.19.tar.gz 11122888 RMD160 5e2fdd5073934efa6c42fd44cb6d9f6588754314 SHA256 222600b14465963dd827e2bf5a0a9a5133eabf6333e679d20f6afd5fe5bd122d +DIST xemacs-21.4.19.tar.gz 11122888 RMD160 5e2fdd5073934efa6c42fd44cb6d9f6588754314 SHA1 638a58db6794d3424e13ad65932697ad1343ab69 SHA256 222600b14465963dd827e2bf5a0a9a5133eabf6333e679d20f6afd5fe5bd122d EBUILD xemacs-21.4.17.ebuild 5055 RMD160 70037d0363a969817440bff94cc0c1c5877396f6 SHA1 e09289354b057d80fe029ea8c1fd8a15f2eba1e9 SHA256 2dab6dff04290d0aa17cd38648c9ca65c13a5129459c35d22b6fa95d5a789590 MD5 8b1f6863027886f7a8fc5accd066d487 xemacs-21.4.17.ebuild 5055 RMD160 70037d0363a969817440bff94cc0c1c5877396f6 xemacs-21.4.17.ebuild 5055 SHA256 2dab6dff04290d0aa17cd38648c9ca65c13a5129459c35d22b6fa95d5a789590 xemacs-21.4.17.ebuild 5055 -EBUILD xemacs-21.4.19.ebuild 5052 RMD160 7c03b064a59f267f4104948d58a2fa7641633e64 SHA1 140a331e4ede3017fa9ee2f81d0b1741dae24d0d SHA256 b5bb2077eff3814707ffaf9c5bfd5b53c43cadb60092f2d3f2e156b9b5d7f66d -MD5 b7427b2c5730afb1749276a625cb8c52 xemacs-21.4.19.ebuild 5052 -RMD160 7c03b064a59f267f4104948d58a2fa7641633e64 xemacs-21.4.19.ebuild 5052 -SHA256 b5bb2077eff3814707ffaf9c5bfd5b53c43cadb60092f2d3f2e156b9b5d7f66d xemacs-21.4.19.ebuild 5052 -MISC ChangeLog 11690 RMD160 32f16d7037180cb5c97a8e5b484eaf1be34f1704 SHA1 a388813d9edd8cf27dfc2a72773b20078f515b97 SHA256 07c81a97a0915c43c88df7db2668b4257efd935674ed7ac17cd483f340583a7e -MD5 a0503b4461ea42069e90ba06fccca7e6 ChangeLog 11690 -RMD160 32f16d7037180cb5c97a8e5b484eaf1be34f1704 ChangeLog 11690 -SHA256 07c81a97a0915c43c88df7db2668b4257efd935674ed7ac17cd483f340583a7e ChangeLog 11690 +EBUILD xemacs-21.4.19.ebuild 5255 RMD160 ee7812a5ce10db0f8c24e522e84750301dab1099 SHA1 8f7acdc0032b170626d226bccd0f30380c493fb7 SHA256 6bf06bef1e7a4419e5cd7ee8c21f187df69bfa7184447d011e003eb5516e9cc8 +MD5 37b66f3a6be83ba0305333ccaa9f13b1 xemacs-21.4.19.ebuild 5255 +RMD160 ee7812a5ce10db0f8c24e522e84750301dab1099 xemacs-21.4.19.ebuild 5255 +SHA256 6bf06bef1e7a4419e5cd7ee8c21f187df69bfa7184447d011e003eb5516e9cc8 xemacs-21.4.19.ebuild 5255 +MISC ChangeLog 12020 RMD160 ae3deac9be99718b44105974d7cd15fb32686e9c SHA1 4a156bfb3bd207ae8e4cb3a5249653ab960840c4 SHA256 fe1f8013875f87b3b28be937b962159dc3ac258e720e1d67cda2ffce19b758cf +MD5 e02efaab75a119812b6b8a9ebd506a22 ChangeLog 12020 +RMD160 ae3deac9be99718b44105974d7cd15fb32686e9c ChangeLog 12020 +SHA256 fe1f8013875f87b3b28be937b962159dc3ac258e720e1d67cda2ffce19b758cf ChangeLog 12020 MISC metadata.xml 365 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da SHA1 a9900a09ce68ac0ae674b5913d033c7afaa85272 SHA256 cbe62b1685c4809f53fc7b8243f0662f6a57bcfe7fd49ac7138f970a3f94f6ea MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da metadata.xml 365 diff --git a/app-editors/xemacs/xemacs-21.4.19.ebuild b/app-editors/xemacs/xemacs-21.4.19.ebuild index 768c46084918..5fd1b6c1ce99 100644 --- a/app-editors/xemacs/xemacs-21.4.19.ebuild +++ b/app-editors/xemacs/xemacs-21.4.19.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.19.ebuild,v 1.1 2006/06/21 04:11:15 mkennedy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.19.ebuild,v 1.2 2006/11/26 13:39:50 graaff Exp $ -inherit eutils +export WANT_AUTOCONF="2.1" +inherit autotools eutils DESCRIPTION="highly customizable open source text editor and application development system" HOMEPAGE="http://www.xemacs.org/" @@ -14,7 +15,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="gpm postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna athena neXt Xaw3d berkdb" -X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext" +X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" DEPEND="virtual/libc !virtual/xemacs @@ -54,8 +55,14 @@ src_unpack() { # see bug 58350 epatch ${FILESDIR}/${PN}-21.4.17-gdbm.patch - autoconf-2.13 - use neXt && cp ${WORKDIR}/NeXT.XEmacs/xemacs-icons/* ${S}/etc/toolbar/ + + # Run autoconf. XEmacs tries to be smart by proivding a stub + # configure.ac file for autoconf 2.59 but this throws our + # autotools eclass so it must be removed first. + rm "${S}"/configure.ac + eautoconf + + use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ } src_compile() { @@ -144,7 +151,7 @@ src_compile() { use ppc64 && myconf="${myconf} --with-system-malloc" - ./configure ${myconf} \ + ./configure ${myconf} ${EXTRA_ECONF} \ --prefix=/usr \ --with-pop \ --with-ncurses \ @@ -154,15 +161,13 @@ src_compile() { --with-site-modules=yes \ || die - # emake dont work on faster boxes it seems - # azarah (04 Aug 2002) - make || die + emake || die } src_install() { - make prefix=${D}/usr \ - mandir=${D}/usr/share/man/man1 \ - infodir=${D}/usr/share/info \ + make prefix="${D}"/usr \ + mandir="${D}"/usr/share/man/man1 \ + infodir="${D}"/usr/share/info \ install gzip-el || die # install base packages directories -- cgit v1.2.3-65-gdbad