Version bump, remove old

(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 55 insertions, 143 deletions

diff --git a/media-gfx/tgif/ChangeLog b/media-gfx/tgif/ChangeLog
index 0cfff2a037f9..01fcca181274 100644
--- a/media-gfx/tgif/ChangeLog
+++ b/media-gfx/tgif/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/tgif
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tgif/ChangeLog,v 1.16 2010/02/21 04:24:52 abcd Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tgif/ChangeLog,v 1.17 2013/01/14 12:07:10 pinkbyte Exp $
+
+*tgif-4.2.5 (14 Jan 2013)
+
+  14 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> -tgif-4.1.45-r1.ebuild,
+  -files/tgif-4.1.45-gentoo.patch, -files/tgif-4.1.45-sym.patch,
+  +tgif-4.2.5.ebuild:
+  Version bump, remove old
 
   21 Feb 2010; Jonathan Callen <abcd@gentoo.org> tgif-4.1.45-r1.ebuild:
   Bump EAPI, add prefix support & keywords
diff --git a/media-gfx/tgif/files/tgif-4.1.45-gentoo.patch b/media-gfx/tgif/files/tgif-4.1.45-gentoo.patch
deleted file mode 100644
index 8ee354c3030c..000000000000
--- a/media-gfx/tgif/files/tgif-4.1.45-gentoo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- Makefile.noimake.orig	2006-12-04 23:28:33.000000000 +0100
-+++ Makefile.noimake	2006-12-04 23:29:35.000000000 +0100
-@@ -18,7 +18,7 @@
- # @(#)$Header: /var/cvsroot/gentoo-x86/media-gfx/tgif/files/tgif-4.1.45-gentoo.patch,v 1.1 2006/12/04 22:25:20 dev-zero Exp $
- #
- 
--INSTALLPATH	= /usr/local
-+INSTALLPATH	= $(DESTDIR)/usr
- MANSECTION	= n
- 
- O 		= .o
-@@ -27,7 +27,7 @@
- CC 		= cc
- BINDIR		= $(INSTALLPATH)/bin
- TGIFDIR 	= $(INSTALLPATH)/lib/tgif
--MANPATH		= $(INSTALLPATH)/man
-+MANPATH		= $(INSTALLPATH)/share/man
- MANDIR		= $(MANPATH)/man$(MANSECTION)
- 
- XDIR		= /usr/openwin
-@@ -43,7 +43,7 @@
- #		directory right after the -c option.  So, if you are running
- #		Solaris, please install the files manually.
- #
--INSTALL		= install
-+INSTALL		= install -D
- 
- CFLAGS		= -O $(DEFINES) -I$(INCROOT)
- LDFLAGS		= -L$(USRLIBDIR) -lc -lX11 -ldl -lm
-@@ -82,6 +82,7 @@
- INSTMANFLAGS	= -m 0444
- DEFINES		= -DTGIF_PATH=\"$(TGIFDIR)\" -DPSFILE_MOD=0664 \
- 		  -DEPSF_FILE_EXT=\"eps\" -DPS_FILE_EXT=\"ps\" \
-+		  -D_HAS_STREAMS_SUPPORT -D_DONT_USE_MKTEMP \
- 		  -DXBM_FILE_EXT=\"xbm\" -DXPM_FILE_EXT=\"xpm\" \
- 		  -DOBJ_FILE_EXT=\"obj\" -DSYM_FILE_EXT=\"sym\" \
- 		  -DTEXT_FILE_EXT=\"txt\" -DPIN_FILE_EXT=\"pin\" \
diff --git a/media-gfx/tgif/files/tgif-4.1.45-sym.patch b/media-gfx/tgif/files/tgif-4.1.45-sym.patch
deleted file mode 100644
index 3ffd0d2d7f27..000000000000
--- a/media-gfx/tgif/files/tgif-4.1.45-sym.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -r -u tgif-QPL-4.1.45.orig/Makefile.noimake tgif-QPL-4.1.45/Makefile.noimake
---- tgif-QPL-4.1.45.orig/Makefile.noimake	2006-06-14 00:29:58.000000000 +0200
-+++ tgif-QPL-4.1.45/Makefile.noimake	2009-06-05 01:20:32.000000000 +0200
-@@ -318,7 +318,11 @@
- 		$(TGIFDIR)/tgificon.eps $(TGIFDIR)/tgificon.obj \
- 		$(TGIFDIR)/tgificon.xbm $(TGIFDIR)/tgificon.xpm \
- 		$(TGIFDIR)/tangram.sym $(TGIFDIR)/tgif.Xdefaults \
--		$(TGIFDIR)/keys.obj
-+		$(TGIFDIR)/eq4-2x.sym $(TGIFDIR)/eq4-epstool.sym \
-+		$(TGIFDIR)/eq4-lyx-ps2epsi.sym $(TGIFDIR)/eq4-ps2epsi.sym \
-+		$(TGIFDIR)/eq4.sym $(TGIFDIR)/eq4xpm.sym \
-+		$(TGIFDIR)/flip-flop.sym $(TGIFDIR)/nand2.sym \
-+		$(TGIFDIR)/pin.sym $(TGIFDIR)/keys.obj
- 	@echo Making install ...
- 
- $(BINDIR)/tgif: tgif
-@@ -339,6 +343,33 @@
- $(TGIFDIR)/tgificon.xpm: tgificon.xpm
- 	$(INSTALL) -c tgificon.xpm $(TGIFDIR)/tgificon.xpm
- 
-+$(TGIFDIR)/eq4-2x.sym: eq4-2x.sym
-+	$(INSTALL) -c eq4-2x.sym $(TGIFDIR)/eq4-2x.sym
-+
-+$(TGIFDIR)/eq4-epstool.sym: eq4-epstool.sym
-+	$(INSTALL) -c eq4-epstool.sym $(TGIFDIR)/eq4-epstool.sym
-+
-+$(TGIFDIR)/eq4-lyx-ps2epsi.sym: eq4-lyx-ps2epsi.sym
-+	$(INSTALL) -c eq4-lyx-ps2epsi.sym $(TGIFDIR)/eq4-lyx-ps2epsi.sym
-+
-+$(TGIFDIR)/eq4-ps2epsi.sym: eq4-ps2epsi.sym
-+	$(INSTALL) -c eq4-ps2epsi.sym $(TGIFDIR)/eq4-ps2epsi.sym
-+
-+$(TGIFDIR)/eq4.sym: eq4.sym
-+	$(INSTALL) -c eq4.sym $(TGIFDIR)/eq4.sym
-+
-+$(TGIFDIR)/eq4xpm.sym: eq4xpm.sym
-+	$(INSTALL) -c eq4xpm.sym $(TGIFDIR)/eq4xpm.sym
-+
-+$(TGIFDIR)/flip-flop.sym: flip-flop.sym
-+	$(INSTALL) -c flip-flop.sym $(TGIFDIR)/flip-flop.sym
-+
-+$(TGIFDIR)/nand2.sym: nand2.sym
-+	$(INSTALL) -c nand2.sym $(TGIFDIR)/nand2.sym
-+
-+$(TGIFDIR)/pin.sym: pin.sym
-+	$(INSTALL) -c pin.sym $(TGIFDIR)/pin.sym
-+
- $(TGIFDIR)/tangram.sym: tangram.sym
- 	$(INSTALL) -c tangram.sym $(TGIFDIR)/tangram.sym
- 
diff --git a/media-gfx/tgif/tgif-4.1.45-r1.ebuild b/media-gfx/tgif/tgif-4.1.45-r1.ebuild
deleted file mode 100644
index fe3b168854fa..000000000000
--- a/media-gfx/tgif/tgif-4.1.45-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tgif/tgif-4.1.45-r1.ebuild,v 1.3 2010/02/21 04:24:52 abcd Exp $
-
-EAPI=3
-
-inherit eutils toolchain-funcs
-
-MY_P="${PN}-QPL-${PV}"
-
-DESCRIPTION="Tgif is an Xlib base 2-D drawing facility under X11."
-HOMEPAGE="http://bourbon.usc.edu/tgif/index.html"
-SRC_URI="ftp://bourbon.usc.edu/pub/${PN}/${MY_P}.tar.gz"
-
-LICENSE="QPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND="x11-libs/libX11
-	x11-proto/xproto"
-RDEPEND="${DEPEND}
-	media-libs/netpbm"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-sym.patch"
-	sed -i \
-		-e '/^INSTPGMFLAGS/d' \
-		-e 's/#prtgif /prtgif #/' \
-		-e "/LDFLAGS/ s:=:+=:" \
-		Makefile.noimake || die "sed failed"
-}
-
-src_compile() {
-	emake -f Makefile.noimake \
-		CC=$(tc-getCC) CPPFLAGS="${CFLAGS}" TGIFDIR="${EPREFIX}/usr/bin/tgif" \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake -f Makefile.noimake CC=$(tc-getCC) DESTDIR="${ED}" install \
-		|| die "emake install failed"
-
-	## example-files
-	dodoc tgif.Xdefaults tgificon.eps tgificon.obj \
-		tgificon.xbm tgificon.xpm tangram.sym eq4.sym eq4-2x.sym \
-		eq4-ps2epsi.sym eq4-epstool.sym eq4xpm.sym \
-		eq4-lyx-ps2epsi.sym keys.obj
-
-	dodoc README HISTORY
-}
diff --git a/media-gfx/tgif/tgif-4.2.5.ebuild b/media-gfx/tgif/tgif-4.2.5.ebuild
new file mode 100644
index 000000000000..62978104e1a7
--- /dev/null
+++ b/media-gfx/tgif/tgif-4.2.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tgif/tgif-4.2.5.ebuild,v 1.1 2013/01/14 12:07:10 pinkbyte Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils eutils flag-o-matic
+
+MY_P="${PN}-QPL-${PV}"
+
+DESCRIPTION="Xlib base 2-D drawing facility under X11"
+HOMEPAGE="http://bourbon.usc.edu/tgif/index.html"
+SRC_URI="ftp://bourbon.usc.edu/pub/${PN}/${MY_P}.tar.gz"
+
+LICENSE="QPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND="sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-proto/xproto"
+RDEPEND="${DEPEND}
+	media-libs/netpbm"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog HISTORY NEWS README )
+
+src_prepare() {
+	sed -i \
+		-e 's/^CFLAGS=/CFLAGS+=/' \
+		-e 's:^TGIFDIR.*:TGIFDIR = $(datadir)/tgif:' \
+		Makefile.am || die 'sed on Makefile.am failed'
+
+	append-cppflags -D_DONT_USE_MKTEMP -DHAS_STREAMS_SUPPORT
+
+	autotools-utils_src_prepare
+}