From ac90a733ce131ff55e901444981d09c73a234779 Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Fri, 2 Mar 2007 07:16:59 +0000 Subject: [PATCH] revision bump to new pretest versions Package-Manager: portage-2.1.2-r9 --- app-editors/emacs-cvs/ChangeLog | 10 ++++- app-editors/emacs-cvs/Manifest | 44 +++++++++---------- ....93-r2.ebuild => emacs-cvs-22.0.95.ebuild} | 23 ++++++---- ...2.ebuild => emacs-cvs-22.0.9999-r4.ebuild} | 20 ++++++--- .../files/digest-emacs-cvs-22.0.93-r2 | 3 -- .../emacs-cvs/files/digest-emacs-cvs-22.0.95 | 3 ++ ....9999-r2 => digest-emacs-cvs-22.0.9999-r4} | 0 7 files changed, 62 insertions(+), 41 deletions(-) rename app-editors/emacs-cvs/{emacs-cvs-22.0.93-r2.ebuild => emacs-cvs-22.0.95.ebuild} (93%) rename app-editors/emacs-cvs/{emacs-cvs-22.0.9999-r2.ebuild => emacs-cvs-22.0.9999-r4.ebuild} (93%) delete mode 100644 app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.93-r2 create mode 100644 app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.95 rename app-editors/emacs-cvs/files/{digest-emacs-cvs-22.0.9999-r2 => digest-emacs-cvs-22.0.9999-r4} (100%) diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index f98aeaaf079c..85f6511b1ec0 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-editors/emacs-cvs # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.85 2007/02/27 18:40:22 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.86 2007/03/02 07:16:59 opfer Exp $ + +*emacs-cvs-22.0.9999-r4 (02 Mar 2007) +*emacs-cvs-22.0.95 (02 Mar 2007) + + 02 Mar 2007; Christian Faulhammer + -emacs-cvs-22.0.93-r2.ebuild, +emacs-cvs-22.0.95.ebuild, + -emacs-cvs-22.0.9999-r2.ebuild, +emacs-cvs-22.0.9999-r4.ebuild: + revision bump to new pretest versions 27 Feb 2007; Christian Faulhammer emacs-cvs-22.0.94.ebuild, emacs-cvs-22.0.9999-r3.ebuild: diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest index 234e0c205efc..77914dc49039 100644 --- a/app-editors/emacs-cvs/Manifest +++ b/app-editors/emacs-cvs/Manifest @@ -37,55 +37,55 @@ AUX emacs.desktop.in 236 RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 SHA1 0e MD5 97a1860f95596f13a074a96456ffeac4 files/emacs.desktop.in 236 RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 files/emacs.desktop.in 236 SHA256 8bbfa1b6bb241fd3653b5b1c25ef1ecd298c63d7e0fdc87baab8b274eb627342 files/emacs.desktop.in 236 -DIST emacs-22.0.93.tar.gz 37118034 RMD160 c70a745662495c68470f2b483f61d68d09e8ed73 SHA1 1c226f1c03e33fef66b759e6afd6eb580adc948b SHA256 44dd612b521a47d923c759525b1134bbc571350cae80bdc543c31f30acc7739e DIST emacs-22.0.94.tar.gz 37596398 RMD160 30e5930219a9d7391110cab73046ac1da49c94fc SHA1 aad7c8ee33a8f46297fa48050c02e87f2b638e33 SHA256 0d76c94dd90510c047a54831115e499d6b628a8ec7119fa1876fb556667e24c6 -EBUILD emacs-cvs-22.0.93-r2.ebuild 6745 RMD160 f51b789971cf92ab87a081ade5db2c6c0b4348e4 SHA1 2120d4babd1fee60d3f0a3ef4ab5bd1740b74ff4 SHA256 e129655a9b8cbb7395c374c25f341eb92dc09aea8c77c86d3aa697dd1fc95e0b -MD5 3be0eac2733216ac9543ba014d250b4b emacs-cvs-22.0.93-r2.ebuild 6745 -RMD160 f51b789971cf92ab87a081ade5db2c6c0b4348e4 emacs-cvs-22.0.93-r2.ebuild 6745 -SHA256 e129655a9b8cbb7395c374c25f341eb92dc09aea8c77c86d3aa697dd1fc95e0b emacs-cvs-22.0.93-r2.ebuild 6745 +DIST emacs-22.0.95.tar.gz 37754533 RMD160 e5aa6001a255538dbc8fb2d548d1b67979f94033 SHA1 90cd5a6078d26b3bd0eb4f2da0561df759bc880f SHA256 5e25e8f221fe18f07feadd831bb482e6cde53c9470713c63f059ff2d3e715b1d EBUILD emacs-cvs-22.0.94.ebuild 6857 RMD160 2ba0626d83db89682b817217d2fb51eeffa59bdb SHA1 6f8c92ee2daf56825bf15d930663ef95ee59bb6b SHA256 ee9cc2885d19564866e76e6ae04225133ee1b9572a87a037ac7d3746386fe4b9 MD5 2f46876beaa3cec44bc52c1953bd2ac9 emacs-cvs-22.0.94.ebuild 6857 RMD160 2ba0626d83db89682b817217d2fb51eeffa59bdb emacs-cvs-22.0.94.ebuild 6857 SHA256 ee9cc2885d19564866e76e6ae04225133ee1b9572a87a037ac7d3746386fe4b9 emacs-cvs-22.0.94.ebuild 6857 -EBUILD emacs-cvs-22.0.9999-r2.ebuild 6739 RMD160 e825492844163a33a22efec6072a16dc3dd26659 SHA1 3e0e611d6eac28c3f48b87ec0bf3abd2ba3aee3e SHA256 52ac5df7b6b0b4a710a1c4c05356d15c216486e6cfd95f6773c44307a6cf32ce -MD5 2da62a2d364735a4a47314f14d91ece3 emacs-cvs-22.0.9999-r2.ebuild 6739 -RMD160 e825492844163a33a22efec6072a16dc3dd26659 emacs-cvs-22.0.9999-r2.ebuild 6739 -SHA256 52ac5df7b6b0b4a710a1c4c05356d15c216486e6cfd95f6773c44307a6cf32ce emacs-cvs-22.0.9999-r2.ebuild 6739 +EBUILD emacs-cvs-22.0.95.ebuild 6857 RMD160 644651e786fd6e19994c03d5255f8cbeb7bd6241 SHA1 ea34caf1c84e8f4ff39a6a049e001268bfce8de2 SHA256 476d2cc804947a53a5e0a6ec6f891b887d0ccc9d751b40c44ac5e397a97b7381 +MD5 e09dc3478a4df26e8ffed316d569fdab emacs-cvs-22.0.95.ebuild 6857 +RMD160 644651e786fd6e19994c03d5255f8cbeb7bd6241 emacs-cvs-22.0.95.ebuild 6857 +SHA256 476d2cc804947a53a5e0a6ec6f891b887d0ccc9d751b40c44ac5e397a97b7381 emacs-cvs-22.0.95.ebuild 6857 EBUILD emacs-cvs-22.0.9999-r3.ebuild 7013 RMD160 d13a2d782f553f6785c4574ad42d8e568e3a621e SHA1 b20e8d769e994ccf9144d2c0ad30d13a99c5dd05 SHA256 f2278e6077f498b256b6a07be60180baf337b15410ccc21924f2304d704ae6ec MD5 c3bdfa61ae3d3d547728dddf9c212211 emacs-cvs-22.0.9999-r3.ebuild 7013 RMD160 d13a2d782f553f6785c4574ad42d8e568e3a621e emacs-cvs-22.0.9999-r3.ebuild 7013 SHA256 f2278e6077f498b256b6a07be60180baf337b15410ccc21924f2304d704ae6ec emacs-cvs-22.0.9999-r3.ebuild 7013 +EBUILD emacs-cvs-22.0.9999-r4.ebuild 7013 RMD160 9c3040264f2f6c084389c61d5e9c2d714a400f62 SHA1 677e9a4337618ed9698fac2cc16e7c713e74cf5c SHA256 39dd33f7a9a466aa77fe9bfc5175ce7409bf398f07b4e58ee504176d18a1cf66 +MD5 bfaaa3ab15a08d0691514ec4f260f650 emacs-cvs-22.0.9999-r4.ebuild 7013 +RMD160 9c3040264f2f6c084389c61d5e9c2d714a400f62 emacs-cvs-22.0.9999-r4.ebuild 7013 +SHA256 39dd33f7a9a466aa77fe9bfc5175ce7409bf398f07b4e58ee504176d18a1cf66 emacs-cvs-22.0.9999-r4.ebuild 7013 EBUILD emacs-cvs-23.0.0-r1.ebuild 5904 RMD160 2bb97d0bb0fbb4e426297d58b3a97402e21f4764 SHA1 b816af746a3646a3ff5767db41f85cfc4a4b0117 SHA256 9a20533595e3949519d4e75e3857c1c729dfaf124e891253e63631ff962a8b9b MD5 61bac54173aa6dc34e29d7f75935ff36 emacs-cvs-23.0.0-r1.ebuild 5904 RMD160 2bb97d0bb0fbb4e426297d58b3a97402e21f4764 emacs-cvs-23.0.0-r1.ebuild 5904 SHA256 9a20533595e3949519d4e75e3857c1c729dfaf124e891253e63631ff962a8b9b emacs-cvs-23.0.0-r1.ebuild 5904 -MISC ChangeLog 16224 RMD160 fcd2d16af3ff50514bc4cb70a834a57b87e6be28 SHA1 5be72c6081ee2ba7db1b0c38078bf21a33b1df76 SHA256 1a78c6d9e52906ecc1232c74bbf7ede5e6c1d3cd78659fb6c052137497ba2227 -MD5 d9cd4ef4822393f846e4e0308f6f6af9 ChangeLog 16224 -RMD160 fcd2d16af3ff50514bc4cb70a834a57b87e6be28 ChangeLog 16224 -SHA256 1a78c6d9e52906ecc1232c74bbf7ede5e6c1d3cd78659fb6c052137497ba2227 ChangeLog 16224 +MISC ChangeLog 16517 RMD160 61f3ebb9e679234547b6ff5a427ddbd01805e8d0 SHA1 3bd5a12be975bd0892ab62738ba08b374aa99a2e SHA256 acea86e86db248f7f502de1460ad3918ef34bb9503235197a6cdefdbe00d8911 +MD5 c74e420d00f9911157bd3b4693620912 ChangeLog 16517 +RMD160 61f3ebb9e679234547b6ff5a427ddbd01805e8d0 ChangeLog 16517 +SHA256 acea86e86db248f7f502de1460ad3918ef34bb9503235197a6cdefdbe00d8911 ChangeLog 16517 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158 -MD5 6be53866d89e1729a1b8e95197a92e12 files/digest-emacs-cvs-22.0.93-r2 247 -RMD160 950a3ffa592585b775efb646394050c72c7020a7 files/digest-emacs-cvs-22.0.93-r2 247 -SHA256 96f31c2909fddc7c78c9ab53a2d31af907624424c22698aee57a8c160c9c93fa files/digest-emacs-cvs-22.0.93-r2 247 MD5 34b424a87f91dcf8730242f4d91851da files/digest-emacs-cvs-22.0.94 247 RMD160 462b502fac8d318d75e8374f32418257a308ee5f files/digest-emacs-cvs-22.0.94 247 SHA256 044b508912544a633cf90752e447bd6719a5f9da3e6aa69cf6400a7d22daa70f files/digest-emacs-cvs-22.0.94 247 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r2 0 -RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r2 0 -SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r2 0 +MD5 d6f599895923b8ba7322cd3778f8cbd6 files/digest-emacs-cvs-22.0.95 247 +RMD160 d862c5cc0a3c1e37d1d191a39b8b27fee97feb83 files/digest-emacs-cvs-22.0.95 247 +SHA256 a2976d3a758f1cd9304edc61dcbec515ccc29f2daafd8918926b2af9ba407ed1 files/digest-emacs-cvs-22.0.95 247 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r3 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r3 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r3 0 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r4 0 +RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r4 0 +SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r4 0 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r1 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r1 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r1 0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFF5HrpNQqtfCuFneMRAnu+AJ9jujQRhmM6k+q1uyUYUG+N0Cmo7wCfbZNG -TUsoNHOT26JZJ0bYr5Mm5KE= -=tCvK +iD8DBQFF5884NQqtfCuFneMRAmyAAJ9Bw2BnOITgO9MES7A+KV3N9AzjeACfZuV9 +UGupTWC6z96ZO7WU6rcc4/k= +=a4AF -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.95.ebuild similarity index 93% rename from app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild rename to app-editors/emacs-cvs/emacs-cvs-22.0.95.ebuild index 1fa906550a26..5bc0437b84b3 100644 --- a/app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.95.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild,v 1.8 2007/02/20 22:21:59 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.95.ebuild,v 1.1 2007/03/02 07:16:59 opfer Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -35,21 +35,28 @@ DEPEND="sys-libs/ncurses PROVIDE="virtual/emacs virtual/editor" -SLOT="22.0.93" +SLOT="22.0.95" LICENSE="GPL-2" KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" S="${WORKDIR}/emacs-${PV}" src_unpack() { unpack ${A} - cd ${S} - epatch "${FILESDIR}/emacs-subdirs-el-gentoo.diff" - use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff" + + cd "${S}" sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \ -e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \ "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings" + if ! use gzip-el; then + # Emacs' build system automatically detects the gzip binary and compresses + # el files. We don't want that so confuse it with a wrong binary name + sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in" + fi + epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" - epatch "${FILESDIR}/emacs-cvs-blessmail-build.patch" + epatch "${FILESDIR}/emacs-subdirs-el-gentoo.diff" + use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff" + eautoreconf } @@ -163,8 +170,6 @@ EOF find ${D} -type f -name \*.el.gz -print0 |xargs -0 gunzip fi dodoc BUGS ChangeLog README - - make_desktop_entry /usr/bin/emacs Emacs /usr/share/emacs/${SLOT}/etc/images/icons/emacs_48.png editors } update-alternatives() { @@ -181,7 +186,7 @@ update-alternatives() { for j in emacs emacsclient etags ctags do - alternatives_auto_makesym "/usr/share/man/man1/$j.1.${suffix}" "/usr/share/man/man1/$j.emacs-*" + alternatives_auto_makesym "/usr/share/man/man1/$j.1${suffix}" "/usr/share/man/man1/$j.emacs-*" done } diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r4.ebuild similarity index 93% rename from app-editors/emacs-cvs/emacs-cvs-22.0.9999-r2.ebuild rename to app-editors/emacs-cvs/emacs-cvs-22.0.9999-r4.ebuild index 5243249c61c7..a714192d0275 100644 --- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r2.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r2.ebuild,v 1.7 2007/02/08 14:03:45 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r4.ebuild,v 1.1 2007/03/02 07:16:59 opfer Exp $ ECVS_AUTH="pserver" ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" @@ -40,20 +40,28 @@ DEPEND="sys-libs/ncurses PROVIDE="virtual/emacs virtual/editor" -SLOT="22.0.93" +SLOT="22.0.95" LICENSE="GPL-2" KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" S="${WORKDIR}/emacs" src_unpack() { cvs_src_unpack - cd ${S} - epatch "${FILESDIR}/emacs-subdirs-el-gentoo.diff" - use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff" + + cd "${S}" sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \ -e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \ "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings" + if ! use gzip-el; then + # Emacs' build system automatically detects the gzip binary and compresses + # el files. We don't want that so confuse it with a wrong binary name + sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in" + fi + epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" + epatch "${FILESDIR}/emacs-subdirs-el-gentoo.diff" + use ppc-macos && epatch "${FILESDIR}/emacs-cvs-21.3.50-nofink.diff" + eautoreconf } @@ -185,7 +193,7 @@ update-alternatives() { for j in emacs emacsclient etags ctags do - alternatives_auto_makesym "/usr/share/man/man1/$j.1.${suffix}" "/usr/share/man/man1/$j.emacs-*" + alternatives_auto_makesym "/usr/share/man/man1/$j.1${suffix}" "/usr/share/man/man1/$j.emacs-*" done } diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.93-r2 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.93-r2 deleted file mode 100644 index f366c32d3a9d..000000000000 --- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.93-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 4e768a1489e514fbb78d1a5f9c512846 emacs-22.0.93.tar.gz 37118034 -RMD160 c70a745662495c68470f2b483f61d68d09e8ed73 emacs-22.0.93.tar.gz 37118034 -SHA256 44dd612b521a47d923c759525b1134bbc571350cae80bdc543c31f30acc7739e emacs-22.0.93.tar.gz 37118034 diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.95 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.95 new file mode 100644 index 000000000000..9f2aeea69b7a --- /dev/null +++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.95 @@ -0,0 +1,3 @@ +MD5 07ae2a749fec6decbdf65ae3673d5546 emacs-22.0.95.tar.gz 37754533 +RMD160 e5aa6001a255538dbc8fb2d548d1b67979f94033 emacs-22.0.95.tar.gz 37754533 +SHA256 5e25e8f221fe18f07feadd831bb482e6cde53c9470713c63f059ff2d3e715b1d emacs-22.0.95.tar.gz 37754533 diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r2 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r4 similarity index 100% rename from app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r2 rename to app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r4 -- 2.26.2