From d18cc63b95f07e9d890c485705411ae9d1c1b6a3 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sat, 27 Dec 2014 20:27:35 +0200 Subject: Cleaning up sustaining new baselayout --- sys-apps/baselayout/Manifest | 8 -- sys-apps/baselayout/baselayout-2.2.ebuild | 2 - sys-devel/base-gcc/base-gcc-4.7.2.ebuild | 210 ------------------------------ sys-devel/gcc/gcc-4.7.2.ebuild | 159 ---------------------- 4 files changed, 379 deletions(-) delete mode 100644 sys-devel/base-gcc/base-gcc-4.7.2.ebuild delete mode 100644 sys-devel/gcc/gcc-4.7.2.ebuild diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 3ec3151d..c2fdff62 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,11 +1,3 @@ -AUX baselayout-1.12.14-iproute.patch 633 SHA256 d30480e75024953ac64a51cf7a3d54f4f975470219da2cec9ad0832b5ff6eff9 SHA512 4c8f177971d6e65b8a0d55c5b8a045f4277637e97b41a07b3a332adca2720c929c4b44ad29a59d2ad4ec521924711c8f82742ec68bc3f0b54791b38a21b2bce4 WHIRLPOOL 695d8720650571a1f49678d38be713f94d9d318f5522609bce09872d587da7b13e89d702e0a4e77072fe9f6a677bc6d8c5e818584876afe57c286c5454fe0781 -AUX baselayout-2.0.1-proc_touch.patch 528 SHA256 5c8108347da5881ba982a4c8831b846393d6c6928d6497f021633e45d6f3ab39 SHA512 c60bb20a2bf93741170d15d62b33d46284b92b2442977fe41db68e874c7f02a466a00c3f65f4e06db57598487dcc5827536afb52375a8d821ef148babb25b247 WHIRLPOOL 04d2980060c7ea1f4a101411b0bcd065009c9fe36261f214bfc52009c36092ad50819fe0b433c04b212699a6b94c7bf57ada9fd743abf35631e11ccae3c301b2 -AUX baselayout-2.0.3-slash-run-dir.patch 273 SHA256 7c797e35a721250a8961c10efeb1495fbdd759358d9b6084504ce4b47d8e4d2b SHA512 f1e01da181faafdbe660b9afc442d2d1f6650064fb15f94340ec43750e45fa3ff1179730cd1b81e591f03a82e8c45d2402bc23ac2310ef0ebb6bc762270d8a0b WHIRLPOOL ef17a9d7a90fd6be7108d316a57265cd38f2f52fd134ec37ba7328119ca1d17ac842ab9065bca4c9b21d4a552768e754c1badd69c8a568221924e0055b3eff24 -AUX baselayout-rogentos-os-release.patch 486 SHA256 5fae994ba07fd294b92c554bc901935f512b6bec99697520d7a961af48d90208 SHA512 ab6ce0ff4c942aa3d60dbab9c2013633a3162ab0707f38d7ad72c4c8d7349cf6d804eca40276ab162f745d206d04ae0eb45bda0a0f29d35aa2f86bc675427081 WHIRLPOOL 6fc230172fb907223d3f2ee297b1c3e4c36dfd7d6a17a947207ad10559475c4c9565cd1afa118c2c775b14f727157892027d78a55441ad2e33ea97bf89fee2a0 DIST baselayout-2.0.3.tar.bz2 39969 SHA256 879308781d845f467eb2b45b9ff006aa799e943f45ddba518f43acae1ec84bdd DIST baselayout-2.1.tar.bz2 40398 SHA256 2ac6f2156513a2820a0eeeecc2cf7e7c0b5e0c750b324f1e21912d5f3cda4956 DIST baselayout-2.2.tar.bz2 40744 SHA256 11d4a223b06da545c3e59e07c9195570f334b5b1be05d995df0ebc8ea2203e98 SHA512 a5199c42e835d9f2683cc94f3c4c47ecdc392316c24e0932845736e2e90479b0c5c8ad72ead8e0537f097405b7d7548d00b87b7ff8c9e3651486e3c5c0970b36 WHIRLPOOL 60cc4f7f76c5a45c15303e526decffb3bad2b50ac659b1dd072d2ed4b0eb0b31929a1a733ddb03a31ee5882b889a4efb87206f63ffaa2b11e26d36afd0933a95 -EBUILD baselayout-2.0.3-r1.ebuild 8324 SHA256 67512c59427896fa6801f7c410b6948af0fc5368994e78f8dfc3d7515cd41c44 SHA512 d1cef6c0226daf4ffea851b0a5d3e03215cc99d7f5bbe023f61f21dc2fe5ca88d236f75e9ba21c03f94c70ba3f821b1551bea4ee4b5e71dc31d21fddd078c9f6 WHIRLPOOL 4e490c6ba6945a73dc50c5d6f04861cb648f82b5b9bbbd702f4eafed511e44b7322856ed20bf4f3adf83910144d2cd6322bfcd1dc9715daaab8a4695523f62ee -EBUILD baselayout-2.1.ebuild 8703 SHA256 f3e2bda1c1a7c805f7b0093107abcc3357362627e9110ee1eb9b6804b8e90b31 SHA512 44c3de65a97cd0f9d3cfec4944d88033d7a12d30e79c6d9e7836b3816001acd7703a36dacf75bb6e58a579951b1af80dccca322853d614c1d50274429fb3c4e5 WHIRLPOOL 69f10d3cc403e3d49d9555b855de575d8474aa6b0c1a0c7cd63dd7f5ac7bc84460dfbb3382b315549e8c0e1df79522c2161df9af0429815da129d2ad78e7f58d -EBUILD baselayout-2.2.ebuild 9132 SHA256 2317988157c8a373747300c0598952dce05eab60d4f85c80e14e268129a4f625 SHA512 9a825db62673c2af8036c650edf893b53af3ba4eab9c409acb24b57dfb0941c1348eaec30d59e3855c7b4b6e81a07d4623a4d866c3ff192c24b99cc7fb2391b0 WHIRLPOOL 902c2b43e2146125838f657023148e9a642c20686f523995d4f879e659cf4e1ae84feeecc6b2b61e22c83eb498ee68ab71ab18b1873b5de2d58bb6cd2e475ebe -MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52 diff --git a/sys-apps/baselayout/baselayout-2.2.ebuild b/sys-apps/baselayout/baselayout-2.2.ebuild index 1f70a72c..695bbf9a 100644 --- a/sys-apps/baselayout/baselayout-2.2.ebuild +++ b/sys-apps/baselayout/baselayout-2.2.ebuild @@ -14,8 +14,6 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="build kernel_linux" -PDEPEND="sys-apps/openrc" - pkg_setup() { multilib_layout } diff --git a/sys-devel/base-gcc/base-gcc-4.7.2.ebuild b/sys-devel/base-gcc/base-gcc-4.7.2.ebuild deleted file mode 100644 index 51b07d01..00000000 --- a/sys-devel/base-gcc/base-gcc-4.7.2.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -PATCH_VER="1.3" -UCLIBC_VER="1.0" - -# Hardened gcc 4 stuff -PIE_VER="0.5.2" -SPECS_VER="0.2.0" -SPECS_GCC_VER="4.4.3" -# arch/libc configurations known to be stable with {PIE,SSP}-by-default -PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64" -PIE_UCLIBC_STABLE="x86 arm amd64 ppc ppc64" -SSP_STABLE="amd64 x86 mips ppc ppc64 arm" -# uclibc need tls and nptl support for SSP support -# uclibc need to be >= 0.9.32 -SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm" -#end Hardened stuff - -inherit eutils toolchain - -# This is here to redeclare is_gcc() in toolchain.eclass -# We don't even want to build gcj, which is a real hog -# on memory constrained hardware. base-gcc doesn't actually -# ship with it atm. -is_gcj() { - return 1 -} - -DESCRIPTION="The GNU Compiler Collection" - -LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" - -RDEPEND=">=sys-libs/zlib-1.1.4 - virtual/libiconv - >=dev-libs/gmp-4.3.2 - >=dev-libs/mpfr-2.4.2 - >=dev-libs/mpc-0.8.1 - graphite? ( - >=dev-libs/cloog-ppl-0.15.10 - >=dev-libs/ppl-0.11 - ) - !build? ( - nls? ( sys-devel/gettext ) - )" - -DEPEND="${RDEPEND} - test? ( - >=dev-util/dejagnu-1.4.4 - >=sys-devel/autogen-5.5.4 - ) - >=sys-apps/texinfo-4.8 - >=sys-devel/bison-1.875 - >=sys-devel/flex-2.5.4 - >=${CATEGORY}/binutils-2.18" -PDEPEND=">=sys-devel/gcc-config-1.4 - go? ( >=sys-devel/gcc-config-1.5 )" - -## Check for valid gcc profile. -src_unpack() { - # Since Sabayon's gcc ebuild are split into two parts, we have to - # build gcc with a different version of gcc, or terrible breakage - # will occur after sys-devel/base-gcc is installed, but the - # partner sys-devel/gcc still needs to be built. - - # While it is possible to rebuild Sabayon's split gcc from - # the same version, we have to disallow this also since - # we have no way of discerning if a configuration change - # is significant enough to cause breakage. - - GCC_PROFILE_VER=$(cat ${ROOT}/etc/env.d/gcc/config-$CHOST | awk -F- '{ print $NF }') - einfo "Checking for valid gcc profile to build ${P}" - - # Construct the Slot of the gcc version in the active profile. - GCC_PROFILE_SLOT_MAJOR=$(echo ${GCC_PROFILE_VER} | awk -F. '{ print $1 }') - GCC_PROFILE_SLOT_MINOR=$(echo ${GCC_PROFILE_VER} | awk -F. '{ print $2 }') - GCC_PROFILE_SLOT="${GCC_PROFILE_SLOT_MAJOR}.${GCC_PROFILE_SLOT_MINOR}" - einfo "Current gcc profile version Slot is: ${GCC_PROFILE_SLOT}" - if [[ "${GCC_PROFILE_SLOT}" = "${SLOT}" ]] ; then - eerror "Error!" - eerror "The active gcc-profile is for sys-devel/gcc slot ${SLOT}." - eerror "Sabayon's split sys-devel/gcc package MUST be built" - eerror "with another slotted version of sys-devel/gcc active." - die "Invalid gcc profile selected!" - fi - - toolchain_src_unpack - - use vanilla && return 0 - - [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch -} - -## Remove lto conditional -pkg_setup() { - toolchain_pkg_setup - - ewarn - ewarn "LTO support is still experimental and unstable." - ewarn "Any bugs resulting from the use of LTO will not be fixed." - ewarn -} - -## Just install libgcc stuff -src_install() { - cd "${WORKDIR}/build" - S="${WORKDIR}"/build \ - emake -j1 -C "${CTARGET}/libgcc" DESTDIR="${D}" install-shared || die - if use multilib; then - S="${WORKDIR}"/build emake -j1 -C "${CTARGET}/32/libgcc" DESTDIR="${D}" \ - install-shared || die - fi - - if use mudflap; then - S="${WORKDIR}"/build emake -j1 -C "${CTARGET}/libmudflap" DESTDIR="${D}" \ - install-toolexeclibLTLIBRARIES || die - if use multilib; then - S="${WORKDIR}"/build emake -j1 -C "${CTARGET}/32/libmudflap" DESTDIR="${D}" \ - install-toolexeclibLTLIBRARIES || die - fi - fi - - if use openmp; then - S="${WORKDIR}"/build emake -j1 -C "${CTARGET}/libgomp" DESTDIR="${D}" \ - install-toolexeclibLTLIBRARIES || die - if use multilib; then - S="${WORKDIR}"/build emake -j1 -C "${CTARGET}/32/libgomp" DESTDIR="${D}" \ - install-toolexeclibLTLIBRARIES || die - fi - fi - - S="${WORKDIR}"/build \ - emake -j1 -C "${CTARGET}/libstdc++-v3/src" DESTDIR="${D}" \ - install-toolexeclibLTLIBRARIES || die - if use multilib; then - S="${WORKDIR}"/build emake -j1 -C "${CTARGET}/32/libstdc++-v3/src" DESTDIR="${D}" \ - install-toolexeclibLTLIBRARIES || die - fi - - S="${WORKDIR}"/build emake -j1 -C "${CTARGET}/libstdc++-v3/po" DESTDIR="${D}" install || die - S="${WORKDIR}"/build emake -j1 -C "${CTARGET}/libgomp" DESTDIR="${D}" install-info || die - - S="${WORKDIR}"/build emake -j1 DESTDIR="${D}" install-target-libquadmath || die - if use fortran; then - S="${WORKDIR}"/build emake -j1 DESTDIR="${D}" install-target-libgfortran || die - fi - # TODO: what to do with USE objc++ and objc-gc ? - if use objc; then - S="${WORKDIR}"/build emake -j1 DESTDIR="${D}" install-target-libobjc || die - fi - - # from toolchain.eclass yay - gcc_movelibs - - dodir /etc/env.d/gcc - create_gcc_env_entry - - # Setup the gcc_env_entry for hardened gcc 4 with minispecs - if want_minispecs ; then - copy_minispecs_gcc_specs - fi - - # drop any .la, .a - find "${D}" -name *.a -delete - find "${D}" -name *.la -delete - - # drop any include - rm "${D}${LIBPATH}"/include -rf - # drop specs as well, provided by sys-devel/gcc-${PV}:${SLOT} - # unfortunately, the spec shit above does create the env.d/ - # file content... - rm "${D}${LIBPATH}"/{32/,}*.spec{s,} -rf - rm "${D}${LIBPATH}"/specs -rf - - # Now do the fun stripping stuff - env RESTRICT="" CHOST=${CTARGET} prepstrip "${D}${LIBPATH}" - - cd "${S}" - if ! is_crosscompile; then - has noinfo ${FEATURES} \ - && rm -r "${D}/${DATAPATH}"/info \ - || prepinfo "${DATAPATH}" - fi - - # use gid of 0 because some stupid ports don't have - # the group 'root' set to gid 0 - chown -R root:0 "${D}"${LIBPATH} -} - -## Do nothing! -pkg_preinst() { - : -} - -## Do nothing! -pkg_postinst() { - : -} - -## Do nothing! -pkg_prerm() { - : -} - -## Do nothing! -pkg_postrm() { - : -} diff --git a/sys-devel/gcc/gcc-4.7.2.ebuild b/sys-devel/gcc/gcc-4.7.2.ebuild deleted file mode 100644 index 79d59c40..00000000 --- a/sys-devel/gcc/gcc-4.7.2.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 -PATCH_VER="1.3" -UCLIBC_VER="1.0" - -# Hardened gcc 4 stuff -PIE_VER="0.5.2" -SPECS_VER="0.2.0" -SPECS_GCC_VER="4.4.3" -# arch/libc configurations known to be stable with {PIE,SSP}-by-default -PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64" -PIE_UCLIBC_STABLE="x86 arm amd64 ppc ppc64" -SSP_STABLE="amd64 x86 mips ppc ppc64 arm" -# uclibc need tls and nptl support for SSP support -# uclibc need to be >= 0.9.32 -SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm" -#end Hardened stuff - -inherit toolchain - -DESCRIPTION="The GNU Compiler Collection" - -LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" - -RDEPEND="~sys-devel/base-gcc-${PV} - !build? ( - gcj? ( - gtk? ( - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXtst - x11-proto/xproto - x11-proto/xextproto - =x11-libs/gtk+-2* - x11-libs/pango - ) - >=media-libs/libart_lgpl-2.1 - app-arch/zip - app-arch/unzip - ) - )" - -## Make sure we share all the USE flags in sys-devel/base-gcc -BASE_GCC_USE="fortran gcj gtk mudflap multilib nls nptl openmp altivec - bootstrap build doc fixed-point go graphite hardened - multislot cxx nopie nossp objc objc++ objc-gc test vanilla" -for base_use in ${BASE_GCC_USE}; do - RDEPEND+=" ~sys-devel/base-gcc-${PV}[${base_use}?]" -done -IUSE="${BASE_GCC_USE}" - -DEPEND="${RDEPEND} - amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )" -## Should this be moved to base-gcc? -## I guess the cross-* thing is now utterly broken -if [[ ${CATEGORY} != cross-* ]] ; then - PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )" -fi - -## Check for valid gcc profile. -src_unpack() { - # Since Sabayon's gcc ebuild are split into two parts, we have to - # build gcc with a different version of gcc, or terrible breakage - # will occur after sys-devel/base-gcc is installed, but the - # partner sys-devel/gcc still needs to be built. - - # While it is possible to rebuild Sabayon's split gcc from - # the same version, we have to disallow this also since - # we have no way of discerning if a configuration change - # is significant enough to cause breakage. - - GCC_PROFILE_VER=$(cat ${ROOT}/etc/env.d/gcc/config-$CHOST | awk -F- '{ print $NF }') - einfo "Checking for valid gcc profile to build ${P}" - - # Construct the Slot of the gcc version in the active profile. - GCC_PROFILE_SLOT_MAJOR=$(echo ${GCC_PROFILE_VER} | awk -F. '{ print $1 }') - GCC_PROFILE_SLOT_MINOR=$(echo ${GCC_PROFILE_VER} | awk -F. '{ print $2 }') - GCC_PROFILE_SLOT="${GCC_PROFILE_SLOT_MAJOR}.${GCC_PROFILE_SLOT_MINOR}" - einfo "Current gcc profile version Slot is: ${GCC_PROFILE_SLOT}" - if [[ "${GCC_PROFILE_SLOT}" = "${SLOT}" ]] ; then - eerror "Error!" - eerror "The active gcc-profile is for sys-devel/gcc slot ${SLOT}." - eerror "Sabayon's split sys-devel/gcc package MUST be built" - eerror "with another slotted version of sys-devel/gcc active." - die "Invalid gcc profile selected!" - fi - - if has_version '=glibc-2.12 #362315" - EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" - fi - - # drop the x32 stuff once 4.7 goes stable - case ${CHOST} in - x86_64*) has x32 $(get_all_abis) || EPATCH_EXCLUDE+=" 80_all_gcc-4.6-x32.patch" ;; - esac - - toolchain_src_unpack - - use vanilla && return 0 - - [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch - - # Fix http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47719 - epatch "${FILESDIR}/${PN}-4.6.2-fix-ICE-on-arm.patch" -} - -## Remove lto conditional -pkg_setup() { - toolchain_pkg_setup - - ewarn - ewarn "LTO support is still experimental and unstable." - ewarn "Any bugs resulting from the use of LTO will not be fixed." - ewarn -} - -## Just install libgcc stuff -src_install() { - toolchain_src_install - - # now drop what's provided by sys-devel/base-gcc-${PV}:${SLOT} - base_gcc_libs="libgfortran.so* libgcc_s.so* libobjc.so* - libobjc_gc.so* libmudflap.so* libmudflapth.so* libgomp.so* libstdc++.so* - libquadmath.so*" - base_multilib_gcc_libs="32/libgfortran.so* 32/libobjc.so* 32/libobjc_gc.so* - 32/libgcc_s.so* 32/libgomp.so* 32/libmudflap.so* - 32/libmudflapth.so* 32/libstdc++.so* 32/libquadmath.so*" - for gcc_lib in ${base_gcc_libs}; do - # -f is used because the file might not be there - rm "${D}"${LIBPATH}/${gcc_lib} -rf || die "cannot execute rm on ${gcc_lib}" - debug_dir="${D}"/usr/lib/debug - if [ -d "${debug_dir}" ]; then - rm "${debug_dir}"${LIBPATH}/${gcc_lib}.debug -rf || die "cannot execute rm on ${gcc_lib}.debug" - fi - done - if use multilib; then - for gcc_lib in ${base_multilib_gcc_libs}; do - # -f is used because the file might not be there - rm "${D}"${LIBPATH}/${gcc_lib} -rf || die "cannot execute rm on ${gcc_lib}" - debug_dir="${D}"/usr/lib/debug - if [ -d "${debug_dir}" ]; then - rm "${debug_dir}"${LIBPATH}/${gcc_lib}.debug -rf || die "cannot execute rm on ${gcc_lib}.debug" - fi - done - fi - # then .mo files provided by sys-devel/base-gcc-${PV}:${SLOT} - find "${D}"${DATAPATH}/locale -name libstdc++.mo -delete - find "${D}"${DATAPATH}/info -name libgomp.info* -delete - find "${D}"${DATAPATH}/info -name libquadmath.info* -delete - - # drop stuff from env.d, provided by sys-devel/base-gcc-${PV}:${SLOT} - rm "${D}"/etc/env.d -rf -} -- cgit v1.2.3