summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Kennedy <mkennedy@gentoo.org>2006-08-12 22:51:19 +0000
committerMatthew Kennedy <mkennedy@gentoo.org>2006-08-12 22:51:19 +0000
commit7c1a6844173a79605dc972f8099a2c7a09e5d7c5 (patch)
tree3d0ba5ac8b1377d907dbede4d47db95e884a3217 /app-editors/emacs
parentversion bump, remove old (diff)
downloadhistorical-7c1a6844173a79605dc972f8099a2c7a09e5d7c5.tar.gz
historical-7c1a6844173a79605dc972f8099a2c7a09e5d7c5.tar.bz2
historical-7c1a6844173a79605dc972f8099a2c7a09e5d7c5.zip
Force build with libgif, not libungif; Resolves Bug #95961.
Package-Manager: portage-2.1.1_pre4-r4
Diffstat (limited to 'app-editors/emacs')
-rw-r--r--app-editors/emacs/ChangeLog8
-rw-r--r--app-editors/emacs/Manifest29
-rw-r--r--app-editors/emacs/emacs-21.4-r5.ebuild177
-rw-r--r--app-editors/emacs/files/digest-emacs-21.4-r56
-rw-r--r--app-editors/emacs/files/emacs-21.4-libungif-gif-gentoo.patch34
5 files changed, 239 insertions, 15 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 4cf43cb65846..ed1a1e619bb2 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-editors/emacs
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.98 2006/08/11 16:51:37 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.99 2006/08/12 22:51:19 mkennedy Exp $
+
+*emacs-21.4-r5 (12 Aug 2006)
+
+ 12 Aug 2006; Matthew Kennedy <mkennedy@gentoo.org>
+ +files/emacs-21.4-libungif-gif-gentoo.patch, +emacs-21.4-r5.ebuild:
+ Force build with libgif, not libungif; Resolves Bug #95961.
11 Aug 2006; Jose Luis Rivero <yoswink@gentoo.org> emacs-21.4-r4.ebuild:
Stable on alpha wrt bug #136987
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 3a40e3a89bf7..b52acb526aeb 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 60emacs-21.envd 34 RMD160 d1fdf805716cdf9bcd7744b3eb6f822c4a0d45af SHA1 b67d26aecf206d799eeee8cea2649486a3e024f9 SHA256 880372bcfead2fe980498ac54949933e46f7628c53c978affc93dcd1945a3153
MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34
RMD160 d1fdf805716cdf9bcd7744b3eb6f822c4a0d45af files/60emacs-21.envd 34
@@ -29,6 +26,10 @@ AUX emacs-21.3-xorg.patch 394 RMD160 51d64c84aaa61cd1eb6b08c8fa7688a10bc09949 SH
MD5 ef8adf470d7d95802802b3860ef8d9a9 files/emacs-21.3-xorg.patch 394
RMD160 51d64c84aaa61cd1eb6b08c8fa7688a10bc09949 files/emacs-21.3-xorg.patch 394
SHA256 191c93e97587a7d7b9000d2cba24ef45233aa029719865646bf8d73b26510622 files/emacs-21.3-xorg.patch 394
+AUX emacs-21.4-libungif-gif-gentoo.patch 1534 RMD160 8bc5ef391e644ad00f46c7d34e7341862572346a SHA1 dd0247426f98d3e7e7362792d228e21e1d8855be SHA256 61793086af3c4a56ced40830977ba0d6ebc285d84b4b612798b35ca08f1f1689
+MD5 1607d289126ca057110a993cde0e25fd files/emacs-21.4-libungif-gif-gentoo.patch 1534
+RMD160 8bc5ef391e644ad00f46c7d34e7341862572346a files/emacs-21.4-libungif-gif-gentoo.patch 1534
+SHA256 61793086af3c4a56ced40830977ba0d6ebc285d84b4b612798b35ca08f1f1689 files/emacs-21.4-libungif-gif-gentoo.patch 1534
AUX emacs-21.desktop 238 RMD160 57336e2584a671f642fa1cd5c458b33dbb1e44cc SHA1 92e6200b87c613264ee7103caa15d977c9040a12 SHA256 3d40581e18f1f633d0f1c822b00a8d2fb2de8ea95660fe0815ac837616f6db58
MD5 ab4757cbbda4ac6f848021b947d1f2b2 files/emacs-21.desktop 238
RMD160 57336e2584a671f642fa1cd5c458b33dbb1e44cc files/emacs-21.desktop 238
@@ -73,14 +74,18 @@ EBUILD emacs-21.4-r4.ebuild 4516 RMD160 a81bc3ca548144bdc58d9b78fffcaaa3551391bf
MD5 003872c962e8b41a530e04fe0a49043f emacs-21.4-r4.ebuild 4516
RMD160 a81bc3ca548144bdc58d9b78fffcaaa3551391bf emacs-21.4-r4.ebuild 4516
SHA256 b91c53d2b1f1904421f3ff4d2bcb7bc4fe4ab5a7cd9ab27c386a8ff3a455fb42 emacs-21.4-r4.ebuild 4516
+EBUILD emacs-21.4-r5.ebuild 4512 RMD160 2580279227324de3a004a36165faaed7a7f6e2a7 SHA1 c656aea09be0146b29e415c8d364fcd36b5a64c2 SHA256 0ec0062dbd1478ca4e070bab18afd01d2d063368e6d45167d33dfa83af61ee9b
+MD5 196435ebc88d9adbd4d196a596d7fe9a emacs-21.4-r5.ebuild 4512
+RMD160 2580279227324de3a004a36165faaed7a7f6e2a7 emacs-21.4-r5.ebuild 4512
+SHA256 0ec0062dbd1478ca4e070bab18afd01d2d063368e6d45167d33dfa83af61ee9b emacs-21.4-r5.ebuild 4512
EBUILD emacs-22.0.50_pre20050225.ebuild 5557 RMD160 11e3ea0cc9bdad886ce7ecb4946925dfda0d83ed SHA1 296bba1410b3575fd1ccf54bbcef7756adc5038a SHA256 12629d258f388c211c18ed21bb65cb6479b3375913a921e85305fab8ae9bbd39
MD5 7e17815f1e5c1a8a92e12ce8a4a20951 emacs-22.0.50_pre20050225.ebuild 5557
RMD160 11e3ea0cc9bdad886ce7ecb4946925dfda0d83ed emacs-22.0.50_pre20050225.ebuild 5557
SHA256 12629d258f388c211c18ed21bb65cb6479b3375913a921e85305fab8ae9bbd39 emacs-22.0.50_pre20050225.ebuild 5557
-MISC ChangeLog 14302 RMD160 7788326b8cf02b71f5962f764e9da25fc6af0830 SHA1 367246945597cc84a21c887d8931794c5818fd8e SHA256 2c3b484f1dc0c77b5682ac2e337bb465fe4366db58bf97b8e66273ff51dd677c
-MD5 980088ecb0bfc21b3898a91f9621ee96 ChangeLog 14302
-RMD160 7788326b8cf02b71f5962f764e9da25fc6af0830 ChangeLog 14302
-SHA256 2c3b484f1dc0c77b5682ac2e337bb465fe4366db58bf97b8e66273ff51dd677c ChangeLog 14302
+MISC ChangeLog 14519 RMD160 1e40f832d7bfde03883e50e284eea71179adfcd9 SHA1 ed25c995e1b71a5ce3d06ae9dc6b906d416ee1d7 SHA256 a8057d450f4a04a6bf09d699f825eb0d4b66b15e08665a1dbf78a5295740033e
+MD5 d5299663a21883023cd87a35d8f6f9cc ChangeLog 14519
+RMD160 1e40f832d7bfde03883e50e284eea71179adfcd9 ChangeLog 14519
+SHA256 a8057d450f4a04a6bf09d699f825eb0d4b66b15e08665a1dbf78a5295740033e ChangeLog 14519
MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -100,13 +105,9 @@ SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/di
MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r4 473
RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r4 473
SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r4 473
+MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r5 473
+RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r5 473
+SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r5 473
MD5 ed2d88ad9bf508129ba31e70db41c21f files/digest-emacs-22.0.50_pre20050225 242
RMD160 dd3b099e534c17d4c5df8f158ce650ebd7efd9e0 files/digest-emacs-22.0.50_pre20050225 242
SHA256 755aec99fde21c950526d2ded1c2355f21e612b3329fc79bb3f5cf74c5b718bf files/digest-emacs-22.0.50_pre20050225 242
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFE3LiX3og80iZgVQgRAnEvAJ4nm4bWp5GoJCznwy4Y5eZiw0Ve1wCfbdf/
-YP3dzb7ziSxsJqDS0duZNVM=
-=OoX0
------END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r5.ebuild b/app-editors/emacs/emacs-21.4-r5.ebuild
new file mode 100644
index 000000000000..9939c38f3591
--- /dev/null
+++ b/app-editors/emacs/emacs-21.4-r5.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r5.ebuild,v 1.1 2006/08/12 22:51:19 mkennedy 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}a.tar.gz
+ leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="21"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X Xaw3d leim lesstif motif nls nosendmail"
+
+RDEPEND="sys-libs/ncurses
+ sys-libs/gdbm
+ X? ( || ( ( x11-libs/libXext
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXmu
+ x11-libs/libXpm
+ || ( media-fonts/font-adobe-100dpi
+ media-fonts/font-adobe-75dpi )
+ )
+ 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 )
+ !Xaw3d? ( || ( x11-libs/libXaw virtual/x11 ) )
+ motif? (
+ lesstif? ( x11-libs/lesstif )
+ !lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
+ )
+ )
+ nls? ( sys-devel/gettext )
+ !nosendmail? ( virtual/mta )"
+
+DEPEND="${RDEPEND}
+ >=sys-devel/autoconf-2.58
+ X? ( || ( x11-misc/xbitmaps virtual/x11 ) )"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+DFILE=emacs-${SLOT}.desktop
+
+src_unpack() {
+
+ 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
+ epatch ${FILESDIR}/emacs-21.2-sh.patch
+ epatch ${FILESDIR}/emacs-21.4-libungif-gif-gentoo.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
+}
+
+src_compile() {
+ export SANDBOX_ON=0
+
+ # -fstack-protector gets internal compiler error at xterm.c (bug 33265)
+ filter-flags -fstack-protector
+
+ # emacs doesn't handle LDFLAGS properly (bug #77430 and bug #65002)
+ unset LDFLAGS
+
+ # ever since GCC 3.2
+ replace-flags -O[3-9] -O2
+
+ # -march is known to cause signal 6 on some environment
+ filter-flags "-march=*"
+
+ 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 CC="$(tc-getCC)" || 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
+ keepdir /usr/share/emacs/site-lisp
+
+ dodoc BUGS ChangeLog README
+
+ insinto /usr/share/applications
+ doins ${FILESDIR}/${DFILE}
+}
+
+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/files/digest-emacs-21.4-r5 b/app-editors/emacs/files/digest-emacs-21.4-r5
new file mode 100644
index 000000000000..6898ecff2a12
--- /dev/null
+++ b/app-editors/emacs/files/digest-emacs-21.4-r5
@@ -0,0 +1,6 @@
+MD5 8f9d97cbd126121bd5d97e5e31168a87 emacs-21.4a.tar.gz 20403483
+RMD160 c312e739935b56d08783bbfe97992297a363cb8a emacs-21.4a.tar.gz 20403483
+SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 emacs-21.4a.tar.gz 20403483
+MD5 32938cb5a7505d995a1e835639d19707 leim-21.4.tar.gz 3291433
+RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca leim-21.4.tar.gz 3291433
+SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b leim-21.4.tar.gz 3291433
diff --git a/app-editors/emacs/files/emacs-21.4-libungif-gif-gentoo.patch b/app-editors/emacs/files/emacs-21.4-libungif-gif-gentoo.patch
new file mode 100644
index 000000000000..abae185c1155
--- /dev/null
+++ b/app-editors/emacs/files/emacs-21.4-libungif-gif-gentoo.patch
@@ -0,0 +1,34 @@
+diff -ur emacs-21.4.orig/configure.in emacs-21.4/configure.in
+--- emacs-21.4.orig/configure.in 2003-03-16 16:06:05.000000000 -0600
++++ emacs-21.4/configure.in 2006-08-12 17:15:44.000000000 -0500
+@@ -1927,7 +1927,7 @@
+ AC_CHECK_HEADER(gif_lib.h,
+ # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
+ # Earlier versions can crash Emacs.
+- AC_CHECK_LIB(ungif, EGifPutExtensionLast, HAVE_GIF=yes))
++ AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes))
+ fi
+
+ if test "${HAVE_GIF}" = "yes"; then
+@@ -2283,7 +2283,7 @@
+ echo " Does Emacs use -lXpm? ${HAVE_XPM}"
+ echo " Does Emacs use -ljpeg? ${HAVE_JPEG}"
+ echo " Does Emacs use -ltiff? ${HAVE_TIFF}"
+-echo " Does Emacs use -lungif? ${HAVE_GIF}"
++echo " Does Emacs use -lgif? ${HAVE_GIF}"
+ echo " Does Emacs use -lpng? ${HAVE_PNG}"
+ echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
+ echo
+diff -ur emacs-21.4.orig/src/Makefile.in emacs-21.4/src/Makefile.in
+--- emacs-21.4.orig/src/Makefile.in 2003-01-23 04:34:06.000000000 -0600
++++ emacs-21.4/src/Makefile.in 2006-08-12 17:23:30.000000000 -0500
+@@ -402,7 +402,7 @@
+
+ #if HAVE_GIF
+ #ifndef LIBGIF
+-#define LIBGIF -lungif
++#define LIBGIF -lgif
+ #endif /* not defined LIBGIF */
+ #else /* not HAVE_GIF */
+ #define LIBGIF
+Only in emacs-21.4/src: Makefile.in~