diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2012-10-07 10:27:18 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2012-10-07 10:27:18 +0000 |
| commit | 540d65426bbb7f4d2e06af481f7967f64de375dd (patch) | |
| tree | 3f86b428f662a5222ba04263376efd012605caf9 /app-editors | |
| parent | Fix building with gcc-4.7 wrt #424888 by Diego Elio Pettenò <flameeyes@gento... (diff) | |
| download | historical-540d65426bbb7f4d2e06af481f7967f64de375dd.tar.gz historical-540d65426bbb7f4d2e06af481f7967f64de375dd.tar.bz2 historical-540d65426bbb7f4d2e06af481f7967f64de375dd.zip | |
Passing CC to emake seems no longer necessary. Use --program-transform-name config option instead of moving the executable.
Package-Manager: portage-2.1.11.24/cvs/Linux x86_64
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/Manifest | 30 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild | 15 |
3 files changed, 24 insertions, 27 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index cf8b7bdf589a..29b83760e0ec 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-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.116 2012/09/25 19:13:17 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.117 2012/10/07 10:27:18 ulm Exp $ + + 02 Oct 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild: + Passing CC to emake seems no longer necessary. Use --program-transform-name + config option instead of moving the executable. 25 Sep 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild: Specify LICENSE more precisely, "as-is" is really HPND. diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest index ba4197fdd4dc..b0c4124ccab4 100644 --- a/app-editors/emacs-vcs/Manifest +++ b/app-editors/emacs-vcs/Manifest @@ -2,23 +2,23 @@ Hash: SHA256 AUX emacs-24.0.92-ns-appdirs.patch 1538 SHA256 588b276284c7a56494fdba935a975c66edb668e5431bf25f1396696950c8f804 SHA512 141d6f2a0df176eafd476b1b064586ac1d32d2b920fd3e65a7bdd9ad6335d3c148761238da07329795477c7aebab2db3b685c3466ddbe6c0d297654949bb8364 WHIRLPOOL daf3baf1d88c2399435b340c178888a126ae4ed1e9ffa87575b14977f215f3cb07b109e0c1fe13ccdd5cf9b1d63b7ebd1237586fef7393c0bc279cf9a6196459 -EBUILD emacs-vcs-24.2.9999.ebuild 10896 SHA256 5076b507fbd944b13c8dc7803483697e01080d023c130463c44b2b1131fe4804 SHA512 9d7e68a6ff046d9a39873e89d813b4929971c2e72c9e4e7130335126f8718ab4de0b961b8e42f6a21b50477b8b0130ffe6e4a57188ab644d1babab93d829ee6c WHIRLPOOL ad16412b1d5a989e8694e019f061283862fd503563fe0a27073de0755bd0884456bfab7a9e4f6d3c0bc69d8e7cae5a296e76f201fcb335b5fa981b90415f0382 -MISC ChangeLog 69755 SHA256 c83801ee9444bc1b8666137da9849d902d441cad0fa1092a30bb0a4cb95ac467 SHA512 d00741bb28e2fab82f149dcac9786ced2cbb7699a4f836fa6d398697775114fb9ce0adec2f865de49e9e677e9978a91a536661152ce9c031961b6ff4f5efcea2 WHIRLPOOL 3c7a548c29c570cab5b06ea5d22793866bae6f518374af36260348d442ea1ca35fc4ba4639d6583e17ebe898b77c63299f3113ca401f43cbdc085aa41fd4de7e +EBUILD emacs-vcs-24.2.9999.ebuild 10664 SHA256 48e0d9f447433490e0c0bbcb55bf1127655f011ee860d97551fe525c603ae227 SHA512 ec91cd6edf1d292591ee107d8356e8fa335cf3a836a71f5ceb5105c43123300cd6776ee2772fbc97b716500728dc96b7274614254338d5e00cc33290f7331497 WHIRLPOOL 7b31d8551a81e0d40707bb3987398c7cf3878c15d07324b70d3ba1cf7a0f03885177a4c24a0d4e735f80b4dabe5d9f01da5823332a2f13daec79a30bac200e2b +MISC ChangeLog 69959 SHA256 8af953e9a5406c48b2a71e3f4112a1e9c9b8e7531cbff8853111fb872ce5b0da SHA512 13def31c79f9e4afbabb0928f273c4d39fb412bf7ed537c912055ab2e13afcefb7bd78a9c2e57e30f8da26f2e7f59ae6a1f76fe404dbb9ab2d6a7ab56bf25eb8 WHIRLPOOL aed131129afa5d5fd7781d7d9645cbea9f4658b31ef40f8f722ecc1396f2741af9029f949edfb8244b3ddd6fefd1aac78252bdb670441b55af06ed6151c1064b MISC metadata.xml 2431 SHA256 f5b0a24ab6e525de4d80cffb7a635260e47c88552e7c2b3fe694b76b130d36f1 SHA512 9345b4871208b2cdc7b1ef4d1981cad54aae6da91ba3fe2aa482df8a242b87d7d1c1288f132ed70ef2cab0372418275a50754c7249bb06adc7f5a17403a40fe7 WHIRLPOOL 73f2ce2c94b5e0b83cd1d06ce975b83004d54f51d573f3330450d60c2e7c5220c4bf92ca0af403a322ed9a67806b3cb11190f81f93e135bf1f8e0d8dee0cf220 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJQYgRqAAoJEDxpGckxwJCBS2QP/3CWbE4kiJszUivlNdYuJf2n -mpY4N2fbvsmuqxuOhQ/aG3nNcaspC8duT5bzyVb5cWYEuR+4DvVxPsrSn286kWL1 -LDy8Dr561QHz1erOJ1h4x/5wF/V9OLW+P5e2gyy21IlehbGmEQkhTX97OJGWxx64 -32IDSVccGUl6cvYZe6QmPr2sk4hRkzL+xKDjeUpJ4jghuFt1ND7vZtBfMqSl72PY -+inKr0LvpUDPyq/n1zJHQBX54HLCjeP6pn/fkrmZfbMclJRz8avRRFCEcXz/pBS0 -j2H6ART7sns7yI6fp4xSBVQGq3X4pM4QSLsrsnKm7Rd+6O/ABnQWgIQApmnktPHt -hyKnlahJO13ZxhUH0PhEOIbvgDzMrvqrE7ErtFjVf09kZA4/4C33XGFmtOPFsPY6 -MhhJW8aWcBRIuLGk8z5nik+OOLu9Tn7Y/yONtrNpz0c+344rwl1ct3oDJRyxg8JO -/cW7KF2TgUHX+E+CGuH0JZ4SK+uwIYCfQBo3yTD0p2zPvketrPFVLQWV/5oh97G+ -RPlNqEU0DCwBB2g9SWJvUkN+g3B7mFFW34CdOi9Sejr0RhKqxUjGDmUmFLRh099X -RFQDKu2cQgAT+LtlztqF0DKv5RLSmDXckBqk1146EznKarnjHi+owUNPsG1bg9B3 -5EsPI28MKClNTchBD8gk -=2YhR +iQIcBAEBCAAGBQJQcVs1AAoJEDxpGckxwJCB7/0P/3w//MNwGkm0jps0s0TBnlTh +UKMi8wxORA82u74VahIQVjzJhOrQRMBFWS+EIuwIEyExCsISQSxzQlY2nf/mGZoX +4LBw9vKexQIpzjCh2HV+6VaeAnFZTSvjP7sQoUM/lEijR0ikO3+hn+UeSBRVohsz +zz68MVLFGjV8CVr4Bk8bdsQpgsN1RbSPnFfrOn/cZSXkgmIrqKr+jqMMznvIxsRe +ukdGQD3+a3K6Sd3TpeDhwwWk1gA61Sfbq/52WDYkmm8dV90XM8UHHK7oe14JMtxI +Fnq0A02tW1k9qEcaXAdSQN18iOObD2LhJpt5TgiClj5hAvh4D8ovdm9yY3p+ByGO +A4dSO+D4hAZ2wPb+Uq4MfZpztcuH8Xe/Qpz/6VIXIPwQ7mvFyxrtGyZKkuWa4csK +OWK2C9Fb92BLMu5ayntWK/1SF876clTTTtNhMLItyZU1owQC4tZCWg55VscpHX5u +gnIgT/ch+cS9sYjb7WEA6Mb34M+T0yN/nd/6s4+sMrbf9sNCkm5lJMn8UC5x6vAc +c6LuZ7xx/ktG1oH5r/x8hCPcvmvTg2QhJZTP3WVlzkTGmQ9BievWGAd7W9jIVY4i +1yxZ1sHWnd4oqvH4xz52MYkN2AWifKpNG+BBInhC1pfBNmV1Iob8IA0+XCwanqnL +kUhtSkZzA5fJCZZfy5af +=skMn -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild index b2247d7f6678..10355d5b1011 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.2.9999.ebuild,v 1.7 2012/09/25 19:13:17 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.8 2012/10/07 10:27:18 ulm Exp $ EAPI=4 @@ -205,6 +205,7 @@ src_configure() { econf \ --program-suffix=-${EMACS_SUFFIX} \ + --program-transform-name="s/emacs-[0-9].*/${EMACS_SUFFIX}/" \ --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ --with-crt-dir="${crtdir}" \ @@ -223,19 +224,11 @@ src_configure() { src_compile() { export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 - #if [[ ${PV##*.} = 9999 ]]; then - # emake CC="$(tc-getCC)" bootstrap - # # cleanup, otherwise emacs will be dumped again in src_install - # (cd src; emake versionclean) - #fi - emake CC="$(tc-getCC)" + emake } src_install () { - emake install DESTDIR="${D}" NO_BIN_LINK=t - - mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ - || die "Moving emacs executable failed" + emake DESTDIR="${D}" NO_BIN_LINK=t install # move man pages to the correct place local m |