Version bump, remove old

(Portage version: 2.1.3_rc6)

6 files changed, 63 insertions, 37 deletions

diff --git a/app-text/notecase/ChangeLog b/app-text/notecase/ChangeLog
index b88cf82e3efb..868fe028a08d 100644
--- a/app-text/notecase/ChangeLog
+++ b/app-text/notecase/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/notecase
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/notecase/ChangeLog,v 1.1 2007/05/14 13:25:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/notecase/ChangeLog,v 1.2 2007/06/29 13:56:31 armin76 Exp $
+
+*notecase-1.5.8 (29 Jun 2007)
+
+  29 Jun 2007; Raúl Porcel <armin76@gentoo.org>
+  -files/notecase-1.3.6-CFLAGS.patch, +files/notecase-1.5.8-CFLAGS.patch,
+  -notecase-1.5.6.ebuild, +notecase-1.5.8.ebuild:
+  Version bump, remove old
 
 *notecase-1.5.6 (14 May 2007)
 
diff --git a/app-text/notecase/files/digest-notecase-1.5.6 b/app-text/notecase/files/digest-notecase-1.5.6
deleted file mode 100644
index 7b038e6d11c6..000000000000
--- a/app-text/notecase/files/digest-notecase-1.5.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a2b313b036530cb19154fdfb679b3d5c notecase-1.5.6_src.tar.gz 644106
-RMD160 8408c57541d624e03045330cb112be953fb19294 notecase-1.5.6_src.tar.gz 644106
-SHA256 b15ad70de5252dc00caae4ad1fe87aec8cc81b25c6cc4313c10792a8cb5edfaa notecase-1.5.6_src.tar.gz 644106
diff --git a/app-text/notecase/files/digest-notecase-1.5.8 b/app-text/notecase/files/digest-notecase-1.5.8
new file mode 100644
index 000000000000..41a34959ba3c
--- /dev/null
+++ b/app-text/notecase/files/digest-notecase-1.5.8
@@ -0,0 +1,3 @@
+MD5 6e44c5e7bff2afdec36f63963fe18b20 notecase-1.5.8_src.tar.gz 667078
+RMD160 73f1b67b176f5e8ec316811fed67594316319a93 notecase-1.5.8_src.tar.gz 667078
+SHA256 b27ac143df957483fba88c98885551657377f173fb588ac1be395ffb0c92683f notecase-1.5.8_src.tar.gz 667078
diff --git a/app-text/notecase/files/notecase-1.3.6-CFLAGS.patch b/app-text/notecase/files/notecase-1.3.6-CFLAGS.patch
deleted file mode 100644
index 9289896c7edd..000000000000
--- a/app-text/notecase/files/notecase-1.3.6-CFLAGS.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.old	2006-12-28 19:21:01.000000000 +0100
-+++ Makefile	2006-12-28 19:22:01.000000000 +0100
-@@ -42,7 +42,7 @@
-  CFLAGS=-Wall -fno-exceptions -fno-rtti -mms-bitfields -mwindows
- else
-  EXE=
-- CFLAGS=-Wall
-+ CFLAGS+=-Wall
- endif 
- 
- FLAGS=$(CFLAGS)
-@@ -63,7 +63,7 @@
- ifdef WINDIR
-  LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -L$(OBJ) -lz 
- else
-- LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -ldl -export-dynamic $(LOPTIMIZE)
-+ LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -ldl -export-dynamic
- endif 
- 
- #
---- src/lib/zlib/Makefile.old	2006-12-28 19:34:45.000000000 +0100
-+++ src/lib/zlib/Makefile	2006-12-28 19:40:22.000000000 +0100
-@@ -13,7 +13,7 @@
-  CFLAGS=-O

- else

-  CC=cc

-- CFLAGS=-O -fPIC

-+ CFLAGS+=-fPIC

- endif

- 

- #CFLAGS=-O -fPIC

