version bump to fix bad compile - bug #151568 thanks to Evil Compile Person

(Portage version: 2.1.2.7)

8 files changed, 109 insertions, 71 deletions

diff --git a/dev-embedded/yapide/ChangeLog b/dev-embedded/yapide/ChangeLog
index c4a823face9e..d2daf669cf42 100644
--- a/dev-embedded/yapide/ChangeLog
+++ b/dev-embedded/yapide/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-embedded/yapide
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/yapide/ChangeLog,v 1.5 2007/02/09 01:51:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/yapide/ChangeLog,v 1.6 2007/06/21 12:05:19 dragonheart Exp $
+
+  21 Jun 2007; Daniel Black <dragonheart@gentoo.org>
+  +files/yapide-0.1.1-configure.patch, +files/yapide-0.1.1-make.patch,
+  -files/yapide-0.1-configure.patch, -files/yapide-0.1-nocflags.patch:
+  version bump to fix bad compile - bug #151568 thanks to Evil Compile Person
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/dev-embedded/yapide/files/digest-yapide-0.1 b/dev-embedded/yapide/files/digest-yapide-0.1
deleted file mode 100644
index 8ce4c2b96cad..000000000000
--- a/dev-embedded/yapide/files/digest-yapide-0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8cfc7aad5a62121c8f2aea485f0519d8 yapide-0.1.tgz 233064
-RMD160 79de12859dbaeb16e57901d72eb3d7394d0618ce yapide-0.1.tgz 233064
-SHA256 edf8bbed49030551f045794fcb70873942ebf9fd1542de1f64598a37f2eae3eb yapide-0.1.tgz 233064
diff --git a/dev-embedded/yapide/files/digest-yapide-0.1.1 b/dev-embedded/yapide/files/digest-yapide-0.1.1
new file mode 100644
index 000000000000..59dca10ff1ae
--- /dev/null
+++ b/dev-embedded/yapide/files/digest-yapide-0.1.1
@@ -0,0 +1,3 @@
+MD5 d5eea72bb8d3ca2606b9ff6337a935c3 yapide-0.1.1.tgz 392158
+RMD160 e40fb9036c84bf6950f923baa394916acebea637 yapide-0.1.1.tgz 392158
+SHA256 1d20a7af33278d887e8d8557ebf803288acc156bd85e9b747fe0f72958b4fc99 yapide-0.1.1.tgz 392158
diff --git a/dev-embedded/yapide/files/yapide-0.1-configure.patch b/dev-embedded/yapide/files/yapide-0.1-configure.patch
deleted file mode 100644
index 86628b5bba61..000000000000
--- a/dev-embedded/yapide/files/yapide-0.1-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.old	2004-08-05 08:56:33.463133912 +0100
-+++ configure	2004-08-05 08:56:41.082975520 +0100
-@@ -55,7 +55,7 @@
- echo "#include <stdio.h>" >> qttest.cpp
- echo "int main(int argc, char **argv) { fprintf( stderr, \"Found QT Version %s: \", QT_VERSION_STR );" >> qttest.cpp
- echo "if (QT_VERSION >= 300) return 0; else return -1; }" >> qttest.cpp
--gcc -I$QTDIR/include qttest.cpp
-+g++ -I$QTDIR/include qttest.cpp
- if ./a.out
- then
- echo "OK"
diff --git a/dev-embedded/yapide/files/yapide-0.1-nocflags.patch b/dev-embedded/yapide/files/yapide-0.1-nocflags.patch
deleted file mode 100644
index 9857d937bb10..000000000000
--- a/dev-embedded/yapide/files/yapide-0.1-nocflags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/src.pro.orig	2004-08-05 18:07:02.315294152 +0930
-+++ src/src.pro	2004-08-05 18:07:34.970329832 +0930
-@@ -6,13 +6,6 @@
- DEPENDPATH      = . 
- 
- release {
--  contains( QMAKE_CC, gcc ) {
--    message( "Adding release optimizations for gcc" )
--    QMAKE_CFLAGS   += -finline-functions -fexpensive-optimizations \
--                      -fstrict-aliasing -fomit-frame-pointer 
--    QMAKE_CXXFLAGS += -finline-functions -fexpensive-optimizations \
--                      -fstrict-aliasing -fomit-frame-pointer
--  }
-   TARGET = yapide
- }
- 
-@@ -21,20 +14,6 @@
-   TARGET = yapidedebug
- }
-     
--CPU_YAPIDE = $$system( echo $CPU )
--
--contains( CPU_YAPIDE, i686 ) {
--	message( "Configuring for Pentium Pro" )
--	QMAKE_CFLAGS   += -march=pentiumpro
--	QMAKE_CXXFLAGS += -march=pentiumpro
--}
--
--contains( CPU_YAPIDE, Athlon ) {
--	message( "Configuring for Athlon" )
--	QMAKE_CFLAGS   += -march=athlon
--	QMAKE_CXXFLAGS += -march=athlon
--}
--
- HEADERS   = \
-             xpm/animation.xpm \
-             xpm/breakpoint.xpm \
diff --git a/dev-embedded/yapide/files/yapide-0.1.1-configure.patch b/dev-embedded/yapide/files/yapide-0.1.1-configure.patch
new file mode 100644
index 000000000000..1c66586cfc1b
--- /dev/null
+++ b/dev-embedded/yapide/files/yapide-0.1.1-configure.patch
@@ -0,0 +1,34 @@
+--- YaPIDE-0.1.1/configure.orig	2007-06-21 21:36:08.000000000 +1000
++++ YaPIDE-0.1.1/configure	2007-06-21 21:36:29.000000000 +1000
+@@ -20,8 +20,8 @@
+     exit -1
+ fi
+ 
+-QMAKE_TEST=`which qmake`
+-if [ ! -f "$QMAKE_TEST" ]
++QMAKE=$QTDIR/bin/qmake
++if [ ! -f "$QMAKE" ]
+ then
+     echo "*******************************************************************************"
+     echo " The qmake utility was not found. This package requires a correctly"
+@@ -44,9 +44,9 @@
+ echo "Creating Makefiles..." 
+ 
+ 
+-qmake YaPIDE.pro -o Makefile 
++$QMAKE YaPIDE.pro -o Makefile 
+ cd src
+-qmake src.pro -o Makefile
++$QMAKE src.pro -o Makefile
+ cd ..
+ 
+ echo "Testing libraries & tools ..."
+@@ -55,7 +55,7 @@
+ echo "#include <stdio.h>" >> qttest.cpp
+ echo "int main(int argc, char **argv) { fprintf( stderr, \"Found QT Version %s: \", QT_VERSION_STR );" >> qttest.cpp
+ echo "if (QT_VERSION >= 300) return 0; else return -1; }" >> qttest.cpp
+-g++ -I$QTDIR/include qttest.cpp
++$CXX -I$QTDIR/include qttest.cpp
+ if ./a.out
+ then
+ echo "OK"
diff --git a/dev-embedded/yapide/files/yapide-0.1.1-make.patch b/dev-embedded/yapide/files/yapide-0.1.1-make.patch
new file mode 100644
index 000000000000..7f5b174a8e1b
--- /dev/null
+++ b/dev-embedded/yapide/files/yapide-0.1.1-make.patch
@@ -0,0 +1,56 @@
+--- YaPIDE-0.1.1/src/src.pro.orig	2007-06-21 21:08:35.000000000 +1000
++++ YaPIDE-0.1.1/src/src.pro	2007-06-21 21:10:09.000000000 +1000
+@@ -6,45 +6,6 @@
+ DEPENDPATH      = . 
+ TARGET          = yapide
+ 
+-QMAKE_CFLAGS_RELEASE -= -O2
+-QMAKE_CXXFLAGS_RELEASE -= -O2
+-QMAKE_CFLAGS -= -O2
+-QMAKE_CXXFLAGS -= -O2
+-
+-release {
+-  contains( QMAKE_CC, gcc ) {
+-    message( "Adding release optimizations for gcc" )
+-    QMAKE_CFLAGS   += -O3 -finline-functions -fexpensive-optimizations \
+-                      -fstrict-aliasing -fomit-frame-pointer 
+-    QMAKE_CXXFLAGS += -O3 -finline-functions -fexpensive-optimizations \
+-                      -fstrict-aliasing -fomit-frame-pointer
+-  }
+-}
+-
+-debug {
+-  message( "Compiling for debug" )
+-}
+-    
+-CPU_YAPIDE = $$system( echo $CPU )
+-
+-contains( CPU_YAPIDE, i686 ) {
+-	message( "Configuring for Pentium Pro" )
+-	QMAKE_CFLAGS   += -march=i686
+-	QMAKE_CXXFLAGS += -march=i686
+-}
+-
+-contains( CPU_YAPIDE, Athlon ) {
+-  message( "Configuring for Athlon" )
+-  QMAKE_CFLAGS   += -march=athlon
+-  QMAKE_CXXFLAGS += -march=athlon
+-}
+-
+-contains( CPU_YAPIDE, x86_64 ) {
+-  message( "Configuring for Athlon64" )
+-  QMAKE_CFLAGS   += -march=k8
+-  QMAKE_CXXFLAGS += -march=k8
+-}
+-
+ HEADERS   = \
+             xpm/animation.xpm \
+             xpm/breakpoint.xpm \
+@@ -241,5 +202,5 @@
+             inspectortip.cpp \
+             workspace.cpp
+ 
+-VERSION   = 0.1
+-DESTDIR   = ../bin
++VERSION   = 0.1.1
++#DESTDIR   = ../bin
diff --git a/dev-embedded/yapide/yapide-0.1.ebuild b/dev-embedded/yapide/yapide-0.1.1.ebuild
index 58725fc8212f..5cef140b86cd 100644
--- a/dev-embedded/yapide/yapide-0.1.ebuild
+++ b/dev-embedded/yapide/yapide-0.1.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/yapide/yapide-0.1.ebuild,v 1.4 2005/07/07 04:32:44 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/yapide/yapide-0.1.1.ebuild,v 1.1 2007/06/21 12:05:19 dragonheart Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Yet Another PIC IDE: a Microchip PIC simulator"
 HOMEPAGE="http://www.mtoussaint.de/yapide.html"
