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

Package-Manager: portage-2.1.2.7

9 files changed, 129 insertions, 101 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/Manifest b/dev-embedded/yapide/Manifest
index 38c6eb1addb9..bc3d6620eb67 100644
--- a/dev-embedded/yapide/Manifest
+++ b/dev-embedded/yapide/Manifest
@@ -1,34 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX yapide-0.1-configure.patch 449 RMD160 6207da053bab973e3066c7f55e76517fddb9d70b SHA1 71be59b96a1ee8e51c306a871a4b7685e5bb45c8 SHA256 aac994a2131b769170715589abcf4bc6a9b620beee383ecf7fb3ea0d9a36e651
-MD5 1582e350c89120cffd8fe87f88a451c0 files/yapide-0.1-configure.patch 449
-RMD160 6207da053bab973e3066c7f55e76517fddb9d70b files/yapide-0.1-configure.patch 449
-SHA256 aac994a2131b769170715589abcf4bc6a9b620beee383ecf7fb3ea0d9a36e651 files/yapide-0.1-configure.patch 449
-AUX yapide-0.1-nocflags.patch 1014 RMD160 771b4c491c2670b57cf0d69b8680fb0bf22b949d SHA1 1c6c89d98649b5d98524d42c64f57df75f70b874 SHA256 ca4a2a69dade7b59c0da69ffc62e6585f89fb548ae906a23159230935e6c30f0
-MD5 8a508bb3601e8af1a63cd89ec1fff718 files/yapide-0.1-nocflags.patch 1014
-RMD160 771b4c491c2670b57cf0d69b8680fb0bf22b949d files/yapide-0.1-nocflags.patch 1014
-SHA256 ca4a2a69dade7b59c0da69ffc62e6585f89fb548ae906a23159230935e6c30f0 files/yapide-0.1-nocflags.patch 1014
-DIST yapide-0.1.tgz 233064 RMD160 79de12859dbaeb16e57901d72eb3d7394d0618ce SHA1 289027c90d9340ae2d6f2946be7db964c780e07e SHA256 edf8bbed49030551f045794fcb70873942ebf9fd1542de1f64598a37f2eae3eb
-EBUILD yapide-0.1.ebuild 1296 RMD160 d4905cd15ff3007e3d6c1898f010f582fc767acb SHA1 1e68f5bc25eed2a8c2fcdd5f15723126c0afb387 SHA256 18cfcee254312ae83e7fb04d730eabe38a4b1af1166a351a9ebd268d87c80ee5
-MD5 3ff60cf1c20f123346a26f45fa7d766b yapide-0.1.ebuild 1296
-RMD160 d4905cd15ff3007e3d6c1898f010f582fc767acb yapide-0.1.ebuild 1296
-SHA256 18cfcee254312ae83e7fb04d730eabe38a4b1af1166a351a9ebd268d87c80ee5 yapide-0.1.ebuild 1296
-MISC ChangeLog 772 RMD160 21305091bc0eb1e91d5f2c430578de2c84a6cd4f SHA1 92a53b33f40acd81ea98ff5ce2120da4a0741817 SHA256 d0983025b1732f679c57a857834f8c18de734d24aa8d2d483e84041678fa88f4
-MD5 7eaf33f223fb7a9abd58ec962b4ca65a ChangeLog 772
-RMD160 21305091bc0eb1e91d5f2c430578de2c84a6cd4f ChangeLog 772
-SHA256 d0983025b1732f679c57a857834f8c18de734d24aa8d2d483e84041678fa88f4 ChangeLog 772
+AUX yapide-0.1.1-configure.patch 1017 RMD160 9e08e0c0fb067a167b079915f94054a9af55db26 SHA1 5821ac10a7722b197a0ac3dd3963049291520f33 SHA256 8f128c7995077c289dbf72e62f2075ab762bce7babea0f8b78cc3f016461b77b
+MD5 0bd57688f45a39f4fe3cbe72d5637a48 files/yapide-0.1.1-configure.patch 1017
+RMD160 9e08e0c0fb067a167b079915f94054a9af55db26 files/yapide-0.1.1-configure.patch 1017
+SHA256 8f128c7995077c289dbf72e62f2075ab762bce7babea0f8b78cc3f016461b77b files/yapide-0.1.1-configure.patch 1017
+AUX yapide-0.1.1-make.patch 1454 RMD160 7d787482091a02fca9b06bf0f7d34bae83c0f575 SHA1 a6eac352b3d0f48b483fd59f8d38fa0f102c8d11 SHA256 df6b51be700437f21ff341fb31019efab06b022232562c56d0002c9458d3606b
+MD5 4c9025bd07b7ed96dc353cdb77755d9a files/yapide-0.1.1-make.patch 1454
+RMD160 7d787482091a02fca9b06bf0f7d34bae83c0f575 files/yapide-0.1.1-make.patch 1454
+SHA256 df6b51be700437f21ff341fb31019efab06b022232562c56d0002c9458d3606b files/yapide-0.1.1-make.patch 1454
+DIST yapide-0.1.1.tgz 392158 RMD160 e40fb9036c84bf6950f923baa394916acebea637 SHA1 b47927d3a999f54a96c74740a5ba9112cfdf2997 SHA256 1d20a7af33278d887e8d8557ebf803288acc156bd85e9b747fe0f72958b4fc99
+EBUILD yapide-0.1.1.ebuild 1068 RMD160 e64bed9c8c8ede903250e6dddf22426d1ad1acc9 SHA1 8fe3e6da5fe6e566e7f5265255739fb233634c13 SHA256 c364a94e65a17049e7ef95d567e91e25c5b6880855dc27673f5ec0640a8083c6
+MD5 1532aec4be9dd2a64ab6915a7d5c07dc yapide-0.1.1.ebuild 1068
+RMD160 e64bed9c8c8ede903250e6dddf22426d1ad1acc9 yapide-0.1.1.ebuild 1068
+SHA256 c364a94e65a17049e7ef95d567e91e25c5b6880855dc27673f5ec0640a8083c6 yapide-0.1.1.ebuild 1068
+MISC ChangeLog 1048 RMD160 e2429dffd8b09ebc07d6e67d38893288046f1f8d SHA1 eda5ee04e006d2a64d0e0f5d35e28986abcf9a70 SHA256 a47a99c21dd4f3cc95e5008a3021343830383bbf1c896770912e12abf91e956f
+MD5 410709685b2138e361ac631915d07800 ChangeLog 1048
+RMD160 e2429dffd8b09ebc07d6e67d38893288046f1f8d ChangeLog 1048
+SHA256 a47a99c21dd4f3cc95e5008a3021343830383bbf1c896770912e12abf91e956f ChangeLog 1048
 MISC metadata.xml 403 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 SHA1 ec604212b5eb7dde6256c827184a228eaa8161d5 SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a
 MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 metadata.xml 403
 SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a metadata.xml 403
-MD5 cc50c6df1de628966514d41b36f73a9a files/digest-yapide-0.1 223
-RMD160 5a7c939d72ea577a7ef91dbde7b3d39fe3be3968 files/digest-yapide-0.1 223
-SHA256 dfe4e8d6efae646803a45caee88f77a887be8765e61ed7a54f98ab529b7467cb files/digest-yapide-0.1 223
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFy9OWAiZjviIA2XgRAv7FAKCF8ZL7LVMVhCiwt2slOQuKqd9k7ACdFQfh
-p1NomtEhTgWqS6QbIO08M0M=
-=fiPQ
------END PGP SIGNATURE-----
+MD5 2cd6d929599ac9e0e1e982443d697e70 files/digest-yapide-0.1.1 229
+RMD160 dce0afdbe21f80ed75695969f5ca56caa5d5d764 files/digest-yapide-0.1.1 229
+SHA256 b724368885de102d91fa10b2d2ba4051d458d79a347e0dfb0111d7f789440801 files/digest-yapide-0.1.1 229
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
 }