diff options
| -rw-r--r-- | app-editors/elvis/ChangeLog | 9 | ||||
| -rw-r--r-- | app-editors/elvis/Manifest | 29 | ||||
| -rw-r--r-- | app-editors/elvis/elvis-2.2.0-r3.ebuild | 91 | ||||
| -rw-r--r-- | app-editors/elvis/files/digest-elvis-2.2.0-r3 | 3 | ||||
| -rw-r--r-- | app-editors/elvis/files/ft2.3-symbol-collision-fix.patch | 73 |
5 files changed, 190 insertions, 15 deletions
diff --git a/app-editors/elvis/ChangeLog b/app-editors/elvis/ChangeLog index 59bcaae49a92..82410147e4e2 100644 --- a/app-editors/elvis/ChangeLog +++ b/app-editors/elvis/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-editors/elvis # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.32 2007/07/22 08:42:58 omp Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.33 2007/09/21 21:24:30 hawking Exp $ + +*elvis-2.2.0-r3 (21 Sep 2007) + + 21 Sep 2007; Ali Polatel <hawking@gentoo.org> + +files/ft2.3-symbol-collision-fix.patch, +elvis-2.2.0-r3.ebuild: + revbump. add patch to fix symbol collision between elvis and freetype. + bug 189271, thanks to Gordon Malm. 22 Jul 2007; David Shakaryan <omp@gentoo.org> elvis-2.2.0-r1.ebuild, elvis-2.2.0-r2.ebuild: diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest index 2b166ddf5529..b3ab9f65f6a0 100644 --- a/app-editors/elvis/Manifest +++ b/app-editors/elvis/Manifest @@ -1,6 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX ft2.3-symbol-collision-fix.patch 2396 RMD160 c80ec1c5e7a15e2dea185e2d0d83da5fccd39b1b SHA1 3957feb87b9d8fe0a3a58ec8715d0c328545c086 SHA256 59960b0498863f0793b5c33a824efc62c6255d26455d3ec6c87f62cb1969f008 +MD5 20afda897841eead2cda535d8cccbe32 files/ft2.3-symbol-collision-fix.patch 2396 +RMD160 c80ec1c5e7a15e2dea185e2d0d83da5fccd39b1b files/ft2.3-symbol-collision-fix.patch 2396 +SHA256 59960b0498863f0793b5c33a824efc62c6255d26455d3ec6c87f62cb1969f008 files/ft2.3-symbol-collision-fix.patch 2396 DIST elvis-2.2_0.tar.gz 1439293 RMD160 9867a3941a84a3db0bcfe4e36dd14132fbcf5805 SHA1 8c16574b6d36529735b8ced70972ddaf6275a477 SHA256 9a8466b2293798441056bc279736af3a616baaba2f11940396cc60ff71924ea0 EBUILD elvis-2.2.0-r1.ebuild 1902 RMD160 018b47107ec0ebcba622c9c15cd48ff8b5149d79 SHA1 97199dec8728b57702304350d4302be3a968066b SHA256 78b7ddb1e0fd8b6a7e08b5dc3ea8e53851b9f4173dc998c8855b12d74ba99231 MD5 205de09de80499d33f599dd7f5b8f5da elvis-2.2.0-r1.ebuild 1902 @@ -10,10 +11,14 @@ EBUILD elvis-2.2.0-r2.ebuild 2149 RMD160 5b36e1d83e656d27887ff613f3868dbfee5f0f4 MD5 b2cf77f6194d890fc4c40f3bc80135c1 elvis-2.2.0-r2.ebuild 2149 RMD160 5b36e1d83e656d27887ff613f3868dbfee5f0f46 elvis-2.2.0-r2.ebuild 2149 SHA256 23a2476d8fda2f15061a058111f458c56cd3c8d0e1ef7ffaef45cd39161e8edb elvis-2.2.0-r2.ebuild 2149 -MISC ChangeLog 3623 RMD160 6432dcbeaaac54981f5748e63acfaf8c1099186d SHA1 2e82228c7c441aac9e51e94746bb94477ccbaf83 SHA256 a71bbf957f86560523ce9b12a1160935b2af5bfd6243ae613f2c18099bf15661 -MD5 3bcdd9b92a9d05470ffa823abf31e15b ChangeLog 3623 -RMD160 6432dcbeaaac54981f5748e63acfaf8c1099186d ChangeLog 3623 -SHA256 a71bbf957f86560523ce9b12a1160935b2af5bfd6243ae613f2c18099bf15661 ChangeLog 3623 +EBUILD elvis-2.2.0-r3.ebuild 2252 RMD160 74c1877fa473fb88b90ef1b555930dbcd5317d16 SHA1 0013a16796040f8b55f9e04368d6bb275c532b33 SHA256 cfb8ffb9cec7805615cc055b0ff422994038d03e1027cf8aeac273be7e361ae7 +MD5 c86dbb484047321d164cd0c92de7e468 elvis-2.2.0-r3.ebuild 2252 +RMD160 74c1877fa473fb88b90ef1b555930dbcd5317d16 elvis-2.2.0-r3.ebuild 2252 +SHA256 cfb8ffb9cec7805615cc055b0ff422994038d03e1027cf8aeac273be7e361ae7 elvis-2.2.0-r3.ebuild 2252 +MISC ChangeLog 3884 RMD160 8cad59f935135a564f6d5da2b9b708ed738a30a6 SHA1 d98f7105a91a1f72fca5b35777b46797d844e2f3 SHA256 3796e9d125fa935f6141fa9cd5ee3014983fc20d2517978de85e4f6f0a8a16c7 +MD5 06af9ffd3960d6e9e0708e74da7370b0 ChangeLog 3884 +RMD160 8cad59f935135a564f6d5da2b9b708ed738a30a6 ChangeLog 3884 +SHA256 3796e9d125fa935f6141fa9cd5ee3014983fc20d2517978de85e4f6f0a8a16c7 ChangeLog 3884 MISC metadata.xml 156 RMD160 3e105a159e09ab3231aaa16b01919bcfbf58a0a8 SHA1 fe63ba71f6fd04f1e293fb238af2eba994b0335d SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156 RMD160 3e105a159e09ab3231aaa16b01919bcfbf58a0a8 metadata.xml 156 @@ -24,10 +29,6 @@ SHA256 3fabe072b56fb0456317219876619e7b16dfe7358fecf4661033603d923ba55e files/di MD5 8aa501c191936cb24f0bdc10b843de5b files/digest-elvis-2.2.0-r2 238 RMD160 0d484b3a40ab5b0f24140528dbd58bb5248f6b75 files/digest-elvis-2.2.0-r2 238 SHA256 3fabe072b56fb0456317219876619e7b16dfe7358fecf4661033603d923ba55e files/digest-elvis-2.2.0-r2 238 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.5 (GNU/Linux) - -iD8DBQFGoxiQvSApE0uP4UsRAliYAJsEh08Hsm+32dUwaHh7HoSpTuxsaACgiz6g -dBpqVi1AMSJGXOzpi6WqZCM= -=p/2K ------END PGP SIGNATURE----- +MD5 8aa501c191936cb24f0bdc10b843de5b files/digest-elvis-2.2.0-r3 238 +RMD160 0d484b3a40ab5b0f24140528dbd58bb5248f6b75 files/digest-elvis-2.2.0-r3 238 +SHA256 3fabe072b56fb0456317219876619e7b16dfe7358fecf4661033603d923ba55e files/digest-elvis-2.2.0-r3 238 diff --git a/app-editors/elvis/elvis-2.2.0-r3.ebuild b/app-editors/elvis/elvis-2.2.0-r3.ebuild new file mode 100644 index 000000000000..fa6399137288 --- /dev/null +++ b/app-editors/elvis/elvis-2.2.0-r3.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r3.ebuild,v 1.1 2007/09/21 21:24:31 hawking Exp $ + +inherit eutils versionator + +MY_PV="$(replace_version_separator 2 '_')" + +DESCRIPTION="A vi/ex clone" +HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/" +SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz" + +LICENSE="Artistic" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="X" + +DEPEND=">=sys-libs/ncurses-5.2 + X? ( >=x11-proto/xproto-7.0.4 + >=x11-libs/libX11-1.0.0 + >=x11-libs/libXt-1.0.0 + >=x11-libs/libXpm-3.5.4.2 + >=x11-libs/libXft-2.1.8.2 ) + app-admin/eselect-vi" +PROVIDE="virtual/editor" + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_unpack() { + unpack ${A} + cd "${S}" + + #epatch "${FILESDIR}/ft2.3-symbol-collision-fix.patch" +} + +src_compile() { + ./configure \ + --prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share/elvis \ + --docdir=/usr/share/doc/"${PF}" \ + $(use_with X x) \ + || die "configure failed" + + # Some Makefile fixups (must happen after configure) + # Use our CFLAGS + sed -i -e "s:gcc -O2:gcc ${CFLAGS}:" Makefile || die "sed 1 failed" + + # We'll install the man-pages ourselves + sed -i -e '/^ sh instman.sh/d' Makefile || die "sed 2 failed" + + # Don't try to write to /etc + sed -i -e 's,/etc/elvis,${D}/etc/elvis,g' Makefile || die "sed 3 failed" + + emake || die "make failed" +} + +src_install() { + dodir /usr/bin + dodir /usr/share/man/man1 + dodir /usr/share/elvis + dodir /usr/share/doc/"${PF}" + dodir /etc + make install \ + PREFIX="${D}"/usr \ + BINDIR="${D}"/usr/bin \ + DATADIR="${D}"/usr/share/elvis \ + DOCDIR="${D}"/usr/share/doc/"${PF}" || die 'make install failed' + + # Install the man-pages + mv doc/elvis.man doc/elvis.1 + mv doc/elvtags.man doc/elvtags.1 + mv doc/ref.man doc/ref.1 + doman doc/*.1 || die 'doman failed' + + # Fixup some READMEs + sed -i -e "s,${D},,g" "${D}"/etc/elvis/README \ + || die 'sed /etc/elvis/README failed' + sed -i -e "s,${D},,g" "${D}"/usr/share/elvis/README \ + || die 'sed /usr/share/elvis/README failed' +} + +pkg_postinst() { + einfo "Setting /usr/bin/vi symlink" + eselect vi set "${PN}" +} + +pkg_postrm() { + einfo "Updating /usr/bin/vi symlink" + eselect vi update +} diff --git a/app-editors/elvis/files/digest-elvis-2.2.0-r3 b/app-editors/elvis/files/digest-elvis-2.2.0-r3 new file mode 100644 index 000000000000..2f4cb20be284 --- /dev/null +++ b/app-editors/elvis/files/digest-elvis-2.2.0-r3 @@ -0,0 +1,3 @@ +MD5 6831b8df3e4a530395e66c2889783752 elvis-2.2_0.tar.gz 1439293 +RMD160 9867a3941a84a3db0bcfe4e36dd14132fbcf5805 elvis-2.2_0.tar.gz 1439293 +SHA256 9a8466b2293798441056bc279736af3a616baaba2f11940396cc60ff71924ea0 elvis-2.2_0.tar.gz 1439293 diff --git a/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch b/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch new file mode 100644 index 000000000000..aac099e56ef7 --- /dev/null +++ b/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch @@ -0,0 +1,73 @@ +diff -ur elvis-2.2_0-orig/guix11/tags elvis-2.2_0/guix11/tags +--- elvis-2.2_0-orig/guix11/tags 2003-10-20 19:32:26.000000000 -0700 ++++ elvis-2.2_0/guix11/tags 2007-08-17 12:56:28.000000000 -0700 +@@ -31,7 +31,7 @@ + DEFAULT_TOOLFG guix11.c 40;" d ln:40 file: + DEFAULT_XENCODING guix11.c 48;" d ln:48 file: + FT_DEFAULT xdialog.h 10;" ln:10 enum:X_FIELDTYPE +-FT_FILE xdialog.h 10;" ln:10 enum:X_FIELDTYPE ++FT_FILEC xdialog.h 10;" ln:10 enum:X_FIELDTYPE + FT_LOCKED xdialog.h 10;" ln:10 enum:X_FIELDTYPE + FT_NUMBER xdialog.h 10;" ln:10 enum:X_FIELDTYPE + FT_ONEOF xdialog.h 10;" ln:10 enum:X_FIELDTYPE +diff -ur elvis-2.2_0-orig/guix11/xdialog.c elvis-2.2_0/guix11/xdialog.c +--- elvis-2.2_0-orig/guix11/xdialog.c 2003-10-20 19:32:26.000000000 -0700 ++++ elvis-2.2_0/guix11/xdialog.c 2007-08-17 12:56:28.000000000 -0700 +@@ -387,7 +387,7 @@ + case 'o': ft = FT_ONEOF, limit = scan; break; + case 'n': ft = FT_NUMBER, limit = scan; break; + case 's': ft = FT_STRING; break; +- case 'f': ft = FT_FILE; break; ++ case 'f': ft = FT_FILEC; break; + case 'l': ft = FT_LOCKED; break; + } + +@@ -556,7 +556,7 @@ + break; + + case FT_STRING: +- case FT_FILE: ++ case FT_FILEC: + button = addbutton(dia, "<", 'l', ELVCTRL('L')); + button->y = dia->y0 + dia->rowh * i; + button->x = dia->x0 + 3; +@@ -1111,7 +1111,7 @@ + newvalue = keystring(dia, key); + break; + +- case FT_FILE: ++ case FT_FILEC: + #ifdef FEATURE_COMPLETE + if (key == '\t') + { +@@ -1179,7 +1179,7 @@ + switch (dia->field[row].ft) + { + case FT_STRING: +- case FT_FILE: ++ case FT_FILEC: + case FT_NUMBER: + case FT_LOCKED: + drawtext(dia, row); +@@ -1207,7 +1207,7 @@ + break; + + case FT_STRING: +- case FT_FILE: ++ case FT_FILEC: + if (button->shape == 'l') + if (row == dia->current + ? dia->shift > 0 +diff -ur elvis-2.2_0-orig/guix11/xdialog.h elvis-2.2_0/guix11/xdialog.h +--- elvis-2.2_0-orig/guix11/xdialog.h 2003-10-20 19:32:26.000000000 -0700 ++++ elvis-2.2_0/guix11/xdialog.h 2007-08-17 12:56:28.000000000 -0700 +@@ -5,7 +5,7 @@ + FT_ONEOF, /* one of a preset list; includes boolean */ + FT_NUMBER, /* numeric field */ + FT_STRING, /* string field */ +- FT_FILE, /* string field where <Tab> does filename completion */ ++ FT_FILEC, /* string field where <Tab> does filename completion */ + FT_LOCKED /* non-editable field */ + } X_FIELDTYPE; + typedef struct + |