@@ -17,33 +17,24 @@ RDEPEND="virtual/libc
 	=x11-libs/qt-3*
 	dev-embedded/gputils"
 
-DEPEND="${RDEPEND}
-	sys-devel/gcc
-	>=sys-apps/sed-4"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/YaPIDE-${PV}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-0.1-configure.patch
-	epatch ${FILESDIR}/${PN}-0.1-nocflags.patch
+	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-make.patch
 }
 
 
 
 src_compile() {
-
-	REALHOME="${HOME}"
-	mkdir -p ${T}/fakehome/.kde
-	mkdir -p ${T}/fakehome/.qt
-	export HOME="${T}/fakehome"
 	addwrite "${QTDIR}/etc/settings"
 
-	# things that should access the real homedir
-	[ -d "${REALHOME}/.ccache" ] && ln -sf "${REALHOME}/.ccache" "${HOME}/"
-
-	econf || die
+#	this isn't autoconf
+	tc-export CXX
+	./configure || die
 	emake src/Makefile || die
 	sed -i -e "s:^CFLAGS.*-D_REENTRANT:CFLAGS = ${CFLAGS} -D_REENTRANT:" \
 		-e "s:^CXXFLAGS.*-D_REENTRANT:CXXFLAGS = ${CXXFLAGS} -D_REENTRANT:" \
@@ -54,7 +45,7 @@ src_compile() {
 
 
 src_install() {
-	dobin bin/yapide
-	dodoc AUTHORS COPYING KNOWNBUGS README
+	dobin src/yapide
+	dodoc KNOWNBUGS README
 }