From a69229a822ffb97f88d77640d0c6d03da3fb9437 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 9 Apr 2018 13:21:14 -0400 Subject: [PATCH] bump(sys-firmware/sgabios): sync with upstream --- .../md5-cache/sys-firmware/sgabios-0.1_pre8 | 10 ++-- .../sys-firmware/sgabios-0.1_pre8-r1 | 12 ++++ .../sys-firmware/sgabios/ChangeLog | 27 --------- .../sys-firmware/sgabios/Manifest | 28 +-------- .../files/sgabios-0.1_pre8-build-cc.patch | 23 ++++++++ .../sys-firmware/sgabios/metadata.xml | 11 +++- .../sgabios/sgabios-0.1_pre8-r1.ebuild | 58 +++++++++++++++++++ .../sgabios/sgabios-0.1_pre8.ebuild | 35 ++++++----- 8 files changed, 125 insertions(+), 79 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/ChangeLog create mode 100644 sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/files/sgabios-0.1_pre8-build-cc.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8 index b8bce60e00..7410e8afce 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8 @@ -1,10 +1,10 @@ -DEFINED_PHASES=compile install prepare setup +DEFINED_PHASES=compile install prepare DESCRIPTION=serial graphics adapter bios option rom for x86 EAPI=4 -HOMEPAGE=http://code.google.com/p/sgabios/ -KEYWORDS=amd64 ~ppc ~ppc64 x86 +HOMEPAGE=https://code.google.com/p/sgabios/ +KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 LICENSE=Apache-2.0 SLOT=0 -SRC_URI=mirror://gentoo/sgabios-0.1_pre8.tar.xz http://dev.gentoo.org/~cardoe/distfiles/sgabios-0.1_pre8.tar.xz http://dev.gentoo.org/~cardoe/distfiles/sgabios-0.1_pre8-bins.tar.xz +SRC_URI=mirror://gentoo/sgabios-0.1_pre8.tar.xz https://dev.gentoo.org/~cardoe/distfiles/sgabios-0.1_pre8.tar.xz https://dev.gentoo.org/~cardoe/distfiles/sgabios-0.1_pre8-bins.tar.xz _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=8fba102d947723738ff646fe554a8279 +_md5_=f8d5709e25d849f153232c73b3837daa diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1 new file mode 100644 index 0000000000..1725ccd46c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install prepare +DESCRIPTION=serial graphics adapter bios option rom for x86 +EAPI=6 +HOMEPAGE=https://code.google.com/p/sgabios/ +IUSE=+binary +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 +LICENSE=Apache-2.0 +REQUIRED_USE=!amd64? ( !x86? ( binary ) ) +SLOT=0 +SRC_URI=mirror://gentoo/sgabios-0.1_pre8.tar.xz !binary? ( https://dev.gentoo.org/~cardoe/distfiles/sgabios-0.1_pre8.tar.xz ) binary? ( https://dev.gentoo.org/~cardoe/distfiles/sgabios-0.1_pre8-bins.tar.xz ) +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=e2ed3d6eaf0b105045a80af8bb4e3ee5 diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/ChangeLog deleted file mode 100644 index 0e6496ed6c..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/ChangeLog +++ /dev/null @@ -1,27 +0,0 @@ -# ChangeLog for sys-firmware/sgabios -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-firmware/sgabios/ChangeLog,v 1.5 2014/04/30 21:07:36 vapier Exp $ - - 30 Apr 2014; Mike Frysinger sgabios-0.1_pre8.ebuild: - Add epatch_user support #487100 by Hristo Venev. - - 30 Jun 2013; Doug Goldstein sgabios-0.1_pre8.ebuild: - For users using the gold linker, make the build process a little more friendly - by automatically selecting the bfd linker and pointing them to the bug - explaining why gold won't work. bug #438056 - - 21 Nov 2012; Agostino Sarubbo sgabios-0.1_pre8.ebuild: - Stable for x86, wrt to bug #440092 - - 03 Nov 2012; sgabios-0.1_pre8.ebuild: - Stable for amd64, wrt bug #440092 - - 23 Jul 2012; Doug Goldstein sgabios-0.1_pre8.ebuild, - +files/sgabios-0.1_pre8-makefile.patch: - Fix build issue. bug #427678 - -*sgabios-0.1_pre8 (22 Jul 2012) - - 22 Jul 2012; Doug Goldstein +sgabios-0.1_pre8.ebuild, - +metadata.xml: - Add initial version diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/Manifest b/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/Manifest index 6676ef81cb..62f4f17671 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/Manifest @@ -1,26 +1,2 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX sgabios-0.1_pre8-makefile.patch 395 SHA256 d618fc84175cd31c8f8dc7887ad448455e4a404af272b242fac4013235b657cc SHA512 7c111af2fff59b0ca6d4b39d04715d404bffa0f71a337b43f7dd091af6e40e85b790ed8b560039d5702d07e1ae47f2c204e891373f11d2ee4aa1541cb471c566 WHIRLPOOL 056f71911a94e90781bf677b8a06903a45a94cf708d743169b2974ba4472220c9875685faa387c20831a9827984b188287de812ca032ff395c33373de9736786 -DIST sgabios-0.1_pre8-bins.tar.xz 2704 SHA256 f982ec467790432f6be662bd58b51e78f80184229ecab5f23d4c0ea2419c1b9d SHA512 46fc02200b3fa2e45c954a2b6e4cd40f10d6969fd05ef4d441402c7390b4e83390250972ef0ea891635400cad22a4d8fd2b66b56afa91d03e1e0b99132e09c0d WHIRLPOOL 7b30b6a40f7b8d5b03482179f48c23910283e45f8eaac538533b5d24289d1ada6d0e6e5ecac3260e46dedc2a1e325fa096b3ae505b96fd1716e98f80be0d209e -DIST sgabios-0.1_pre8.tar.xz 27200 SHA256 d6f01fe343828c3323c45c000b5a2f906f1c3aa6f788ca8b31669b4a05a3d31d SHA512 68e2a894eb5b99cda2b0e96ade891e24397ac962a777a97dbb526f4570e5734d36a88fde1ef64ed7a887cd8bfc500c91c48849d2c26aca6ce7e36dd80aaf361e WHIRLPOOL de12b91a0304d6465186b9959d873061205bb055823408c84370a7563b46acd7cc955eab6e8b78a54d928bbb65281a9236e4c434fc5df707c5fffc160e311bd2 -EBUILD sgabios-0.1_pre8.ebuild 1135 SHA256 2f5fb3b2f7c04a7d2dcc6d325807543ef7ccd8ed494608a645e70f4b74516aa7 SHA512 5635f1f3ec837e60631b70d7e932457fce4e7b2bbacb00191b8269243d213588b65c8b09a61052e775c20530d1c358b16009fc851f1742c96db7b2d3ec46d46a WHIRLPOOL 7adee4ed5742c227f8c0ffa01fb53b9cc2baf2164e7c4dc3b17df197a329657c1aa99df9e7a3ca9838a54dd9d0ce0d77d4e06b3b3b167f6004e1ead724016020 -MISC ChangeLog 1119 SHA256 16be44c4b0cb19074f05fb19becfbe228c7eaf8442f572b7004af60598e7ab8b SHA512 8172c4cbef0a123880d74a7ad0f5759f078e8c0f6e71ceb1351d5184f6ba6309923e758435961291d5e937d86edbe742654bff7fbcfa8d0d7425c83099ad1c02 WHIRLPOOL a904d1087809977a914475c4a3c4ededb73baca80124abe47910cfeba5641417739855202ad9558d36ff947b94b2ddec3f2500a4e478ae6b1025c5527dc92c29 -MISC metadata.xml 253 SHA256 c9ca6980b185e0d86b42303a98572fd62ea4e18a796679b1583a4990bb40da7d SHA512 e313f627ded525c99fc31aeed49d1a59b532a7c108239f2f680c053cfe536c67a29d630171b900adbfbd04fb6230148b3a82d5f62a6b9c937caf6cb1ed9beefa WHIRLPOOL 7c1e1f886ef70ed91d2879fe9d1a67ada183f96b3ae6c3869acdcbce0f8677566f16e18a2cdfe7472432fd5e5649b6b68046db1b9633736e4b182c91196b472f ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAEBCAAGBQJTYWYdAAoJEPGu1DbS6WIAUVUP/RMS+hK4d/Zt8UtvhqtA0qvH -ZnB4PwWlT4oHUlNvlU5CXVncVkdhabWdQrYqEVKL2czTnUNAlfTKhHi+qfBY6YkZ -3hOrqGDECRLVSQDXsBwnN3hfHhnQDEVfI2PbChBwIQk7o59h+++7l23OUk68BzNE -2vDrAG7vzON57FWbBs8UIvjRoc+itwMPiMFBQcoc4gniXo4Hq7hroANa23XFVQ6m -aCxDMBHkz7GRLMN8AZCHIUM6JzP9VVm0lYq6fsNgJXqxJ6ql6kAEUltkOONsiyLu -CHoOEsTCRwdpISRwSw/dyAJ4VSRHSYxoEz/aVH+ecu/NmpnyzB5Nq9nJAdVAJuzI -LcGNRH8TATR0qqba5zkArSpEdgR4x41bMuyD+AUjhyesTT1iLTiYuh38DLY0E/1V -lybgC/KvCNPKnX1Oxk823WhBVb4p3NtIJzjh79Iy+pTrKyTSmj9cn58mOYPp8Tsy -GoSunscDxeh6KCOMUQvRCjTxntG3D5m7LA508/i0O0cVVBjR7mDDDjvxwUGF3wG/ -dwgY5TI6ggPaiHhaXwxVtceNP+otahNuCgFj0MIXiGYAH3L+Co7QlnG8THSJ7P4S -Arz0fZWqumcCRmZ8dYlVwwvxsTqvBWczRsEA187DVBMKdp1R8f4YRJ3vUKvWat3y -uCkAlhxVdnjlgxOrgT1D -=vPtp ------END PGP SIGNATURE----- +DIST sgabios-0.1_pre8-bins.tar.xz 2704 BLAKE2B 8efcf613a4857467cc3cfbc3f6402bca091892f0b2137ff65caf2b444610c86c1db0e61505bfe48ed8d6ccc9e8928190c2a38693aeddd523e27d22a29e777044 SHA512 46fc02200b3fa2e45c954a2b6e4cd40f10d6969fd05ef4d441402c7390b4e83390250972ef0ea891635400cad22a4d8fd2b66b56afa91d03e1e0b99132e09c0d +DIST sgabios-0.1_pre8.tar.xz 27200 BLAKE2B 8ea535f2fcc8f7105a278202648e06722e7463e66ff3ccf824cd3a672a7908e7223f27678ebd4ca73eb19abaff75e082ea7b9bc222332436f31a8840443d7b44 SHA512 68e2a894eb5b99cda2b0e96ade891e24397ac962a777a97dbb526f4570e5734d36a88fde1ef64ed7a887cd8bfc500c91c48849d2c26aca6ce7e36dd80aaf361e diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/files/sgabios-0.1_pre8-build-cc.patch b/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/files/sgabios-0.1_pre8-build-cc.patch new file mode 100644 index 0000000000..6cdac84c6a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/files/sgabios-0.1_pre8-build-cc.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/552280 + +--- a/Makefile ++++ b/Makefile +@@ -20,6 +20,9 @@ + BUILD_USER = \"$(shell whoami)\" + + CFLAGS := -Wall -Os -m32 -nostdlib ++BUILD_CFLAGS := -Wall -O2 ++BUILD_CC ?= $(CC) ++BUILD_LD ?= $(BUILD_CC) + + ASFLAGS := $(CFLAGS) + ASFLAGS += -DBUILD_DATE="$(BUILD_DATE)" +@@ -55,7 +56,7 @@ + $(LD) $(LDFLAGS) $(OBJS) -o $@ + + csum8: csum8.c +- $(CC) -Wall -O2 -o $@ $< ++ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -o $@ $< + + sgabios.o: buildinfo + diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/metadata.xml index c2e3412204..a1bc76dbe5 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/metadata.xml @@ -1,10 +1,15 @@ - + cardoe@gentoo.org Doug Goldstein - qemu + + qemu@gentoo.org + Gentoo QEMU Project + + + Use pre-built binaries + - diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild new file mode 100644 index 0000000000..bbf4403ff4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils toolchain-funcs + +DESCRIPTION="serial graphics adapter bios option rom for x86" +HOMEPAGE="https://code.google.com/p/sgabios/" +SRC_URI="mirror://gentoo/${P}.tar.xz + !binary? ( https://dev.gentoo.org/~cardoe/distfiles/${P}.tar.xz ) + binary? ( https://dev.gentoo.org/~cardoe/distfiles/${P}-bins.tar.xz )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="+binary" + +REQUIRED_USE="!amd64? ( !x86? ( binary ) )" + +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-build-cc.patch #552280 +) + +src_prepare() { + if use binary; then + eapply_user + return + fi + default +} + +src_compile() { + use binary && return + + tc-ld-disable-gold + tc-export_build_env BUILD_CC + emake \ + BUILD_CC="${BUILD_CC}" \ + BUILD_CFLAGS="${BUILD_CFLAGS}" \ + BUILD_LDFLAGS="${BUILD_LDFLAGS}" \ + BUILD_CPPFLAGS="${BUILD_CPPFLAGS}" \ + CC="$(tc-getCC)" \ + LD="$(tc-getLD)" \ + AR="$(tc-getAR)" \ + OBJCOPY="$(tc-getOBJCOPY)" +} + +src_install() { + insinto /usr/share/sgabios + + if use binary ; then + doins bins/sgabios.bin + else + doins sgabios.bin + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild index 7b24612f0b..b062b9588e 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild @@ -1,41 +1,40 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild,v 1.5 2014/04/30 21:07:36 vapier Exp $ EAPI=4 inherit eutils toolchain-funcs DESCRIPTION="serial graphics adapter bios option rom for x86" -HOMEPAGE="http://code.google.com/p/sgabios/" +HOMEPAGE="https://code.google.com/p/sgabios/" SRC_URI="mirror://gentoo/${P}.tar.xz - http://dev.gentoo.org/~cardoe/distfiles/${P}.tar.xz - http://dev.gentoo.org/~cardoe/distfiles/${P}-bins.tar.xz" + https://dev.gentoo.org/~cardoe/distfiles/${P}.tar.xz + https://dev.gentoo.org/~cardoe/distfiles/${P}-bins.tar.xz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="" -DEPEND="" -RDEPEND="${DEPEND}" - -pkg_setup() { - local myld=$(tc-getLD) - - ${myld} -v | grep -q "GNU gold" && \ - ewarn "gold linker unable to handle 16-bit code using ld.bfd. bug #438058" -} - src_prepare() { epatch "${FILESDIR}"/${P}-makefile.patch + epatch "${FILESDIR}"/${P}-build-cc.patch #552280 epatch_user } src_compile() { if use amd64 || use x86 ; then - emake CC=$(tc-getCC) LD="$(tc-getLD).bfd" AR=$(tc-getAR) \ - OBJCOPY=$(tc-getOBJCOPY) + tc-ld-disable-gold + tc-export_build_env BUILD_CC + emake \ + BUILD_CC="${BUILD_CC}" \ + BUILD_CFLAGS="${BUILD_CFLAGS}" \ + BUILD_LDFLAGS="${BUILD_LDFLAGS}" \ + BUILD_CPPFLAGS="${BUILD_CPPFLAGS}" \ + CC="$(tc-getCC)" \ + LD="$(tc-getLD)" \ + AR="$(tc-getAR)" \ + OBJCOPY="$(tc-getOBJCOPY)" fi }