[gentoo-commits] gentoo-x86 commit in app-editors/elvis: ChangeLog elvis-2.2.0-r3.ebuild

[Ali Polatel (hawking)]

hawking     07/09/21 21:24:31

  Modified:             ChangeLog
  Added:                elvis-2.2.0-r3.ebuild
  Log:
  revbump. add patch to fix symbol collision between elvis and freetype. bug 189271, thanks to Gordon Malm.
  (Portage version: 2.1.3.9)

Revision  Changes    Path
1.33                 app-editors/elvis/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/elvis/ChangeLog?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/elvis/ChangeLog?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/elvis/ChangeLog?r1=1.32&r2=1.33

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChangeLog	22 Jul 2007 08:42:58 -0000	1.32
+++ ChangeLog	21 Sep 2007 21:24:30 -0000	1.33
@@ -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@g.o>
+  +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@g.o> elvis-2.2.0-r1.ebuild,
   elvis-2.2.0-r2.ebuild:



1.1                  app-editors/elvis/elvis-2.2.0-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/elvis/elvis-2.2.0-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/elvis/elvis-2.2.0-r3.ebuild?rev=1.1&content-type=text/plain

Index: elvis-2.2.0-r3.ebuild
===================================================================
# 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
}



-- 
gentoo-commits@g.o mailing list