From 6561dace30334bb0fdf79dd53e149a1871a9d3a9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Sun, 6 Nov 2011 18:46:21 +0000 Subject: [PATCH] Remove obsolete code in pkg_preinst(). Package-Manager: portage-2.1.10.32/cvs/Linux x86_64 --- app-editors/emacs-vcs/ChangeLog | 6 +++++- app-editors/emacs-vcs/Manifest | 12 +++++------ .../emacs-vcs/emacs-vcs-24.0.91.ebuild | 18 +++-------------- .../emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild | 20 ++++--------------- 4 files changed, 18 insertions(+), 38 deletions(-) diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 2a658aac4790..457d2b2ec4d2 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/emacs-vcs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.66 2011/11/03 12:49:19 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.67 2011/11/06 18:46:21 ulm Exp $ + + 06 Nov 2011; Ulrich Mueller emacs-vcs-24.0.91.ebuild, + emacs-vcs-24.0.9999-r1.ebuild: + Remove obsolete code in pkg_preinst(). 03 Nov 2011; Ulrich Mueller emacs-vcs-23.3.9999.ebuild, emacs-vcs-24.0.91.ebuild, emacs-vcs-24.0.9999-r1.ebuild: diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest index 6c893ac6d9f2..487356b64938 100644 --- a/app-editors/emacs-vcs/Manifest +++ b/app-editors/emacs-vcs/Manifest @@ -5,14 +5,14 @@ DIST emacs-24.0.90.tar.gz 50961184 RMD160 aa7f7997240f5b9db2979e0ba25ac762f79671 DIST emacs-24.0.91.tar.gz 50973768 RMD160 6479b85929c98f18d7ffeb4d288677ee8d744a72 SHA1 7eda9e9861638cfc328582e27831ece799ba9929 SHA256 1850909dccde9a331b4585bdc3d26a30b90a81a7d2469536fddd6ba61d246bbe EBUILD emacs-vcs-23.3.9999.ebuild 10908 RMD160 a7f4a6432e6a8a951816acd8590a309bb6c5080e SHA1 fc0be729616dba48286cdb60fa88fc9757170757 SHA256 28518fd0986dcaee87d961ad3b996c7dc7d28f93fffbec3275902ae42f7d48aa EBUILD emacs-vcs-24.0.90.ebuild 10938 RMD160 2365702c56ed715def9c2292e28957664445f13d SHA1 6503983bdb8dbfa391f4d5043699cf4224458311 SHA256 1043ef192f565778445d7abfbc511251f5c97914b9e68cefaf6ea2c4b4129f53 -EBUILD emacs-vcs-24.0.91.ebuild 11024 RMD160 ef1dc9878d665946c8f50b35c203952084278d08 SHA1 0d93213759e99a399469e72c16dc3e7916ecce9b SHA256 a6224768cc694cf8000fccf398332f87b3a6c1ae98d2874dc875f2ae3862d929 -EBUILD emacs-vcs-24.0.9999-r1.ebuild 11031 RMD160 6911403c0c305d87181d551cc83aa72b415ec6f8 SHA1 abadf79509ad5d91f37e05fb89463f961c639d9a SHA256 a60ec66f7588e9b62ca60fcf927e0feee5f098822a1b9e4bfc8a1d3b66c8dd0d -MISC ChangeLog 60588 RMD160 835b797159711a01cf8a4a54226ed70351acefef SHA1 4159b57d27072b607fe87d76efbd02e58e724a67 SHA256 fc5285f87a696714f3387ccc93825774732ca33770ee09419340b8664d4ea7dd +EBUILD emacs-vcs-24.0.91.ebuild 10624 RMD160 e16057279741ef65b57c82a0930359b9d354759a SHA1 ebc8d0ef376e4c808615f12b3fffd66d0af15ad1 SHA256 9bc0bac03d6c7557f43be2455274891423fa241fec0695f92a91e986052493c9 +EBUILD emacs-vcs-24.0.9999-r1.ebuild 10630 RMD160 45a53dd2bba49ede4cb3a1033bbd1d9a788af151 SHA1 4c407f87852fec6ebce5587b76e2d8f4678cf93c SHA256 ac77d42a7add721f019fb64d6deb167e73f9117d14120d1d35df80c43eeef1d5 +MISC ChangeLog 60736 RMD160 8b67275364d2b35aa37766ccae199e83dc706ebc SHA1 974b8680da23583e418e0fcacbe7bb7eee312443 SHA256 7f2f921102391a86c26f6a9cfcf6c21864988c722299b9a60a56e8e6939a599c MISC metadata.xml 2314 RMD160 a05bd6bb9637e92af9e2500a11dfdb1801ff5a4d SHA1 ec99de5f7aacbfdb0cf05701bf18ca4b259b88d8 SHA256 859f11b55f66c850fdaf9fa7dd69412f8f247def16168fbddb5de7501a4d2996 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6yj80ACgkQOeoy/oIi7uzguwCeP1ZNz4+FNJ1yZ6VtyNVZBBD9 -MfIAoKsWd/aYTn1Kk/HJ01GfA5Kxn+Qj -=iFZ0 +iEYEARECAAYFAk622AEACgkQOeoy/oIi7uzlKQCfUTB962DDpvHmk9Su8lPWsVGH +8JwAnj/JS6mSZ9je0ZUuxAznVPNy/Gzc +=hBNg -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild index d542568d8717..87787703b3d9 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild,v 1.2 2011/11/03 12:49:19 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild,v 1.3 2011/11/06 18:46:21 ulm Exp $ EAPI=4 @@ -295,20 +295,8 @@ src_install () { pkg_preinst() { # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [[ -f ${ED}${infodir}/dir.orig ]]; then - mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" - else - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${ED}"${infodir}/dir{,.*} - for f in "${ED}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${ED}"${infodir} "${f}" \ - || die "install-info failed" - fi - done - fi + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \ + || die "moving info dir failed" } pkg_postinst() { diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild index 55b8d6ab5ae7..688f28016b87 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild,v 1.19 2011/11/03 12:49:19 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild,v 1.20 2011/11/06 18:46:21 ulm Exp $ EAPI=4 @@ -266,7 +266,7 @@ src_install () { # C source you might find via find-function doins src/*.{c,h,m} doins -r src/{m,s} - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README* + rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README c="" fi @@ -295,20 +295,8 @@ src_install () { pkg_preinst() { # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [[ -f ${ED}${infodir}/dir.orig ]]; then - mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" - else - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${ED}"${infodir}/dir{,.*} - for f in "${ED}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${ED}"${infodir} "${f}" \ - || die "install-info failed" - fi - done - fi + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \ + || die "moving info dir failed" } pkg_postinst() { -- 2.26.2