diff options
author | Joseph Jezak <josejx@gentoo.org> | 2005-07-12 00:55:18 +0000 |
---|---|---|
committer | Joseph Jezak <josejx@gentoo.org> | 2005-07-12 00:55:18 +0000 |
commit | 9b40fc5e3c95de2f45c77ca311a14c928defd27e (patch) | |
tree | fbae6bba3ec0d36ed65ea7ce540dfca82f2208cc /sys-boot | |
parent | stable on mips (diff) | |
download | historical-9b40fc5e3c95de2f45c77ca311a14c928defd27e.tar.gz historical-9b40fc5e3c95de2f45c77ca311a14c928defd27e.tar.bz2 historical-9b40fc5e3c95de2f45c77ca311a14c928defd27e.zip |
Fixed MAKEOPTS mess for bug #98463 and removed kernel 2.6 check
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'sys-boot')
-rw-r--r-- | sys-boot/yaboot/ChangeLog | 7 | ||||
-rw-r--r-- | sys-boot/yaboot/Manifest | 24 | ||||
-rw-r--r-- | sys-boot/yaboot/yaboot-1.3.11-r1.ebuild | 9 | ||||
-rw-r--r-- | sys-boot/yaboot/yaboot-1.3.12-r1.ebuild | 20 | ||||
-rw-r--r-- | sys-boot/yaboot/yaboot-1.3.13.ebuild | 22 |
5 files changed, 29 insertions, 53 deletions
diff --git a/sys-boot/yaboot/ChangeLog b/sys-boot/yaboot/ChangeLog index 7dc3ad7e6b08..724a804b806a 100644 --- a/sys-boot/yaboot/ChangeLog +++ b/sys-boot/yaboot/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-boot/yaboot # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.18 2005/07/10 18:37:29 dostrow Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.19 2005/07/12 00:55:18 josejx Exp $ + + 12 Jul 2005; Joseph Jezak <josejx@gentoo.org> yaboot-1.3.11-r1.ebuild, + yaboot-1.3.12-r1.ebuild, yaboot-1.3.13.ebuild: + Cleaned up MAKEOPTS mess, removed kernel 2.6.3 check as we don't have those + kernel versions in the tree any longer. 10 Jul 2005; Daniel Ostrow <dostrow@gentoo.org> yaboot-1.3.13.ebuild: Add ibm use flag check for rdeps on hfs stuff. diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest index a469a573393c..0f7860127c91 100644 --- a/sys-boot/yaboot/Manifest +++ b/sys-boot/yaboot/Manifest @@ -1,19 +1,19 @@ -MD5 59cabde6e013b232088352f42bc05f31 ChangeLog 6135 +MD5 dd22fc34466940a2063af292e6e7efa1 ChangeLog 6377 +MD5 26fab11fcffe9efa9c34ab0118369c29 yaboot-1.3.13.ebuild 1404 +MD5 02e04abd101bf97d1824b54f89f57559 yaboot-1.3.11-r1.ebuild 1120 MD5 9c2a69b11bc766ffdc32016e0bb1e967 metadata.xml 219 -MD5 1c7670cbce3f65d5531a6d576b3c4052 yaboot-1.3.11-r1.ebuild 1126 -MD5 bfebf016ba5890b6be8c43b28b1a42c0 yaboot-1.3.12-r1.ebuild 1696 -MD5 8ff0657a3f5748aadb08ba4e60af909a yaboot-1.3.13.ebuild 1762 -MD5 15c7e4852d3cc4ca21044014d33737ee files/chrpfix.patch 979 -MD5 79f1707ceab2b7d7daa98a62e15ca98c files/digest-yaboot-1.3.11-r1 65 +MD5 bb8c0a6b8793792cbaab2f0a9a7b8ddb yaboot-1.3.12-r1.ebuild 1339 MD5 2831519fd08125184e05a815a51d63ec files/digest-yaboot-1.3.12-r1 65 +MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.11.patch 1987 MD5 7ec6d127710031625482bca6563021eb files/digest-yaboot-1.3.13 65 -MD5 e51befd96c8aaa36f151790fad733456 files/yaboot-1.3.11-ofpath-fix.patch 1974 -MD5 627830060775688b9e45e1b1a6dd4cfe files/yaboot-1.3.12-k2sata-ofpath.patch 792 -MD5 de48fb3a5eb3326145096a19c6b07a6a files/yaboot-1.3.13-ofpath.patch 2921 -MD5 707fd650a40d63439e1417660b062d2a files/yaboot-3.4.patch 292 MD5 22f651a4c0cd422e1245d3a905f9ce31 files/yabootconfig 18898 +MD5 79f1707ceab2b7d7daa98a62e15ca98c files/digest-yaboot-1.3.11-r1 65 +MD5 de48fb3a5eb3326145096a19c6b07a6a files/yaboot-1.3.13-ofpath.patch 2921 +MD5 627830060775688b9e45e1b1a6dd4cfe files/yaboot-1.3.12-k2sata-ofpath.patch 792 +MD5 116ac118087f29161456b653a8429522 files/yabootconfig-1.3.13.patch 1655 MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.10.patch 1987 -MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.11.patch 1987 MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.12.patch 1987 -MD5 116ac118087f29161456b653a8429522 files/yabootconfig-1.3.13.patch 1655 MD5 ea6db5f8d6326bf51dfe4f085513e210 files/yaboot-nopiessp.patch 1884 +MD5 e51befd96c8aaa36f151790fad733456 files/yaboot-1.3.11-ofpath-fix.patch 1974 +MD5 707fd650a40d63439e1417660b062d2a files/yaboot-3.4.patch 292 +MD5 15c7e4852d3cc4ca21044014d33737ee files/chrpfix.patch 979 diff --git a/sys-boot/yaboot/yaboot-1.3.11-r1.ebuild b/sys-boot/yaboot/yaboot-1.3.11-r1.ebuild index 51e20831308d..bf67a126528a 100644 --- a/sys-boot/yaboot/yaboot-1.3.11-r1.ebuild +++ b/sys-boot/yaboot/yaboot-1.3.11-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.11-r1.ebuild,v 1.7 2005/07/03 13:14:24 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.11-r1.ebuild,v 1.8 2005/07/12 00:55:18 josejx Exp $ inherit eutils toolchain-funcs @@ -19,8 +19,6 @@ DEPEND="sys-apps/powerpc-utils PROVIDE="virtual/bootloader" -MAKEOPTS='PREFIX=/usr MANDIR=share/man' - src_compile() { export -n CFLAGS export -n CXXFLAGS @@ -30,12 +28,13 @@ src_compile() { epatch ${FILESDIR}/chrpfix.patch #took from http://penguinppc.org/~eb/files/ofpath epatch ${FILESDIR}/${P}-ofpath-fix.patch - emake ${MAKEOPTS} CC="$(tc-getCC)" || die + emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" || die + } src_install() { cp etc/yaboot.conf etc/yaboot.conf.bak sed -e 's/\/local//' etc/yaboot.conf >| etc/yaboot.conf.edit mv -f etc/yaboot.conf.edit etc/yaboot.conf - make ROOT=${D} ${MAKEOPTS} install || die + make ROOT=${D} PREFIX=/usr MANDIR=share/man install || die } diff --git a/sys-boot/yaboot/yaboot-1.3.12-r1.ebuild b/sys-boot/yaboot/yaboot-1.3.12-r1.ebuild index 835ca3af7dd8..45309c9b6613 100644 --- a/sys-boot/yaboot/yaboot-1.3.12-r1.ebuild +++ b/sys-boot/yaboot/yaboot-1.3.12-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.12-r1.ebuild,v 1.9 2005/07/03 13:14:24 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.12-r1.ebuild,v 1.10 2005/07/12 00:55:18 josejx Exp $ inherit eutils toolchain-funcs @@ -19,20 +19,6 @@ DEPEND="sys-apps/powerpc-utils PROVIDE="virtual/bootloader" -MAKEOPTS='PREFIX=/usr MANDIR=share/man' - -pkg_setup() { - case "$(uname -r)" in - 2.5.*|2.6.0*|2.6.1|2.6.1-*|2.6.2|2.6.2-*) - eerror "You are running Linux kernel `uname -r` which is not supported" - eerror "Please note if you are running a 2.6 kernel the verison" - eerror "of ofpath included in this revision of yaboot requires" - eerror "that you run a kernel >= 2.6.3." - die - ;; - esac -} - src_compile() { export -n CFLAGS export -n CXXFLAGS @@ -42,14 +28,14 @@ src_compile() { epatch ${FILESDIR}/chrpfix.patch epatch ${FILESDIR}/yaboot-3.4.patch epatch ${FILESDIR}/yaboot-1.3.12-k2sata-ofpath.patch - emake ${MAKEOPTS} CC="$(tc-getCC)" || die + emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" || die } src_install() { cp etc/yaboot.conf etc/yaboot.conf.bak sed -e 's/\/local//' etc/yaboot.conf >| etc/yaboot.conf.edit mv -f etc/yaboot.conf.edit etc/yaboot.conf - make ROOT=${D} ${MAKEOPTS} install || die + make ROOT=${D} PREFIX=/usr MANDIR=share/man install || die } pkg_postinst() { diff --git a/sys-boot/yaboot/yaboot-1.3.13.ebuild b/sys-boot/yaboot/yaboot-1.3.13.ebuild index cdef351e4c68..a7cf5499f93d 100644 --- a/sys-boot/yaboot/yaboot-1.3.13.ebuild +++ b/sys-boot/yaboot/yaboot-1.3.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.13.ebuild,v 1.6 2005/07/10 18:37:29 dostrow Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.13.ebuild,v 1.7 2005/07/12 00:55:18 josejx Exp $ inherit eutils toolchain-funcs @@ -19,20 +19,6 @@ RDEPEND="!ibm? ( sys-fs/hfsutils ) PROVIDE="virtual/bootloader" -MAKEOPTS='PREFIX=/usr MANDIR=share/man' - -pkg_setup() { - case "$(uname -r)" in - 2.5.*|2.6.0*|2.6.1|2.6.1-*|2.6.2|2.6.2-*) - eerror "You are running Linux kernel `uname -r` which is not supported" - eerror "Please note if you are running a 2.6 kernel the verison" - eerror "of ofpath included in this revision of yaboot requires" - eerror "that you run a kernel >= 2.6.3." - die - ;; - esac -} - src_compile() { export -n CFLAGS export -n CXXFLAGS @@ -43,18 +29,18 @@ src_compile() { epatch ${FILESDIR}/yaboot-3.4.patch epatch ${FILESDIR}/yaboot-${PV}-ofpath.patch epatch ${FILESDIR}/yaboot-nopiessp.patch - emake ${MAKEOPTS} CC="$(tc-getCC)" || die + emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" || die } src_install() { cp etc/yaboot.conf etc/yaboot.conf.bak sed -e 's/\/local//' etc/yaboot.conf >| etc/yaboot.conf.edit mv -f etc/yaboot.conf.edit etc/yaboot.conf - make ROOT=${D} ${MAKEOPTS} install || die + make ROOT=${D} PREFIX=/usr MANDIR=share/man install || die } pkg_postinst() { ewarn "Please note if you are running a 2.6 kernel the verison" ewarn "of ofpath included in this revision of yaboot requires" - ewarn "that you run a kernel >= 2.6.3 Prior versions are unsupported." + ewarn "that you run a kernel >= 2.6.3, prior versions are unsupported." } |