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

Package-Manager: portage-2.1.2.2

5 files changed, 39 insertions, 64 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/Manifest b/dev-cpp/gccxml/Manifest
index 2045ff15c7f2..332457815098 100644
--- a/dev-cpp/gccxml/Manifest
+++ b/dev-cpp/gccxml/Manifest
@@ -11,25 +11,18 @@ EBUILD gccxml-0.6.0-r1.ebuild 874 RMD160 bf83d9171d644252694eb74a748896b0499d77d
 MD5 ea7346e0554b418337797eb804f36c0a gccxml-0.6.0-r1.ebuild 874
 RMD160 bf83d9171d644252694eb74a748896b0499d77d8 gccxml-0.6.0-r1.ebuild 874
 SHA256 de0dc3d91ba3cdea656bd78f37ea1e01173ba1c6cc2aecd72b3ef5de70091b4d gccxml-0.6.0-r1.ebuild 874
-EBUILD gccxml-0.6.0.ebuild 810 RMD160 a4354546126edbbf6823e42b2dad1d9edf87778d SHA1 a09beba537cbe23506acbc58907f2cd3e89ec994 SHA256 2071c35340e43d8c57f90faa6966f66b3bb1a971bb4cadccaa898249459b2fe5
-MD5 a8b450d46ca0ff085af0238d32d858a6 gccxml-0.6.0.ebuild 810
-RMD160 a4354546126edbbf6823e42b2dad1d9edf87778d gccxml-0.6.0.ebuild 810
-SHA256 2071c35340e43d8c57f90faa6966f66b3bb1a971bb4cadccaa898249459b2fe5 gccxml-0.6.0.ebuild 810
-EBUILD gccxml-0.7.0_pre20060311.ebuild 973 RMD160 1dd61d3ed08311495b4472d6e685b6000d512cad SHA1 5140345bdf7f07c8bf719848ccfe0d7bedc16d3a SHA256 568c13d7a2b829322f73de40c6553d527f23df627bade5bee1e7ece9d62c5287
-MD5 ec0449bd2f08ef28af8b3939c64d0d33 gccxml-0.7.0_pre20060311.ebuild 973
-RMD160 1dd61d3ed08311495b4472d6e685b6000d512cad gccxml-0.7.0_pre20060311.ebuild 973
-SHA256 568c13d7a2b829322f73de40c6553d527f23df627bade5bee1e7ece9d62c5287 gccxml-0.7.0_pre20060311.ebuild 973
-MISC ChangeLog 2077 RMD160 5dac5d0be458fa8909f5e5d3569d46480c926de4 SHA1 7dedfe3e3bbfacdb6992739a9fa4ac46325f7fc8 SHA256 5c0052b80c3ea917fd24613af9037696faef5f67789ca156b91b97c564c46d1c
-MD5 2d1a13154ae5dd8d928e98f72be7340f ChangeLog 2077
-RMD160 5dac5d0be458fa8909f5e5d3569d46480c926de4 ChangeLog 2077
-SHA256 5c0052b80c3ea917fd24613af9037696faef5f67789ca156b91b97c564c46d1c ChangeLog 2077
+EBUILD gccxml-0.7.0_pre20060311.ebuild 1210 RMD160 c1b41f2874d8f2cc148fcb8f854a487c7c56ff1b SHA1 0f102c7e281024bbe118e8e1ffbf93c1fa15e17c SHA256 51ceb2d60f0c552ce0697b9882096626c3d7b07a044f3fa604127738fb07507c
+MD5 cdee915294a3e7a79f51202d5ddc1fb0 gccxml-0.7.0_pre20060311.ebuild 1210
+RMD160 c1b41f2874d8f2cc148fcb8f854a487c7c56ff1b gccxml-0.7.0_pre20060311.ebuild 1210
+SHA256 51ceb2d60f0c552ce0697b9882096626c3d7b07a044f3fa604127738fb07507c gccxml-0.7.0_pre20060311.ebuild 1210
+MISC ChangeLog 2277 RMD160 68b0fba7f01b6bc74673386f7c16508ff99caaf8 SHA1 8a9c017dde16f6d3434d8e68d04bb624e97a7308 SHA256 397eab5e08aec6fd3723d7b7538182fbf26372f8f61ef3a7041f24748fcb223b
+MD5 31770978bf14fc8c51e02201fef4237f ChangeLog 2277
+RMD160 68b0fba7f01b6bc74673386f7c16508ff99caaf8 ChangeLog 2277
+SHA256 397eab5e08aec6fd3723d7b7538182fbf26372f8f61ef3a7041f24748fcb223b ChangeLog 2277
 MISC metadata.xml 228 RMD160 5b33409dcdf48004afbd3f326676d56b4bb145dc SHA1 439c2882f2e1936a0ef5c7807af955830402f32d SHA256 fa91b1e22ccf171022ea89b415e9a99752ea31889c15f3a199ee8f57f860f3cb
 MD5 d698342d42579c976d124866016978c1 metadata.xml 228
 RMD160 5b33409dcdf48004afbd3f326676d56b4bb145dc metadata.xml 228
 SHA256 fa91b1e22ccf171022ea89b415e9a99752ea31889c15f3a199ee8f57f860f3cb metadata.xml 228
-MD5 679b0126c17b2682d74efe619bf445b3 files/digest-gccxml-0.6.0 241
-RMD160 3253d3868f196560c5e2e84a76f64eaeb845b5e5 files/digest-gccxml-0.6.0 241
-SHA256 d6474d698718d0dff134ba9c370ef6ef7a723b72cb2e1d15192845b081e7afaf files/digest-gccxml-0.6.0 241
 MD5 679b0126c17b2682d74efe619bf445b3 files/digest-gccxml-0.6.0-r1 241
 RMD160 3253d3868f196560c5e2e84a76f64eaeb845b5e5 files/digest-gccxml-0.6.0-r1 241
 SHA256 d6474d698718d0dff134ba9c370ef6ef7a723b72cb2e1d15192845b081e7afaf files/digest-gccxml-0.6.0-r1 241
@@ -39,7 +32,7 @@ SHA256 eeec60283fc3c7eb72adbf9f288e86e0987204d36279b90c970665f903610307 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFzvv98bi6rjpTunYRApE4AJ9DKYQihjfUbf3X/A8tEBCDcYeIKgCbBNYH
-y6oa4vGfzSbXWexZETbIL4Y=
-=takx
+iD8DBQFF+a9RGwVqY66cHjARAh5xAJ9gVX2vea7h9JhHfonER0T8ssTxRwCfSUO8
+PXK3aU4Y2WiadGoSyi2Gcyk=
+=JLmt
 -----END PGP SIGNATURE-----
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"
 }