diff options
author | Mamoru Komachi <usata@gentoo.org> | 2005-04-08 17:12:39 +0000 |
---|---|---|
committer | Mamoru Komachi <usata@gentoo.org> | 2005-04-08 17:12:39 +0000 |
commit | b3ebe2915aa4c655c91abbb430a132e028251b0a (patch) | |
tree | 30f55f966a53aeb1d9fd2e2f389df34ee401d9af /app-editors | |
parent | Stable on ppc64 (diff) | |
download | historical-b3ebe2915aa4c655c91abbb430a132e028251b0a.tar.gz historical-b3ebe2915aa4c655c91abbb430a132e028251b0a.tar.bz2 historical-b3ebe2915aa4c655c91abbb430a132e028251b0a.zip |
Use giflib instead of libungif; bug #85720. Installs correct desktop entry; bug #86932.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/emacs/ChangeLog | 14 | ||||
-rw-r--r-- | app-editors/emacs/Manifest | 36 | ||||
-rw-r--r-- | app-editors/emacs/emacs-21.4-r1.ebuild | 164 | ||||
-rw-r--r-- | app-editors/emacs/emacs-22.0.50_pre20050225.ebuild | 7 | ||||
-rw-r--r-- | app-editors/emacs/files/digest-emacs-21.4-r1 | 2 | ||||
-rw-r--r-- | app-editors/emacs/files/emacs-21.desktop | 3 | ||||
-rw-r--r-- | app-editors/emacs/files/emacs-22.0.50.desktop | 1 |
7 files changed, 198 insertions, 29 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 8dce5cd46041..76d6d15f1bab 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-editors/emacs # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.58 2005/02/26 04:20:48 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.59 2005/04/08 17:12:38 usata Exp $ + +*emacs-21.4-r1 (08 Apr 2005) + + 08 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> files/emacs-21.desktop, + files/emacs-22.0.50.desktop, +emacs-21.4-r1.ebuild, + emacs-22.0.50_pre20050225.ebuild: + Use giflib instead of libungif; bug #85720. Installs correct desktop + entry; bug #86932. *emacs-22.0.50_pre20050225 (26 Feb 2005) @@ -14,7 +22,7 @@ 20 Feb 2005; Aron Griffis <agriffis@gentoo.org> emacs-21.4.ebuild: stable on ia64 #79686 - 10 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> emacs-21.4.ebuild: + 10 Feb 2005; Bryan ?stergaard <kloeri@gentoo.org> emacs-21.4.ebuild: Stable on alpha, bug 79686. 09 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> emacs-21.4.ebuild: @@ -26,7 +34,7 @@ 08 Feb 2005; Markus Rothe <corsair@gentoo.org> emacs-21.4.ebuild: Stable on ppc64; bug #79686 - 08 Feb 2005; Olivier Crête <tester@gentoo.org> emacs-21.4.ebuild: + 08 Feb 2005; Olivier Cr??te <tester@gentoo.org> emacs-21.4.ebuild: Stable on x86 wrt bug #79686 08 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> emacs-21.4.ebuild: diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index c70351136dcb..b7e3c2e24b9c 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -1,29 +1,21 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 2f8cad126b529ba2b927494e16060732 ChangeLog 8919 +MD5 12938feba91966dbaeab37e85d0203a3 emacs-21.4.ebuild 4077 +MD5 da56e8c901b47b503a383867fd9f86e4 emacs-22.0.50_pre20050225.ebuild 5399 +MD5 7b39bb8bc99880c93606158e68f9a4c2 ChangeLog 9202 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 MD5 767c6035b2be8309041a7c2e81bfd7a0 emacs-18.59.ebuild 2007 -MD5 12938feba91966dbaeab37e85d0203a3 emacs-21.4.ebuild 4077 -MD5 0956120e282fdb09d44339831db10e7d emacs-22.0.50_pre20050225.ebuild 5346 +MD5 f001de6d06f29e1b05c3472ea7b74f8d emacs-21.4-r1.ebuild 4201 +MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190 +MD5 56a239d1965c2bac249e787b1ef6a1f5 files/digest-emacs-21.4-r1 126 +MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/60emacs-22.0.50.envd 39 +MD5 8edd35b2b32c2b594138b6bde063d961 files/emacs-22.0.50.desktop 249 +MD5 ef8adf470d7d95802802b3860ef8d9a9 files/emacs-21.3-xorg.patch 394 +MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938 +MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493 MD5 0d7a5eba9d25e527c53da9a73c3bb767 files/digest-emacs-18.59 216 MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369 MD5 56a239d1965c2bac249e787b1ef6a1f5 files/digest-emacs-21.4 126 -MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938 -MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493 +MD5 f6a4a0f9d36297f686ca56fae7bcef68 files/digest-emacs-22.0.50_pre20050225 242 MD5 2aaf4fc4c9513f13c4edb24327247f83 files/emacs-21.3-ppc64.patch 1622 -MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190 -MD5 ef8adf470d7d95802802b3860ef8d9a9 files/emacs-21.3-xorg.patch 394 -MD5 6aafc439ab1c05f97db2bfefc707bdcc files/emacs-21.desktop 196 -MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-nofink-gentoo.diff 1520 MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34 -MD5 8e50e760415e106cd168d8709d31b7dc files/emacs-22.0.50.desktop 206 -MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/60emacs-22.0.50.envd 39 -MD5 f6a4a0f9d36297f686ca56fae7bcef68 files/digest-emacs-22.0.50_pre20050225 242 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (Darwin) - -iD8DBQFCH/kqVWNWqTUmv+0RAg4NAKCuMZoLVt3vKievSNqcHpA//tI7+QCfVd7H -MkcbuJotOIGY+JiBcUH2PAk= -=+cMK ------END PGP SIGNATURE----- +MD5 7d302a307c0e6ab874699eb0c496f982 files/emacs-21.desktop 245 +MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-nofink-gentoo.diff 1520 diff --git a/app-editors/emacs/emacs-21.4-r1.ebuild b/app-editors/emacs/emacs-21.4-r1.ebuild new file mode 100644 index 000000000000..46299ab10dfc --- /dev/null +++ b/app-editors/emacs/emacs-21.4-r1.ebuild @@ -0,0 +1,164 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r1.ebuild,v 1.1 2005/04/08 17:12:38 usata Exp $ + +inherit flag-o-matic eutils alternatives toolchain-funcs + +DESCRIPTION="An incredibly powerful, extensible text editor" +HOMEPAGE="http://www.gnu.org/software/emacs" +SRC_URI="mirror://gnu/emacs/${P}.tar.gz + leim? ( mirror://gnu/emacs/leim-21.3.tar.gz )" + +LICENSE="GPL-2" +SLOT="21" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="X Xaw3d gnome leim lesstif motif nls nosendmail" + +RDEPEND="sys-libs/ncurses + sys-libs/gdbm + X? ( virtual/x11 + >=media-libs/giflib-4.1.0.1b + >=media-libs/jpeg-6b-r2 + >=media-libs/tiff-3.5.5-r3 + >=media-libs/libpng-1.2.1 + !arm? ( + Xaw3d? ( x11-libs/Xaw3d ) + motif? ( + lesstif? ( x11-libs/lesstif ) + !lesstif? ( >=x11-libs/openmotif-2.1.30 ) ) + gnome? ( gnome-base/gnome-desktop ) + ) + ) + nls? ( sys-devel/gettext ) + !nosendmail? ( virtual/mta )" +DEPEND="${RDEPEND} + >=sys-devel/autoconf-2.58" + +PROVIDE="virtual/emacs virtual/editor" +SANDBOX_DISABLED="1" + +DFILE=emacs-${SLOT}.desktop + +src_unpack() { + # Emacs 21.4 uses leim from 21.3 + ln -s emacs-21.4 emacs-21.3 + + unpack ${A} + + cd ${S} + epatch ${FILESDIR}/emacs-21.3-xorg.patch + epatch ${FILESDIR}/emacs-21.3-amd64.patch + epatch ${FILESDIR}/emacs-21.3-hppa.patch + use ppc64 && epatch ${FILESDIR}/emacs-21.3-ppc64.patch + + epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff + + # This will need to be updated for X-Compilation + sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \ + ${S}/src/s/gnu-linux.h + + sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile.in || die +} + +src_compile() { + + # -fstack-protector gets internal compiler error at xterm.c (bug 33265) + filter-flags -fstack-protector + + # gcc 3.4 with -O3 or stronger flag spoils emacs + if [ "$(gcc-major-version)" -ge 3 -a "$(gcc-minor-version)" -ge 4 ] ; then + replace-flags -O[3-9] -O2 + fi + + export WANT_AUTOCONF=2.1 + autoconf + + local myconf + use nls || myconf="${myconf} --disable-nls" + if use X ; then + if use motif && use lesstif; then + append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif + export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/lesstif" + fi + myconf="${myconf} + --with-x + --with-xpm + --with-jpeg + --with-tiff + --with-gif + --with-png" + if use Xaw3d ; then + myconf="${myconf} --with-x-toolkit=athena" + elif use motif ; then + myconf="${myconf} --with-x-toolkit=motif" + else + # do not build emacs with any toolkit, bug 35300 + myconf="${myconf} --with-x-toolkit=no" + fi + else + myconf="${myconf} --without-x" + fi + econf ${myconf} || die + emake || die +} + +src_install() { + einstall || die + for i in ${D}/usr/bin/* ; do + mv ${i} ${i}.emacs-${SLOT} || die "mv ${i} failed" + done + mv ${D}/usr/bin/emacs{-${PV},}.emacs-${SLOT} || die "mv emacs failed" + dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT} + + einfo "Fixing info documentation..." + mkdir ${T}/emacs-${SLOT} + mv ${D}/usr/share/info/dir ${T} + for i in ${D}/usr/share/info/* + do + mv ${i} ${T}/emacs-${SLOT}/${i##*/}.info + gzip -9 ${T}/emacs-${SLOT}/${i##*/}.info + done + mv ${T}/emacs-${SLOT} ${D}/usr/share/info + mv ${T}/dir ${D}/usr/share/info/emacs-${SLOT} + + newenvd ${FILESDIR}/60emacs-${SLOT}.envd 60emacs-${SLOT} + + einfo "Fixing manpages..." + for m in ${D}/usr/share/man/man1/* ; do + mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv ${m} failed" + done + + einfo "Fixing permissions..." + find ${D} -perm 664 |xargs chmod 644 + find ${D} -type d |xargs chmod 755 + + keepdir /usr/share/emacs/${PV}/leim + + dodoc BUGS ChangeLog README + + if use gnome ; then + insinto /usr/share/applications + doins ${FILESDIR}/${DFILE} + fi +} + +update-alternatives() { + for i in emacs emacsclient etags ctags b2m ebrowse \ + rcs-checkin grep-changelog ; do + alternatives_auto_makesym "/usr/bin/$i" "/usr/bin/${i}.emacs-*" + done +} + +pkg_postinst() { + update-alternatives + if use nosendmail ; then + ewarn + ewarn "You disabled sendmail support for Emacs. If you will install any MTA" + ewarn "you need to recompile Emacs after that. See bug #11104." + ewarn + fi +} + +pkg_postrm() { + update-alternatives +} diff --git a/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild b/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild index 06dce1b3bf27..750d9b10cb29 100644 --- a/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild +++ b/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild,v 1.1 2005/02/26 04:20:48 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild,v 1.2 2005/04/08 17:12:38 usata Exp $ inherit elisp-common alternatives flag-o-matic eutils @@ -26,7 +26,7 @@ DEPEND=">=sys-apps/portage-2.0.51 sys-libs/gdbm spell? ( || ( app-text/ispell app-text/aspell ) ) X? ( virtual/x11 - gif? ( >=media-libs/libungif-4.1.0.1b ) + gif? ( >=media-libs/giflib-4.1.0.1b ) jpeg? ( >=media-libs/jpeg-6b ) tiff? ( >=media-libs/tiff-3.5.7 ) png? ( >=media-libs/libpng-1.2.5 ) @@ -70,6 +70,7 @@ src_unpack() { sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \ ${S}/src/s/gnu-linux.h + sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile.in || die } src_compile() { @@ -156,7 +157,7 @@ src_install () { dodoc BUGS ChangeLog README* if use gnome; then - insinto /usr/share/gnome/apps/Application + insinto /usr/share/applications doins ${FILESDIR}/${DFILE} || die "install desktop file faild" fi } diff --git a/app-editors/emacs/files/digest-emacs-21.4-r1 b/app-editors/emacs/files/digest-emacs-21.4-r1 new file mode 100644 index 000000000000..57a8aeb49fa3 --- /dev/null +++ b/app-editors/emacs/files/digest-emacs-21.4-r1 @@ -0,0 +1,2 @@ +MD5 0a68ea5b29bb2f081ba8dd85d37bb9bc emacs-21.4.tar.gz 20516657 +MD5 1c968c37e22be0f0d8f8cd57cebe5a5e leim-21.3.tar.gz 3291224 diff --git a/app-editors/emacs/files/emacs-21.desktop b/app-editors/emacs/files/emacs-21.desktop index 4d1bfd0b1b62..ffd8a10643c9 100644 --- a/app-editors/emacs/files/emacs-21.desktop +++ b/app-editors/emacs/files/emacs-21.desktop @@ -4,4 +4,5 @@ Comment=Emacs is the extensible, customizable, self-documenting real-time displa Icon=gnome-emacs.png Terminal=0 Type=Application -Exec=/usr/bin/emacs-21 +Categories=Application;Utility;TextEditor; +Exec=/usr/bin/emacs.emacs-21 diff --git a/app-editors/emacs/files/emacs-22.0.50.desktop b/app-editors/emacs/files/emacs-22.0.50.desktop index 9450a26f6e95..04dca1597b81 100644 --- a/app-editors/emacs/files/emacs-22.0.50.desktop +++ b/app-editors/emacs/files/emacs-22.0.50.desktop @@ -4,4 +4,5 @@ Comment=Emacs is the extensible, customizable, self-documenting real-time displa Icon=gnome-emacs.png Terminal=0 Type=Application +Categories=Application;Utility;TextEditor; Exec=/usr/bin/emacs-22.0.50 |