Version bump and remove old.

(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)

4 files changed, 51 insertions, 35 deletions

diff --git a/app-misc/vittk/ChangeLog b/app-misc/vittk/ChangeLog
index e568176a5311..73ba66fbc9a4 100644
--- a/app-misc/vittk/ChangeLog
+++ b/app-misc/vittk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/vittk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vittk/ChangeLog,v 1.2 2011/02/01 11:23:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vittk/ChangeLog,v 1.3 2011/03/13 04:55:51 radhermit Exp $
+
+*vittk-1.3 (13 Mar 2011)
+
+  13 Mar 2011; Tim Harder <radhermit@gentoo.org> -vittk-1.1.1.ebuild,
+  -files/vittk-1.1.1-configure.patch, -files/vittk-1.1.1-makefile.patch,
+  +vittk-1.3.ebuild, +files/vittk-1.3-configure.patch,
+  +files/vittk-1.3-makefile.patch:
+  Version bump and remove old.
 
   01 Feb 2011; Tim Harder <radhermit@gentoo.org> vittk-1.1.1.ebuild,
   files/vittk-1.1.1-configure.patch:
diff --git a/app-misc/vittk/files/vittk-1.1.1-configure.patch b/app-misc/vittk/files/vittk-1.3-configure.patch
index b05fea1eed72..b45464bfb8b1 100644
--- a/app-misc/vittk/files/vittk-1.1.1-configure.patch
+++ b/app-misc/vittk/files/vittk-1.3-configure.patch
@@ -1,5 +1,5 @@
---- vittk-1.1.1/configure.in.orig
-+++ vittk-1.1.1/configure.in
+--- vittk-1.3/configure.in.orig
++++ vittk-1.3/configure.in
 @@ -14,11 +14,11 @@
  fi
  AC_SUBST(BASH)
@@ -16,15 +16,17 @@
  
  AC_PATH_PROG(TASK, task, NOT_FOUND)
  if test "$TASK" = "NOT_FOUND"; then
-@@ -30,11 +30,3 @@
+@@ -30,12 +30,9 @@
  AC_SUBST(FONT)
  
- AC_OUTPUT(vittk vittk.man Makefile)
+ AC_OUTPUT(task-startstop task-undo Makefile vittk.man vittk)
+-chmod 755 task-startstop
+-chmod 755 task-undo
 -chmod 755 vittk
--
--echo creating ./tclIndex
+ 
+ echo creating ./tclIndex
 -echo "auto_mkindex `pwd`; exit" | $WISH
--
--echo "./configure is done"
--echo "now do \"sudo make install\" or \"make install\""
--
++echo "auto_mkindex `pwd`; exit" | $TCLSH
+ 
+ echo "./configure is done"
+ echo "now do \"sudo make install\" or \"make install\""
diff --git a/app-misc/vittk/files/vittk-1.1.1-makefile.patch b/app-misc/vittk/files/vittk-1.3-makefile.patch
index 1a7757317938..a7148fdf64dc 100644
--- a/app-misc/vittk/files/vittk-1.1.1-makefile.patch
+++ b/app-misc/vittk/files/vittk-1.3-makefile.patch
@@ -1,13 +1,6 @@
---- vittk-1.1.1/Makefile.in.orig
-+++ vittk-1.1.1/Makefile.in
-@@ -4,44 +4,44 @@
- 
- INSTALL = ./install-sh
- 
--.PHONY: usage insall autoconf release push dogfood
-+.PHONY: usage install autoconf release push dogfood
- 
- usage:
+--- vittk-1.3/Makefile.in.orig
++++ vittk-1.3/Makefile.in
+@@ -10,45 +10,45 @@
  	@echo "usage: make install"
  
  install:
@@ -49,32 +42,45 @@
 -	@$(INSTALL) -c -m 644 vittk.man @prefix@/man/man1/vittk.1
 -	@echo installing vittkrc in @prefix@/etc
 -	@$(INSTALL) -c -m 644 vittkrc @prefix@/etc/vittkrc
