Version bump, bug #194494

(Portage version: 2.1.3.11)

5 files changed, 27 insertions, 14 deletions

diff --git a/app-text/notecase/ChangeLog b/app-text/notecase/ChangeLog
index 2339898c3d94..6c9c47e7c4c7 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.5 2007/09/17 14:13:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/notecase/ChangeLog,v 1.6 2007/10/02 13:27:39 armin76 Exp $
+
+*notecase-1.6.9 (02 Oct 2007)
+
+  02 Oct 2007; Raúl Porcel <armin76@gentoo.org>
+  -files/notecase-1.6.5-CFLAGS.patch, +files/notecase-1.6.9-CFLAGS.patch,
+  -notecase-1.6.6.ebuild, +notecase-1.6.9.ebuild:
+  Version bump, bug #194494
 
 *notecase-1.6.6 (17 Sep 2007)
 
diff --git a/app-text/notecase/files/digest-notecase-1.6.6 b/app-text/notecase/files/digest-notecase-1.6.6
deleted file mode 100644
index f4a94c0473a0..000000000000
--- a/app-text/notecase/files/digest-notecase-1.6.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c1bf82cda496d76a914b91f54cfec62c notecase-1.6.6_src.tar.gz 837079
-RMD160 44a4d64fa04fec249b8e41436292f5d511bca642 notecase-1.6.6_src.tar.gz 837079
-SHA256 f70ec365f96b5d473b0f5771b4f5bbedfa8b15507cb24b15e7e4f7cf6c0cd66b notecase-1.6.6_src.tar.gz 837079
diff --git a/app-text/notecase/files/digest-notecase-1.6.9 b/app-text/notecase/files/digest-notecase-1.6.9
new file mode 100644
index 000000000000..ceab23573c6f
--- /dev/null
+++ b/app-text/notecase/files/digest-notecase-1.6.9
@@ -0,0 +1,3 @@
+MD5 da3267f271cd6e2c82d4efa4176ae583 notecase-1.6.9_src.tar.gz 847261
+RMD160 d6911acb31ace3d08ff77438e2662b98acd03bbf notecase-1.6.9_src.tar.gz 847261
+SHA256 2d814209506cb52db87f4dae5cbb3de6165e1d46c845114d0eee242385165fb0 notecase-1.6.9_src.tar.gz 847261
diff --git a/app-text/notecase/files/notecase-1.6.5-CFLAGS.patch b/app-text/notecase/files/notecase-1.6.9-CFLAGS.patch
index 3611d49ef377..9bbd4fa11823 100644
--- a/app-text/notecase/files/notecase-1.6.5-CFLAGS.patch
+++ b/app-text/notecase/files/notecase-1.6.9-CFLAGS.patch
@@ -1,20 +1,25 @@
---- Makefile.orig	2007-08-31 13:29:17.000000000 +0200
-+++ Makefile	2007-08-31 13:29:35.000000000 +0200
-@@ -97,13 +97,6 @@
+--- Makefile.orig	2007-10-02 15:21:11.000000000 +0200
++++ Makefile	2007-10-02 15:21:47.000000000 +0200
+@@ -113,18 +113,9 @@
  QC=@echo '===> Compiling $<'; 
  QL=@echo '===> Linking $@'; 
  
 -# using "--as-needed" to cut down link requirements (check by "readelf -d /usr/bin/notecase | grep NEEDED") 
+-ifeq ($(LDFLAGS),)
 -ifdef OSX_BUILD
 - LDFLAGS=-Os -Wl -bind_at_load
 -else
 - LDFLAGS=-Os -Wl,--as-needed
--endif 
+-endif
 -
  ifneq ($(NOKIA_MAEMO_BUILD),)
   LDFLAGS += -ansi
  endif
-@@ -139,7 +132,7 @@
+-endif
+ 
+ # define compile/link command line with flags
+ CC=$(QC) $(CXX) $(DEBUG) $(PROFILE) -DENABLE_NLS
+@@ -157,7 +148,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 \
@@ -22,4 +27,4 @@
 + $(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 $(OBJ)/AboutDlg.o
+  $(OBJ)/DateTimeDlg.o $(OBJ)/AboutDlg.o $(OBJ)/EditDlg.o
diff --git a/app-text/notecase/notecase-1.6.6.ebuild b/app-text/notecase/notecase-1.6.9.ebuild
index 22e3a48ecc93..18930eb7a27a 100644
--- a/app-text/notecase/notecase-1.6.6.ebuild
+++ b/app-text/notecase/notecase-1.6.9.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.6.6.ebuild,v 1.1 2007/09/17 14:13:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/notecase/notecase-1.6.9.ebuild,v 1.1 2007/10/02 13:27:39 armin76 Exp $
 
 inherit eutils
 
@@ -27,12 +27,13 @@ src_unpack() {
 	cd "${S}"
 
 	# Respect CFLAGS and don't use --as-needed by default
-	epatch "${FILESDIR}/notecase-1.6.5-CFLAGS.patch"
+	epatch "${FILESDIR}/notecase-1.6.9-CFLAGS.patch"
 
 	if ! use gnome; then
 		# Comment variable in the Makefile if we don't have gnome
-		sed -i -e 's/HAVE_GNOME_VFS=1/#HAVE_GNOME_VFS=1/g' Makefile || \
-			die "gnome sed failed"
+		sed -i -e 's/HAVE_GNOME_VFS=1/#HAVE_GNOME_VFS=1/g' \
+				-e 's/AUTODETECT_GNOME_VFS=1/#AUTODETECT_GNOME_VFS=1/g' \
+			 Makefile || die "gnome sed failed"
 	fi
 }