Changed cmake-dependency to 2.4.6, bug #162366. Small cleanups. Old version dropped.

(Portage version: 2.1.2.2)

4 files changed, 28 insertions, 46 deletions

diff --git a/dev-cpp/gccxml/ChangeLog b/dev-cpp/gccxml/ChangeLog
index 226b5cd9e623..2fe1af5e823d 100644
--- a/dev-cpp/gccxml/ChangeLog
+++ b/dev-cpp/gccxml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/gccxml
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gccxml/ChangeLog,v 1.16 2006/10/10 21:03:34 g2boojum Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gccxml/ChangeLog,v 1.17 2007/03/15 20:40:32 dev-zero Exp $
+
+  15 Mar 2007; Tiziano Müller <dev-zero@gentoo.org> -gccxml-0.6.0.ebuild,
+  gccxml-0.7.0_pre20060311.ebuild:
+  Changed cmake-dependency to 2.4.6, bug #162366. Small cleanups. Old version
+  dropped.
 
 *gccxml-0.7.0_pre20060311 (10 Oct 2006)
 
diff --git a/dev-cpp/gccxml/files/digest-gccxml-0.6.0 b/dev-cpp/gccxml/files/digest-gccxml-0.6.0
deleted file mode 100644
index c21c98bfeb70..000000000000
--- a/dev-cpp/gccxml/files/digest-gccxml-0.6.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d828349c76ca055955d0af84e8381093 gccxml-0.6.0.tar.gz 9740448
-RMD160 8bcf54541282160c2fe09ea40e9d5fdfdd06b1ba gccxml-0.6.0.tar.gz 9740448
-SHA256 5efcad16ffa33eea6aea4c918f45838e3c826ad0e3d32d85f96f2b49bd66ba94 gccxml-0.6.0.tar.gz 9740448
diff --git a/dev-cpp/gccxml/gccxml-0.6.0.ebuild b/dev-cpp/gccxml/gccxml-0.6.0.ebuild
deleted file mode 100644
index 1a26878ed647..000000000000
--- a/dev-cpp/gccxml/gccxml-0.6.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gccxml/gccxml-0.6.0.ebuild,v 1.8 2005/10/29 06:21:00 halcy0n Exp $
-
-inherit versionator
-PVM="$(get_version_component_range 1-2)"
-DESCRIPTION="XML output extension to GCC"
-HOMEPAGE="http://www.gccxml.org/"
-SRC_URI="http://www.gccxml.org/files/v${PVM}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~mips ppc ~sparc x86"
-IUSE=""
-
-DEPEND="dev-util/cmake"
-RDEPEND=""
-
-MYBUILDDIR=${WORKDIR}/build
-src_unpack() {
-	mkdir ${MYBUILDDIR}
-	unpack ${A}
-}
-src_compile() {
-	cd ${MYBUILDDIR}
-	cmake ../${P} -DCMAKE_INSTALL_PREFIX:PATH=/usr || die "cmake failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	cd ${MYBUILDDIR}
-	make DESTDIR=${D} install || die
-}
diff --git a/dev-cpp/gccxml/gccxml-0.7.0_pre20060311.ebuild b/dev-cpp/gccxml/gccxml-0.7.0_pre20060311.ebuild
index edf037c4506c..834cc74c97b5 100644
--- a/dev-cpp/gccxml/gccxml-0.7.0_pre20060311.ebuild
+++ b/dev-cpp/gccxml/gccxml-0.7.0_pre20060311.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gccxml/gccxml-0.7.0_pre20060311.ebuild,v 1.2 2007/02/11 11:20:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gccxml/gccxml-0.7.0_pre20060311.ebuild,v 1.3 2007/03/15 20:40:32 dev-zero Exp $
+
+inherit eutils toolchain-funcs
 
-inherit eutils
 MY_PNV=${PN}_${PV/_pre/+cvs}.orig
-S=${WORKDIR}/${MY_PNV/_/-}
+
 DESCRIPTION="XML output extension to GCC"
 HOMEPAGE="http://www.gccxml.org/"
 SRC_URI="http://ftp.debian.org/debian/pool/main/g/${PN}/${MY_PNV}.tar.gz"
@@ -14,24 +15,35 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND="dev-util/cmake"
+DEPEND=">=dev-util/cmake-2.4.6"
 RDEPEND=""
 
+S=${WORKDIR}/${MY_PNV/_/-}
 MYBUILDDIR=${WORKDIR}/build
+
 src_unpack() {
-	mkdir ${MYBUILDDIR}
+	mkdir "${MYBUILDDIR}"
 	unpack ${A}
-	cd ${S}
+
+	cd "${S}"
 	# patch below taken from Debian
-	sed -i -e 's/xatexit.c//' ${S}/GCC/libiberty/CMakeLists.txt
+	sed -i \
+		-e 's/xatexit.c//' \
+		${S}/GCC/libiberty/CMakeLists.txt
 }
 src_compile() {
 	cd ${MYBUILDDIR}
-	cmake ${S} -DCMAKE_INSTALL_PREFIX:PATH=/usr || die "cmake failed"
+	cmake ${S} \
+		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		-DCMAKE_CXX_COMPILER:FILEPATH="$(tc-getCXX)" \
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+		-DCMAKE_C_COMPILER:FILEPATH="$(tc-getCC)" \
+		-DCMAKE_C_FLAGS="${CFLAGS}" \
+		|| die "cmake failed"
 	emake || die "emake failed"
 }
 
 src_install() {
 	cd ${MYBUILDDIR}
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 }