[gentoo-commits] gentoo-x86 commit in dev-util/cmake: cmake-2.6.2.ebuild ChangeLog cmake-2.6.1.ebuild

[Tomas Chvatal (scarabeus)]

scarabeus    08/12/02 23:25:37

  Modified:             cmake-2.6.2.ebuild ChangeLog
  Removed:              cmake-2.6.1.ebuild
  Log:
  Dupe old. Update current to eapi2. Fixes bug #226153.
  (Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo x86_64)

Revision  Changes    Path
1.2                  dev-util/cmake/cmake-2.6.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/cmake-2.6.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/cmake-2.6.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/cmake-2.6.2.ebuild?r1=1.1&r2=1.2

Index: cmake-2.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.6.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmake-2.6.2.ebuild	27 Sep 2008 16:15:44 -0000	1.1
+++ cmake-2.6.2.ebuild	2 Dec 2008 23:25:37 -0000	1.2
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.6.2.ebuild,v 1.1 2008/09/27 16:15:44 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.6.2.ebuild,v 1.2 2008/12/02 23:25:37 scarabeus Exp $
 
-EAPI="1"
+EAPI="2"
 
 inherit elisp-common toolchain-funcs eutils versionator flag-o-matic
 
@@ -21,7 +21,7 @@
 DEPEND=">=net-misc/curl-7.16.4
 	>=dev-libs/expat-2.0.1
 	>=dev-libs/libxml2-2.6.28
-	>=dev-libs/xmlrpc-c-1.06.09
+	>=dev-libs/xmlrpc-c-1.06.09[curl]
 	emacs? ( virtual/emacs )
 	qt4? ( || ( ( x11-libs/qt-core:4
 			x11-libs/qt-gui:4 )
@@ -36,26 +36,12 @@
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	if ! built_with_use -o dev-libs/xmlrpc-c curl libwww; then
-		echo
-		eerror "${PN} requires dev-libs/xmlrpc-c to be built with either the 'libwww' or"
-		eerror "the 'curl' USE flag or both enabled."
-		eerror "Please re-emerge dev-libs/xmlrpc-c with USE=\"libwww\" or USE=\"curl\"."
-		echo
-		die "Please re-emerge dev-libs/xmlrpc-c with USE=\"libwww\" or USE=\"curl\"."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# Link against the shared Python library rather than the static one
 	epatch "${FILESDIR}/${PN}-FindPythonLibs.patch"
 }
 
-src_compile() {
+src_configure() {
 	if [[ "$(gcc-major-version)" -eq "3" ]] ; then
 		append-flags "-fno-stack-protector"
 	fi
@@ -77,7 +63,9 @@
 	else
 		par_arg="--parallel=1"
 	fi
+}
 
+src_compile() {
 	./bootstrap \
 		--system-libs \
 		--prefix=/usr \



1.76                 dev-util/cmake/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/ChangeLog?r1=1.75&r2=1.76

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog	27 Sep 2008 16:15:44 -0000	1.75
+++ ChangeLog	2 Dec 2008 23:25:37 -0000	1.76
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cmake
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.75 2008/09/27 16:15:44 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.76 2008/12/02 23:25:37 scarabeus Exp $
+
+  02 Dec 2008; Tomas Chvatal <scarabeus@g.o>
+  -files/cmake-2.6.1-gc-sections.patch, -files/cmake-2.6.1-rpath.patch,
+  -cmake-2.6.1.ebuild, cmake-2.6.2.ebuild:
+  Dupe old. Update current to eapi2. Fixes bug #226153.
 
 *cmake-2.6.2 (27 Sep 2008)