Bugzilla Bug 189271

Both elvis-2.2.0-r1 and elvis-2.2.0-r2 fail to compile with FreeType 2.3 as
FT_FILE is already defined.  

gcc -march=athlon64 -msse3 -O2 -fomit-frame-pointer -fno-ident -pipe
-I/usr/include/freetype2 -I/usr/X11R6/include -I. -Iosunix -c guix11/xclip.c
In file included from guix11/guix11.h:43,
                 from guix11/guix11.c:11:
guix11/xdialog.h:8: error: 'FILE' redeclared as different kind of symbol
/usr/include/stdio.h:46: error: previous declaration of 'FILE' was here
In file included from guix11/guix11.h:43,
                 from guix11/xclip.c:9:
guix11/xdialog.h:8: error: 'FILE' redeclared as different kind of symbol
/usr/include/stdio.h:46: error: previous declaration of 'FILE' was here
make: *** [xclip.o] Error 1
make: *** Waiting for unfinished jobs....
make: *** [guix11.o] Error 1

!!! ERROR: app-editors/elvis-2.2.0-r1 failed.
Call stack:
  ebuild.sh, line 1632:   Called dyn_compile
  ebuild.sh, line 983:   Called qa_call 'src_compile'
  ebuild.sh, line 44:   Called src_compile
  elvis-2.2.0-r1.ebuild, line 44:   Called die

Incoming is a patch and new ebuild diff against elvis-2.2.0-r2.  Since -r2 has
been in the tree with no open bugs since July 22 and both -r1 & -r2 fail to
compile against a current stable Gentoo system, I'd recommend bumping to -r3
and then do arch test/stable.

Reproducible: Always

Steps to Reproduce:

Created an attachment (id=128435) [edit]
ft2.3-symbol-collision-fix.patch

Fix symbol name collision patch

Created an attachment (id=128436) [edit]
elvis-2.2.0-r2-to-r3.patch

Bump elvis-2.2.0-r2.ebuld to elvis-2.2.0-r3.ebuild, incorporating patch

I guess no one uses elvis anymore?

Sorry for the delay, the fix is in CVS. thanks for reporting ;)

(In reply to comment #4)
> Sorry for the delay, the fix is in CVS. thanks for reporting ;)
> 

Thank you for committing, however it appears elvis-2.2.0-r3.ebuild was
committed with the epatch line commented out.

my bad.. fixed, thanks.