From: Christian Faulhammer Date: Wed, 7 Mar 2007 04:35:52 +0000 (+0000) Subject: make subdirs patch obsolete X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=87075d6baa7d09eb5b79a752a975176cf2632cb3;p=gentoo.git make subdirs patch obsolete Package-Manager: portage-2.1.2-r9 --- diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index e7dc72534ed1..f8a3cd138452 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-editors/emacs # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.126 2007/03/02 21:44:02 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.127 2007/03/07 04:35:52 opfer Exp $ + +*emacs-21.4-r8 (07 Mar 2007) + + 07 Mar 2007; Christian Faulhammer + +emacs-21.4-r8.ebuild: + make subdirs patch obsolete 02 Mar 2007; Christian Faulhammer emacs-21.4-r4.ebuild, emacs-21.4-r7.ebuild: diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 930de12c9c80..99f5397d2e74 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -70,10 +70,14 @@ EBUILD emacs-21.4-r7.ebuild 5717 RMD160 0c7915c01f952f91d6d0b7e39673bd2e99400d87 MD5 6641ed0b067232ef3c40adf0685b21ba emacs-21.4-r7.ebuild 5717 RMD160 0c7915c01f952f91d6d0b7e39673bd2e99400d87 emacs-21.4-r7.ebuild 5717 SHA256 cff295736e892c2feb41556531bcf45b4b9e94125ac2ec0667c304af6da767e8 emacs-21.4-r7.ebuild 5717 -MISC ChangeLog 19297 RMD160 e34415eab958e98214e338027e66fb0ae0aaa2d1 SHA1 ead5af3623ea28aeb856f57023f0e7a0d6441d1f SHA256 71413aeb53ce82023d27b4d9cc55ec2af5947677edec36941306953331aa62c1 -MD5 1cfe92d24587a16e5d2bf45c79584de2 ChangeLog 19297 -RMD160 e34415eab958e98214e338027e66fb0ae0aaa2d1 ChangeLog 19297 -SHA256 71413aeb53ce82023d27b4d9cc55ec2af5947677edec36941306953331aa62c1 ChangeLog 19297 +EBUILD emacs-21.4-r8.ebuild 5904 RMD160 75ad963ddc948317d3c7bd57033831b17e4b8d1b SHA1 46aab9fb881242793c51cec98a592fe98b0e4f0f SHA256 d745868a716d0d74535c59c16a32f21be95bb3402ed06b11f2aa5ae463273eb1 +MD5 0f99b9f89187278afba7395b42dad392 emacs-21.4-r8.ebuild 5904 +RMD160 75ad963ddc948317d3c7bd57033831b17e4b8d1b emacs-21.4-r8.ebuild 5904 +SHA256 d745868a716d0d74535c59c16a32f21be95bb3402ed06b11f2aa5ae463273eb1 emacs-21.4-r8.ebuild 5904 +MISC ChangeLog 19438 RMD160 006eb597624fa6f4a3958669acf5a6acfe89f8da SHA1 7c230efeff477c6565b164e71485f4d06c7d3837 SHA256 69685c90e059f85eb1596995f0d4e5b5b91f751d90ed66222268fc8682d39e60 +MD5 0be302c164e445582e173c2403269895 ChangeLog 19438 +RMD160 006eb597624fa6f4a3958669acf5a6acfe89f8da ChangeLog 19438 +SHA256 69685c90e059f85eb1596995f0d4e5b5b91f751d90ed66222268fc8682d39e60 ChangeLog 19438 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158 @@ -87,10 +91,13 @@ SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/di MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r7 473 RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r7 473 SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r7 473 +MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r8 473 +RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r8 473 +SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r8 473 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFF6JqBNQqtfCuFneMRAr+2AJwICl2jCL7FA4OhKiWe9ksivki4eQCfa8KI -vrUyNSRp0v5rEFxM6zLQvCQ= -=18Fb +iD8DBQFF7kDvNQqtfCuFneMRAk9KAKCFb6PemF8ORIKpqEZBTx2MrSMIOgCeJMAP +/1gpD+6KbFH0RQBgZL8lyNo= +=7n0b -----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-21.4-r8.ebuild b/app-editors/emacs/emacs-21.4-r8.ebuild new file mode 100644 index 000000000000..ff6f29d3c403 --- /dev/null +++ b/app-editors/emacs/emacs-21.4-r8.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r8.ebuild,v 1.1 2007/03/07 04:35:52 opfer 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 + 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 ) + >=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 ) + 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 )" + +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-21.4-autosave-tmp.patch" + epatch "${FILESDIR}/emacs-21.4-blessmail-build.patch" + + # 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 + + # this fixes bug 152006 + use ppc64 && append-flags -mno-fp-in-toc -mno-sum-in-toc + + # -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 + + einfo "Recompiling patched lisp files..." + (cd lisp; emake recompile) || 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 + done + mv "${T}/emacs-${SLOT}" "${D}/usr/share/info" + mv "${T}/dir" "${D}/usr/share/info/emacs-${SLOT}" + + if has_version 'app-text/aspell' ; then + # defaults to aspell if installed + elisp-site-file-install "${FILESDIR}/40aspell-gentoo.el" + fi + + 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 + + # avoid collision between slots + rm "${D}"/usr/share/emacs/site-lisp/subdirs.el + + einfo "Fixing permissions..." + find "${D}" -perm 664 |xargs chmod -f 644 2>/dev/null + find "${D}" -type d |xargs chmod -f 755 2>/dev/null + + 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() { + # extract the suffix of the manpages to determine the correct compression program + local suffix=$(echo /usr/share/man/man1/emacs.emacs-*.1*|sed 's/.*\.1//') + + # this creates symlinks for binaries and man pages, so the correct ones in a slotted + # environment can be accessed + 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 + + for j in emacs etags ctags gfdl + do + alternatives_auto_makesym "/usr/share/man/man1/$j.1${suffix}" "/usr/share/man/man1/$j.emacs-*" + done +} + +pkg_postinst() { + test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el || + cp ${ROOT}/usr/share/emacs{/${PV},}/site-lisp/subdirs.el + + update-alternatives + elisp-site-regen + + if use nosendmail; then + while read line; do einfo "${line}"; done<<'EOF' + +You disabled sendmail support for Emacs. If you later install a MTA +then you will need to recompile Emacs. See Bug #11104. + +EOF + fi + if use X; then + while read line; do einfo "${line}"; done<<'EOF' + +You need to install some fonts for Emacs. Under monolithic +XFree86/Xorg you typically had such fonts installed by default. With +modular Xorg, you will have to perform this step yourself. + +Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic +Emacs requirements under X11. + +EOF + fi +} + +pkg_postrm() { + update-alternatives + elisp-site-regen +} diff --git a/app-editors/emacs/files/digest-emacs-21.4-r8 b/app-editors/emacs/files/digest-emacs-21.4-r8 new file mode 100644 index 000000000000..6898ecff2a12 --- /dev/null +++ b/app-editors/emacs/files/digest-emacs-21.4-r8 @@ -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