diff options
| -rw-r--r-- | app-editors/emacs-cvs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/Manifest | 30 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild | 9 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild | 25 | ||||
| -rw-r--r-- | app-editors/emacs/Manifest | 22 |
5 files changed, 56 insertions, 37 deletions
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index e256014de035..ed8100fe5e6f 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/emacs-cvs # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.144 2007/07/30 23:08:32 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.145 2007/08/21 22:53:25 ulm Exp $ + + 21 Aug 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50.ebuild, + emacs-cvs-23.0.0-r6.ebuild: + Check for change of upstream version number. Sync suffix handling. Generate + score files in pkg_postinst. 30 Jul 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.0-r6.ebuild: Update licence info to GPL-3. diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest index a0c6a299801a..530869d4377a 100644 --- a/app-editors/emacs-cvs/Manifest +++ b/app-editors/emacs-cvs/Manifest @@ -9,18 +9,18 @@ AUX emacs-cvs-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c MD5 33cdd958f1be433095a69bff6be18148 files/emacs-cvs-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 files/emacs-cvs-freebsd-sparc.patch 475 SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b files/emacs-cvs-freebsd-sparc.patch 475 -EBUILD emacs-cvs-22.1.50.ebuild 7527 RMD160 70ab01e268ff9cf5f32178ebc3d86a7fafe922a8 SHA1 233dfdfeb437fe2ae7348bc839a242e4049522cb SHA256 f3e36383f665a6104f1c47af99eadb07bbd91bcadb9adcf631b18da8acd61a95 -MD5 439f947aa0f3a9676a97d6487b57b9fb emacs-cvs-22.1.50.ebuild 7527 -RMD160 70ab01e268ff9cf5f32178ebc3d86a7fafe922a8 emacs-cvs-22.1.50.ebuild 7527 -SHA256 f3e36383f665a6104f1c47af99eadb07bbd91bcadb9adcf631b18da8acd61a95 emacs-cvs-22.1.50.ebuild 7527 -EBUILD emacs-cvs-23.0.0-r6.ebuild 7692 RMD160 95e3d4a22d6dd1c8cefcfb6dcd4eb0dd71bef2b7 SHA1 688c0804c6e1aeadef24dbe30f42c32814735a8d SHA256 49b67c55e5651ba041d8927552a3046647aceafa0d7bc578a0887eb424666f68 -MD5 f846d8e59a32e0b1e543bc502d4cd859 emacs-cvs-23.0.0-r6.ebuild 7692 -RMD160 95e3d4a22d6dd1c8cefcfb6dcd4eb0dd71bef2b7 emacs-cvs-23.0.0-r6.ebuild 7692 -SHA256 49b67c55e5651ba041d8927552a3046647aceafa0d7bc578a0887eb424666f68 emacs-cvs-23.0.0-r6.ebuild 7692 -MISC ChangeLog 27342 RMD160 98124a2cc59884ed5d9aaf69b3fa652c3937627a SHA1 ee649f819a4cec3db647402445111c7cd8f1b979 SHA256 d65400157981600e7b442be71184353b8fb5d06691c049260faf8e548a3e085f -MD5 95ad25a29fb9a4d5fe069ec187d5681b ChangeLog 27342 -RMD160 98124a2cc59884ed5d9aaf69b3fa652c3937627a ChangeLog 27342 -SHA256 d65400157981600e7b442be71184353b8fb5d06691c049260faf8e548a3e085f ChangeLog 27342 +EBUILD emacs-cvs-22.1.50.ebuild 7651 RMD160 cc1d60400454e24dc32d21f724b4ee247f72247e SHA1 bbb2fae43cd44258eac0abbd6c48cce72a782403 SHA256 d94ec969343ec950268c99e8203ad39da416341ef473c190ed21d3e9709732ae +MD5 d8a4b2bdec5fdb2e0cc2977a3fd2c2d9 emacs-cvs-22.1.50.ebuild 7651 +RMD160 cc1d60400454e24dc32d21f724b4ee247f72247e emacs-cvs-22.1.50.ebuild 7651 +SHA256 d94ec969343ec950268c99e8203ad39da416341ef473c190ed21d3e9709732ae emacs-cvs-22.1.50.ebuild 7651 +EBUILD emacs-cvs-23.0.0-r6.ebuild 7942 RMD160 cef5027b4fddf5427172025f79f0dcebad889fed SHA1 cfc7342e5915a1dd0428946814ac0480ac23c9ee SHA256 3910462a6487887ae1ce464eee1f0645bd6038851d999f747be15282d2657286 +MD5 8d89595f8a08a02ffa976a36e00714fb emacs-cvs-23.0.0-r6.ebuild 7942 +RMD160 cef5027b4fddf5427172025f79f0dcebad889fed emacs-cvs-23.0.0-r6.ebuild 7942 +SHA256 3910462a6487887ae1ce464eee1f0645bd6038851d999f747be15282d2657286 emacs-cvs-23.0.0-r6.ebuild 7942 +MISC ChangeLog 27555 RMD160 6fce3b90ae47e009ae63abbdf94ba651e513f20f SHA1 7ece56ca55bc636e75f0fb2a4dd8e53f8fe55157 SHA256 dd8a82d26c2e4b40cba4ec3c02f0e2ad4fe434bcc0a4b2061e423b30ab9c93d3 +MD5 d7ffe11102a948d04a36f916960c5ddf ChangeLog 27555 +RMD160 6fce3b90ae47e009ae63abbdf94ba651e513f20f ChangeLog 27555 +SHA256 dd8a82d26c2e4b40cba4ec3c02f0e2ad4fe434bcc0a4b2061e423b30ab9c93d3 ChangeLog 27555 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158 @@ -34,7 +34,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) -iD8DBQFGrm9xOeoy/oIi7uwRAlBBAKC6VwycNGshahKSVSjZxs13UNqzKgCgl3Kw -sbPQzI6WdSfyhNU6e8kHNRE= -=mFWP +iD8DBQFGy2zvOeoy/oIi7uwRAvVyAKDIBX3z+3mPXkicR2yurM1uiicWdQCgwNcN +mSztkhFuawnch8CyW2ofrrc= +=AZFk -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild index 4a56d4a8133f..657266d442bc 100644 --- a/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-22.1.50.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.1.50.ebuild,v 1.22 2007/07/25 05:59:30 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild,v 1.23 2007/08/21 22:53:25 ulm Exp $ ECVS_AUTH="pserver" ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" @@ -69,7 +69,7 @@ src_unpack() { | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/') [ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version" echo - einfo "Emacs CVS trunk" + einfo "Emacs CVS branch: ${ECVS_BRANCH}" einfo "Emacs version number: ${FULL_VERSION}" [ "${FULL_VERSION}" = ${PV} ] \ || die "Upstream version number changed to ${FULL_VERSION}" @@ -216,6 +216,11 @@ pkg_postinst() { test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el || cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el + local f + for f in ${ROOT}/var/lib/games/emacs/{snake,tetris}-scores; do + test -e ${f} || touch ${f} + done + elisp-site-regen emacs-infodir-rebuild eselect emacs update --if-unset diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild index 96e007da8697..1b0dcd45da43 100644 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.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-23.0.0-r6.ebuild,v 1.28 2007/07/30 23:08:32 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.29 2007/08/21 22:53:25 ulm Exp $ ECVS_AUTH="pserver" ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" @@ -57,6 +57,8 @@ PROVIDE="virtual/editor" S="${WORKDIR}/${ECVS_LOCALNAME}" +EMACS_SUFFIX="emacs-${SLOT}" + src_unpack() { cvs_src_unpack @@ -70,6 +72,8 @@ src_unpack() { echo einfo "Emacs CVS branch: ${ECVS_BRANCH}" einfo "Emacs version number: ${FULL_VERSION}" + [ "${FULL_VERSION}" = ${PV} ] \ + || die "Upstream version number changed to ${FULL_VERSION}" echo sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \ @@ -149,8 +153,8 @@ src_compile() { myconf="${myconf} $(use_with gpm)" econf \ - --program-suffix=-emacs-${SLOT} \ - --infodir=/usr/share/info/emacs-${SLOT} \ + --program-suffix=-${EMACS_SUFFIX} \ + --infodir=/usr/share/info/${EMACS_SUFFIX} \ --without-carbon \ ${myconf} || die "econf emacs failed" @@ -160,21 +164,21 @@ src_compile() { src_install () { emake install DESTDIR="${D}" || die "make install failed" - rm "${D}"/usr/bin/emacs-${FULL_VERSION}-emacs-${SLOT} \ + rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ || die "removing duplicate emacs executable failed" - mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \ + mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \ || die "moving Emacs executable failed" # move info documentation to the correct place einfo "Fixing info documentation ..." - for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do + for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do mv ${i} ${i}.info || die "mv info failed" done # move man pages to the correct place einfo "Fixing manpages ..." for m in "${D}"/usr/share/man/man1/* ; do - mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv man failed" + mv ${m} ${m%.1}-${EMACS_SUFFIX}.1 || die "mv man failed" done # avoid collision between slots, see bug #169033 e.g. @@ -203,7 +207,7 @@ emacs-infodir-rebuild() { # or removed. It is only rebuilt by Portage if our directory is in # INFOPATH, which is not guaranteed. So we rebuild it ourselves. - local infodir=/usr/share/info/emacs-${SLOT} f + local infodir=/usr/share/info/${EMACS_SUFFIX} f einfo "Regenerating Info directory index in ${infodir} ..." rm -f ${ROOT}${infodir}/dir{,.*} for f in ${ROOT}${infodir}/*.info*; do @@ -217,6 +221,11 @@ pkg_postinst() { test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el || cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el + local f + for f in ${ROOT}/var/lib/games/emacs/{snake,tetris}-scores; do + test -e ${f} || touch ${f} + done + elisp-site-regen emacs-infodir-rebuild eselect emacs update --if-unset diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 34734ba4c45f..8edebd7c85e1 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -52,14 +52,14 @@ EBUILD emacs-21.4-r8.ebuild 5745 RMD160 31111ab0a092a969250bc4ec87b8ee9e3d7dc088 MD5 9c13d7443ba1e4b6bc6d5c1de60ad87a emacs-21.4-r8.ebuild 5745 RMD160 31111ab0a092a969250bc4ec87b8ee9e3d7dc088 emacs-21.4-r8.ebuild 5745 SHA256 3a1aa4b2031d3de45105c2082cd32130404731444493fe2cd47b0c8e9ef31a70 emacs-21.4-r8.ebuild 5745 -EBUILD emacs-22.1.ebuild 7245 RMD160 3aaf13665152aa188e75bbe1092438780bcfab3e SHA1 2562dc5f9535099ddbf6c7c4c3125a4a3db8ed8b SHA256 123e5b0ce781b6ff7d56593bb152c40ed3fb066a2563383d7221e602cdfa50e6 -MD5 2adb797bc23f916b56a068f998d09f7d emacs-22.1.ebuild 7245 -RMD160 3aaf13665152aa188e75bbe1092438780bcfab3e emacs-22.1.ebuild 7245 -SHA256 123e5b0ce781b6ff7d56593bb152c40ed3fb066a2563383d7221e602cdfa50e6 emacs-22.1.ebuild 7245 -MISC ChangeLog 25830 RMD160 8fd8d26a4459a3005cfb7cb6e84e8bfddea36c1d SHA1 380ef954f28907b535901af12935e0ed44767303 SHA256 73f1aea590b68ec84aaba31fddac4191400133a16520fc27e3cb0ea036676b06 -MD5 46fd6e145fed76fe932d9825244ca3b3 ChangeLog 25830 -RMD160 8fd8d26a4459a3005cfb7cb6e84e8bfddea36c1d ChangeLog 25830 -SHA256 73f1aea590b68ec84aaba31fddac4191400133a16520fc27e3cb0ea036676b06 ChangeLog 25830 +EBUILD emacs-22.1.ebuild 7354 RMD160 031695fbbc7c686f6d705a51c18bfb147abcca02 SHA1 eeb6e87b9db5bc8e66df0ce0da80591c23138cc5 SHA256 57ebc66410dc6e8a53ce6867ee6c8bc7f2d36d71fec37619c18608c388cebe8b +MD5 3a0239ef3d2b9ae089476d8f2f141331 emacs-22.1.ebuild 7354 +RMD160 031695fbbc7c686f6d705a51c18bfb147abcca02 emacs-22.1.ebuild 7354 +SHA256 57ebc66410dc6e8a53ce6867ee6c8bc7f2d36d71fec37619c18608c388cebe8b emacs-22.1.ebuild 7354 +MISC ChangeLog 25937 RMD160 869cd1140d0784f7e85faff9768b55ba7c5d80b5 SHA1 42e374b4b4086435c256c0e836e0ad6927561e1e SHA256 1e3037875b8a11ace6b7fbe6b9ddf6c992a2189153f8f7b1ff822b92f36a00b1 +MD5 b4631aec29a37a022609afc3cbbdfb4a ChangeLog 25937 +RMD160 869cd1140d0784f7e85faff9768b55ba7c5d80b5 ChangeLog 25937 +SHA256 1e3037875b8a11ace6b7fbe6b9ddf6c992a2189153f8f7b1ff822b92f36a00b1 ChangeLog 25937 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158 @@ -82,7 +82,7 @@ SHA256 fade317ca7642c607422c8f3a829728969542fe5996e6ec5015fdea0bccf64e4 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) -iD8DBQFGh9HPOeoy/oIi7uwRAq4pAJ0T2jCskLFm6ivet8UJD/zz6wYURQCeLEE3 -3Ef8oym/v+KLq3fDFYsmtaY= -=RgB3 +iD8DBQFGy23uOeoy/oIi7uwRAlO1AJ4ymH7Tn/MuZlHq74NPdt3bsE+AowCfZAwx +pQM5mZoPqZzk6SP3Yoh4v9Q= +=gFrL -----END PGP SIGNATURE----- |