diff --git a/app-text/notecase/files/notecase-1.5.8-CFLAGS.patch b/app-text/notecase/files/notecase-1.5.8-CFLAGS.patch
new file mode 100644
index 000000000000..ab0251e543a5
--- /dev/null
+++ b/app-text/notecase/files/notecase-1.5.8-CFLAGS.patch
@@ -0,0 +1,50 @@
+--- Makefile.orig	2007-06-29 13:25:34.000000000 +0200
++++ Makefile	2007-06-29 13:42:18.000000000 +0200
+@@ -80,7 +80,7 @@
+ ifdef WINDIR
+  LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -L$(OBJ) -lz 
+ else
+- LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -ldl -export-dynamic $(LOPTIMIZE)
++ LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -ldl -export-dynamic
+ endif 
+ 
+ #
+@@ -106,7 +106,7 @@
+  $(OBJ)/IOProcess.o $(OBJ)/IOLayerZlib.o $(OBJ)/IOLayerFile64.o $(OBJ)/IOLayerBase.o \
+  $(OBJ)/IOLayerRedirect.o $(OBJ)/FileExportDlg.o $(OBJ)/FormatIOTxt.o $(OBJ)/FindReplaceDlg.o \
+  $(OBJ)/FindReplaceInfo.o $(OBJ)/LinkInfo.o $(OBJ)/LinkPropertiesDlg.o $(OBJ)/ExecuteFile.o \
+- $(OBJ)/FileSaveAsDlg.o $(OBJ)/CircularBuffer.o $(OBJ)/FormatIOMMLX.o $(OBJ)/libz.a $(OBJ)/ProgressDlg.o \
++ $(OBJ)/FileSaveAsDlg.o $(OBJ)/CircularBuffer.o $(OBJ)/FormatIOMMLX.o $(OBJ)/ProgressDlg.o \
+  $(OBJ)/DocActionPix.o $(OBJ)/DocActionFinish.o $(OBJ)/DocActionFmt.o $(OBJ)/FmtInfo.o $(OBJ)/FileAttachmentDlg.o \
+  $(OBJ)/DocActionAtt.o $(OBJ)/PixPropertiesDlg.o $(OBJ)/DocActionFinishDel.o  $(OBJ)/ShortcutsList.o $(OBJ)/ShortcutsListDlg.o $(OBJ)/DateTimeDlg.o
+ 
+@@ -359,9 +359,6 @@
+ $(OBJ)/DocActionFinishDel.o: $(GUIPATH)/DocActionFinishDel.cpp $(GUIPATH)/DocActionFinishDel.h
+ 	$(CC) $(FLAGS) -c $(GUIPATH)/DocActionFinishDel.cpp -o $(OBJ)/DocActionFinishDel.o $(GTKCFLAGS)
+ 	
+-$(OBJ)/libz.a:
+-	@cd ./src/lib/zlib/; make; cp ./libz.a ../../../$(OBJ)/
+-
+ $(OBJ)/ShortcutsList.o: $(GUIPATH)/ShortcutsList.cpp $(GUIPATH)/ShortcutsList.h
+ 	$(CC) $(FLAGS) -c $(GUIPATH)/ShortcutsList.cpp -o $(OBJ)/ShortcutsList.o  $(GTKCFLAGS)
+ 
+@@ -584,16 +581,15 @@
+ # helper to adapt to date changes
+ #
+ touch:
+-	$(Q)touch ./Makefile ./src/* ./src/lib/* ./src/lib/zlib/* ./src/gui/* ./src/_unx/*
++	$(Q)touch ./Makefile ./src/* ./src/lib/* ./src/gui/* ./src/_unx/*
+ 
+ #
+ # clean up the source tree
+ #
+ clean:
+ 	@echo cleaning up
+-	$(Q)cd ./src/lib/zlib/; make clean;
+ 	$(Q)rm -f $(OBJ)/*.o $(OBJ)/*.d $(OBJ)/*.a $(BIN)/core.* $(BIN)/notecase$(EXE) ./gmon.out
+ 	$(Q)rm -rf ./notecase
+ 
+ 
+-.PHONY : all help poinstall pouninstall install uninstall rpm pack packdos updatesrcdos updatesrc updatemime clean ipk deb weexpc check install2
+\ No newline at end of file
++.PHONY : all help poinstall pouninstall install uninstall rpm pack packdos updatesrcdos updatesrc updatemime clean ipk deb weexpc check install2
diff --git a/app-text/notecase/notecase-1.5.6.ebuild b/app-text/notecase/notecase-1.5.8.ebuild
index 5d26ab8dabe4..af1aa8dac377 100644
--- a/app-text/notecase/notecase-1.5.6.ebuild
+++ b/app-text/notecase/notecase-1.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/notecase/notecase-1.5.6.ebuild,v 1.1 2007/05/14 13:25:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/notecase/notecase-1.5.8.ebuild,v 1.1 2007/06/29 13:56:31 armin76 Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ src_unpack() {
 	cd "${S}"
 
 	# Respect CFLAGS and don't use --as-needed by default
-	epatch "${FILESDIR}/notecase-1.3.6-CFLAGS.patch"
+	epatch "${FILESDIR}/notecase-1.5.8-CFLAGS.patch"
 
 	if ! use gnome; then
 		# Comment variable in the Makefile if we don't have gnome