--	@if [ ! -d @prefix@/lib/vittk ]; then \
--	  echo mkdir -p @prefix@/lib/vittk ; \
--	  mkdir -p @prefix@/lib/vittk ; \
+-	@if [ ! -d @prefix@/libexec/vittk ]; then \
+-	  echo mkdir -p @prefix@/libexec/vittk ; \
+-	  mkdir -p @prefix@/libexec/vittk ; \
 +	@$(INSTALL) -c -m 644 vittk.man $(DESTDIR)@mandir@/man1/vittk.1
 +	@echo installing vittkrc in $(DESTDIR)@sysconfdir@
 +	@$(INSTALL) -c -m 644 vittkrc $(DESTDIR)@sysconfdir@/vittkrc
++	@if [ ! -d $(DESTDIR)@prefix@/libexec/vittk ]; then \
++	  echo mkdir -p $(DESTDIR)@prefix@/libexec/vittk ; \
++	  mkdir -p $(DESTDIR)@prefix@/libexec/vittk ; \
+ 	fi
+-	@echo installing task-startstop in @prefix@/libexec/vittk
+-	@$(INSTALL) -c -m 755 task-startstop @prefix@/libexec/vittk/task-startstop
+-	@echo installing task-undo in @prefix@/libexec/vittk
+-	@$(INSTALL) -c -m 755 task-undo @prefix@/libexec/vittk/task-undo
+-	@echo installing .tcl files and tclIndex in @prefix@/lib/vittk
+-	@if [ ! -d @prefix@/lib/vittk ]; then \
+-	  echo mkdir -p @prefix@/lib/vittk ; \
+-	  mkdir -p @prefix@/lib/vittk ; \
++	@echo installing task-startstop in $(DESTDIR)@prefix@/libexec/vittk
++	@$(INSTALL) -c -m 755 task-startstop $(DESTDIR)@prefix@/libexec/vittk/task-startstop
++	@echo installing task-undo in $(DESTDIR)@prefix@/libexec/vittk
++	@$(INSTALL) -c -m 755 task-undo $(DESTDIR)@prefix@/libexec/vittk/task-undo
++	@echo installing .tcl files and tclIndex in $(DESTDIR)@libdir@/vittk
 +	@if [ ! -d $(DESTDIR)@libdir@/vittk ]; then \
 +	  echo mkdir -p $(DESTDIR)@libdir@/vittk ; \
 +	  mkdir -p $(DESTDIR)@libdir@/vittk ; \
  	fi
--	@echo installing .tcl files in @prefix@/lib/vittk
 -	@cp *.tcl @prefix@/lib/vittk
--	@echo creating @prefix@/lib/vittk/tclIndex
--	@(cd @prefix@/lib/vittk; echo "auto_mkindex `pwd`; exit" | @WISH@)
+-	@cp tclIndex @prefix@/lib/vittk
 -	@echo installing vittk in @prefix@/bin
 -	@$(INSTALL) -c -m 755 vittk @prefix@/bin/vittk
-+	@echo installing .tcl files in $(DESTDIR)@libdir@/vittk
 +	@cp *.tcl $(DESTDIR)@libdir@/vittk
-+	@echo creating $(DESTDIR)@libdir@/vittk/tclIndex
-+	@(cd $(DESTDIR)@libdir@/vittk; echo "auto_mkindex `pwd`; exit" | @TCLSH@)
++	@cp tclIndex $(DESTDIR)@libdir@/vittk
 +	@echo installing vittk in $(DESTDIR)@prefix@/bin
 +	@$(INSTALL) -c -m 755 vittk $(DESTDIR)@prefix@/bin/vittk
  
  autoconf:
  	@make -f .makefile autoconf
-@@ -54,3 +54,4 @@
+@@ -61,3 +61,4 @@
  dogfood:
  	@make -f .makefile dogfood
  
diff --git a/app-misc/vittk/vittk-1.1.1.ebuild b/app-misc/vittk/vittk-1.3.ebuild
index 008682bc047e..13391f0a8be2 100644
--- a/app-misc/vittk/vittk-1.1.1.ebuild
+++ b/app-misc/vittk/vittk-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vittk/vittk-1.1.1.ebuild,v 1.2 2011/02/01 11:23:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vittk/vittk-1.3.ebuild,v 1.1 2011/03/13 04:55:51 radhermit Exp $
 
 EAPI=4
 
@@ -21,9 +21,9 @@ RDEPEND="${DEPEND}
 	app-misc/task"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-configure.patch
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-dirs.patch
+	epatch "${FILESDIR}"/${P}-configure.patch \
+		"${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${PN}-1.1.1-dirs.patch
 	eautoreconf
 }