From: Mike Gilbert Date: Thu, 13 Oct 2011 02:17:14 +0000 (+0000) Subject: Move back to EAPI 3. Use python eclass. Drop cflags patch. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6864ba8c5dea141a4d586b88288ce26875e07923;p=gentoo.git Move back to EAPI 3. Use python eclass. Drop cflags patch. Package-Manager: portage-2.2.0_alpha66/cvs/Linux x86_64 --- diff --git a/dev-lang/v8/ChangeLog b/dev-lang/v8/ChangeLog index 3c6fdd7b175f..095cdec5edc7 100644 --- a/dev-lang/v8/ChangeLog +++ b/dev-lang/v8/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/v8 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/ChangeLog,v 1.83 2011/10/12 22:39:01 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/ChangeLog,v 1.84 2011/10/13 02:17:14 floppym Exp $ + + 13 Oct 2011; Mike Gilbert v8-3.6.5.1.ebuild, + v8-9999.ebuild: + Move back to EAPI 3. Use python eclass. Drop cflags patch. 12 Oct 2011; Mike Gilbert v8-3.6.5.1.ebuild: Use gz tarballs since v8-create-tarball doesn't support xz. diff --git a/dev-lang/v8/Manifest b/dev-lang/v8/Manifest index ac62394e1c5c..b220fd014734 100644 --- a/dev-lang/v8/Manifest +++ b/dev-lang/v8/Manifest @@ -14,14 +14,14 @@ EBUILD v8-3.3.10.22.ebuild 2773 RMD160 f98e6329c5f043aba33a74e227787ca7e9500dfd EBUILD v8-3.3.10.30.ebuild 2773 RMD160 3c22d11144ffc6851547ff8acca00ffec1053273 SHA1 485d57a2f2d5622ae9ae59fbe39214712edd5722 SHA256 c1bd3ec83b8a741e461c31af05b5580d6a06a422b37838b7143223ce55923779 EBUILD v8-3.4.12.1.ebuild 2982 RMD160 1dfed6c4828d1d06a8e83dd9ad77550614f08008 SHA1 c93e2f14a2c9a1f5365698a6df05fc0c3da20737 SHA256 c5af24a86d8a2ea17cfe2cfabf4e00b1deae24614ce65fc5d491e35f94936a94 EBUILD v8-3.4.14.28.ebuild 2071 RMD160 f22aeaebef6737040d487e621456ad3ce0dff05d SHA1 b4dd86e87df8d11d687067661d0a2fa8fef90043 SHA256 40631ce7a9a1e4cd1a668cfdf606340161e081b51e92d23799858a84adfb01d8 -EBUILD v8-3.6.5.1.ebuild 2459 RMD160 df8c046959460a8eb8c096ab63bb2c6be683597d SHA1 6f925eed52707e6581bc7cd0c76da6aea46b56dd SHA256 d1c9f975971bb8dde604021b0c5be8fbf5722603a98c6ecd49f16e8bcdfcbacb -EBUILD v8-9999.ebuild 1957 RMD160 8eb0ee48c4161025bcb0507d909163f830f4e2c9 SHA1 d0c0c296466f77fab5ec04970c79be6cec4ff2fa SHA256 f0016e27bf0d8db28f457813ab3f47bfdf9fe61595948937a37b04b0cde534d1 -MISC ChangeLog 14341 RMD160 1c95348a0307586c9eb482d5b0a4802ba091c4ed SHA1 5d7f8082c3072152b3f696b62fbae5d63ed502ef SHA256 2b4b80c363d357b482467198f04308df22ba7e174ce8b992b2c56ffbddfe07d3 +EBUILD v8-3.6.5.1.ebuild 2352 RMD160 09c3e9c6abeeb9517c90e4a17251e3a8a442f341 SHA1 4f7c68fff0a4a142e5e29ae0ed1fc105c37b2cc7 SHA256 41e1510cfa2358193797694ad362f19aa03f08ccf6cd397771d713c604c63379 +EBUILD v8-9999.ebuild 2030 RMD160 ec6255f85070542d0391313faeca4aa5cd99f1c5 SHA1 900edf4decb825a3f1970ee4603b7f8a261f696a SHA256 99d2c16d8175a18810c2075b1cbd35549af48c0ac2d9b60ba98fe7656f5b5145 +MISC ChangeLog 14489 RMD160 00bb65bc663cf23359a90a05ea8b5be81081d489 SHA1 25e5e91b8ab03595781c0ce730449490f205f4f1 SHA256 9ed7c1bd551d02c8814a908e9af7d5ba2a5c4d92861008ce95d17d0d5d2e3121 MISC metadata.xml 162 RMD160 3485b95578a49782c3188a0f963f90c688287fe1 SHA1 46226eeaf4948209a093253f92010abea501daef SHA256 8a3ecdcf518f45ec4843398f9896c9b4d1c867ff2cf2851cf40b06f756f111e8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk6WFw0ACgkQC77qH+pIQ6R3cAD6A2l7Wu8bFn6YqWVx7bgYChPE -II9cuLsPkhpMLKSJs68BAKw7WxEKAmc/MpG4a9AhCahH9HL3rvnXAFtjfDuhKJRp -=+PCn +iF4EAREIAAYFAk6WSjMACgkQC77qH+pIQ6TXtgD/U1749Z/mHKZp8IsnlBoYG/1P +3m/6DNRaokdLeckpgXsA/iDhfHAL6AG/V8e253pBg67n1EswOSh0crdf7nnMBTcM +=8Mc4 -----END PGP SIGNATURE----- diff --git a/dev-lang/v8/v8-3.6.5.1.ebuild b/dev-lang/v8/v8-3.6.5.1.ebuild index 621431b92f04..4cb69155a583 100644 --- a/dev-lang/v8/v8-3.6.5.1.ebuild +++ b/dev-lang/v8/v8-3.6.5.1.ebuild @@ -1,10 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.6.5.1.ebuild,v 1.4 2011/10/12 22:39:01 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.6.5.1.ebuild,v 1.5 2011/10/13 02:17:14 floppym Exp $ -EAPI="4" +EAPI="3" -inherit eutils multilib pax-utils toolchain-funcs +PYTHON_DEPEND="2:2.6" + +inherit eutils multilib pax-utils python toolchain-funcs GYP_REV="1066" @@ -20,8 +22,12 @@ KEYWORDS="~amd64 ~arm ~x86 ~x64-macos ~x86-macos" IUSE="readline" # Avoid using python eclass since we do not need python RDEPEND -DEPEND="|| ( dev-lang/python:2.6 dev-lang/python:2.7 )" RDEPEND="readline? ( >=sys-libs/readline-6.1 )" +DEPEND="${RDEPEND}" + +pkg_setup() { + python_set_active_version 2 +} src_unpack() { unpack ${A} @@ -31,15 +37,9 @@ src_unpack() { src_prepare() { # Stop -Werror from breaking the build. sed -i -e "s/-Werror//" build/standalone.gypi || die - - # Respect the user's CFLAGS, including the optimization level. - epatch "${FILESDIR}/v8-gyp-cflags-r0.patch" } src_compile() { - # Make /usr/bin/python (wrapper) call python2 - export EPYTHON=python2 - tc-export AR CC CXX RANLIB export LINK="${CXX}" @@ -79,9 +79,9 @@ src_test() { src_install() { insinto /usr - doins -r include + doins -r include || die - dobin out/${mytarget}/d8 + dobin out/${mytarget}/d8 || die if [[ ${CHOST} == *-darwin* ]] ; then install_name_tool \ @@ -89,8 +89,8 @@ src_install() { out/${mytarget}/lib.target/libv8-${soname_version}$(get_libname) || die fi - dolib out/${mytarget}/lib.target/libv8-${soname_version}$(get_libname) - dosym libv8-${soname_version}$(get_libname) /usr/$(get_libdir)/libv8$(get_libname) + dolib out/${mytarget}/lib.target/libv8-${soname_version}$(get_libname) || die + dosym libv8-${soname_version}$(get_libname) /usr/$(get_libdir)/libv8$(get_libname) || die - dodoc AUTHORS ChangeLog + dodoc AUTHORS ChangeLog || die } diff --git a/dev-lang/v8/v8-9999.ebuild b/dev-lang/v8/v8-9999.ebuild index 017ec013a85a..5ecca25a94d0 100644 --- a/dev-lang/v8/v8-9999.ebuild +++ b/dev-lang/v8/v8-9999.ebuild @@ -1,10 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-9999.ebuild,v 1.13 2011/10/12 18:18:48 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-9999.ebuild,v 1.14 2011/10/13 02:17:14 floppym Exp $ -EAPI="2" +EAPI="3" -inherit eutils multilib pax-utils subversion toolchain-funcs +PYTHON_DEPEND="2:2.6" + +inherit eutils multilib pax-utils python subversion toolchain-funcs DESCRIPTION="Google's open source JavaScript engine" HOMEPAGE="http://code.google.com/p/v8" @@ -18,6 +20,10 @@ IUSE="readline" RDEPEND="readline? ( >=sys-libs/readline-6.1 )" DEPEND="${RDEPEND}" +pkg_setup() { + python_set_active_version 2 +} + src_unpack() { subversion_src_unpack cd "${S}"