diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2011-09-02 19:34:01 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2011-09-02 19:34:01 +0000 |
| commit | fc42f368b569a4b31db991d2416b91f740db1b74 (patch) | |
| tree | 0432efb834a645c920c3913d7082c464f6110603 | |
| parent | Remove outdated warning. (diff) | |
| download | emacs-fc42f368b569a4b31db991d2416b91f740db1b74.tar.gz emacs-fc42f368b569a4b31db991d2416b91f740db1b74.tar.bz2 emacs-fc42f368b569a4b31db991d2416b91f740db1b74.zip | |
Port some changes from 24 to 23 ebuild.
svn path=/emacs-overlay/; revision=1687
| -rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 2 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/Manifest | 10 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild | 10 |
3 files changed, 12 insertions, 10 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index d9a6adb..d90d09d 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -4,7 +4,7 @@ 02 Sep 2011; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild, emacs-vcs-24.0.9999-r1.ebuild: - Remove outdated warning. + Remove outdated warning. Port some changes from 24 to 23 ebuild. 19 Aug 2011; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild, emacs-vcs-24.0.9999-r1.ebuild: diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest index 8fbd8fb..7a12feb 100644 --- a/app-editors/emacs-vcs/Manifest +++ b/app-editors/emacs-vcs/Manifest @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -EBUILD emacs-vcs-23.3.9999.ebuild 10637 RMD160 ddc6f5710126cbba2cb35910a0673453c12cd6c1 SHA1 32a7e336cda6dc2e980f0e13d81d82f6b900c056 SHA256 04cdc414b68174e7d39f48939ee4243985e91fc1c90fe2ad5a3feab8e57ba557 +EBUILD emacs-vcs-23.3.9999.ebuild 10735 RMD160 550e734d01f40585f765ccd5ef02a24c5a744851 SHA1 36fc9423db328e0925a0161dec650c8fe960343e SHA256 9abf96e98c103d2a4c4064b9e76bd1fc7cfa5d60ec25a46431d26fed3fb8bfa3 EBUILD emacs-vcs-24.0.9999-r1.ebuild 10971 RMD160 a735bba6a8135d611b7f31de8a4a5d789b89d054 SHA1 031cfbdc831651d0d0b8ce1634d708bd9fb950ad SHA256 87f51ac36f38b61ce65afd23b2056dbd7755adfb6180c144b54e9349d7d28387 -MISC ChangeLog 4027 RMD160 3e633b7ccfc1d585b60b5e9399288129c30f68ca SHA1 d9be21130af952394fb4cfa8ddef0842469f9c40 SHA256 e446372365866860d973c61f2d7ecf5d4f5222d2f307234e4d2c2b27c3a9bd0d +MISC ChangeLog 4067 RMD160 b1a8cdcb106332b0a4991e236dd0294ca76dd556 SHA1 ec89c921a8dd43fec08a8faea63772f327f2cc92 SHA256 4c1131fdf8e7605aab35e9f3adad59b657d994dad0ef43dc0d5e4cdf34c3e716 MISC metadata.xml 2106 RMD160 be033c20ddf8d50f045e59552c1cccd3ce829149 SHA1 7e92f2fc679fade0f4b3a4c3d587a6ec8757437d SHA256 ae9bc43d98770006a0792f92b173911e1357135f82f33156f121206f51948e65 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5hCTYACgkQOeoy/oIi7uyjIACdHEyH7l+awEynbs0i2z/2rM+g -nhUAoM7XcxX/nMhBLMRADVqhkeSSlHzl -=01WI +iEYEARECAAYFAk5hMP0ACgkQOeoy/oIi7uwsFwCgt0LeJF4j3bQijuPaaYD2Nv/v +w64An0fiM2dn04mq88tVmTjWEm/n4gEq +=kWYi -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild index 8f3e31e..12de8e4 100644 --- a/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild @@ -147,15 +147,16 @@ src_configure() { myconf="${myconf} $(use_with gif) $(use_with jpeg)" myconf="${myconf} $(use_with png) $(use_with svg rsvg)" myconf="${myconf} $(use_with tiff) $(use_with xpm)" - myconf="${myconf} $(use_with xft)" if use xft; then + myconf="${myconf} --with-xft" myconf="${myconf} $(use_with m17n-lib libotf)" myconf="${myconf} $(use_with m17n-lib m17n-flt)" else + myconf="${myconf} --without-xft" myconf="${myconf} --without-libotf --without-m17n-flt" use m17n-lib && ewarn \ - "USE flag \"m17n-lib\" has no effect because xft is not set." + "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." fi # GTK+ is the default toolkit if USE=gtk is chosen with other @@ -166,7 +167,7 @@ src_configure() { myconf="${myconf} --with-x-toolkit=gtk" elif use Xaw3d; then einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit" - myconf="${myconf} --with-x-toolkit=athena" + myconf="${myconf} --with-x-toolkit=lucid" elif use motif; then einfo "Configuring to build with Motif toolkit" myconf="${myconf} --with-x-toolkit=motif" @@ -204,6 +205,7 @@ src_configure() { --program-suffix=-${EMACS_SUFFIX} \ --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ --with-crt-dir="${crtdir}" \ + --with-gameuser="${GAMES_USER_DED:-games}" \ $(use_with hesiod) \ $(use_with kerberos) $(use_with kerberos kerberos5) \ $(use_with gpm) \ @@ -305,7 +307,7 @@ pkg_postinst() { for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do [ -e "${f}" ] || touch "${f}" done - chown games "${EROOT}"/var/lib/games/emacs + chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs elisp-site-regen eselect emacs update ifunset |