diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-04-28 23:50:47 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-04-28 23:50:47 +0000 |
| commit | e63f264f410fc5da896256befd2d6e5cf6ac4e89 (patch) | |
| tree | f7df18784126b3511de983969e3823b1665345d9 /sys-boot | |
| parent | Drop xopen change as it does not backport well when paired with other feature... (diff) | |
| download | historical-e63f264f410fc5da896256befd2d6e5cf6ac4e89.tar.gz historical-e63f264f410fc5da896256befd2d6e5cf6ac4e89.tar.bz2 historical-e63f264f410fc5da896256befd2d6e5cf6ac4e89.zip | |
Minor tweaks.
Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/grub/Manifest | 12 | ||||
| -rw-r--r-- | sys-boot/grub/grub-2.00-r3.ebuild | 6 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 8 |
4 files changed, 18 insertions, 14 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index d7c4b824b471..bf0c93fe6ee5 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.258 2013/04/28 19:44:09 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.259 2013/04/28 23:50:44 floppym Exp $ + + 28 Apr 2013; Mike Gilbert <floppym@gentoo.org> grub-2.00-r3.ebuild, + grub-9999.ebuild: + Minor tweaks. 28 Apr 2013; Mike Gilbert <floppym@gentoo.org> grub-9999.ebuild, metadata.xml: Rewrite ebuild around autotools-utils and multibuild eclasses. Add diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 0ea361338981..845d678773d6 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -64,15 +64,15 @@ EBUILD grub-0.97.ebuild 4238 SHA256 d93dd5dca80c822e0659007b827966fb69c7f702b13b EBUILD grub-1.99-r2.ebuild 8413 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c59e739015dc949a51011f585 SHA512 520bd623cfaf70451b4331f2dc464982f4de1b0c070ee8c0b336c9d16589aaa96924ea923f4c47ccb07d3c8f6da987a89ed285f1f4fa8f922465ab912e8940bd WHIRLPOOL 5abb91bf54a5024b225e7c3891b884827b31e6e8e380db9aa37fd520c55cd2e94ce1e7545271d52a58baab63446906cb69440177a4678000ac519088b9ae6966 EBUILD grub-2.00-r1.ebuild 8862 SHA256 c88e12c0de910726920616a0fb9fecd1dab504532287d9742015faab713268ab SHA512 2589fb92dee5d6a25af6a9584ccb45c6b019d219fde0c3dbde1e35abc8a82e7ce8793375e694c30372ea98da9e7383db98b6639c8ee93d23dfb0b9cb6f0cc838 WHIRLPOOL 06f3d43667856a0d6c2fe6ebf3b89930171f047e66ed9df5d766b8851b9bb5ae0db7f72a6d319d16db18a1968b6a4d6c4bcf1b8532df168141bb9c9f0733d24a EBUILD grub-2.00-r2.ebuild 9647 SHA256 32f03a6d678df2b351fbeceb5baad0ccb3cdaa807c7176c4a8a881cbee34eb97 SHA512 5d2ccd978741e46d4dd5a8895371be56e89426adfb99e556b2236a8bcd3f2aa441035c528112a86d00a5ea69cf2555d8d2505a608ff80be570a0d50c17997cc5 WHIRLPOOL eb49e0cddc27fabc18770d76bc2019e6925abaaa7be5a963f181af1a4e1507e8c9fd6e28e78d35ad6bff7f13cf145707252bc1524a9eca8c880e82984755a961 -EBUILD grub-2.00-r3.ebuild 9741 SHA256 ae37d0683356f7b50fe3cfbd9c5edf3d0625c8de24734494a97e7befaae4e6db SHA512 802ffe22b3144167723af5f13e7f1b152012c15d84a12451fed9c0c04154e335707bca5ae5cd53c2ed679b356ea9194ac84ba67e03043712970cef475aaa68d8 WHIRLPOOL 3ac2b0b19485476ea5503b65e5c49d44ceb3c78c806e63221d1c055c3a0577f2892be66899252529bff73f51e54d206d8563bfcb21b6ef994dbcad77b3ca6669 +EBUILD grub-2.00-r3.ebuild 9756 SHA256 e5eed87e002e41852dd08ee79de3a36118441a2420a354ab418e66382756aa9d SHA512 98a4e4a1d5e8c0bd11c2c602408fb3fd95171c35977b9789fbebf6ec85d3aa9d8473ae891b20a979449f8985610a4367b666f38569bf686c833afc2f568344e4 WHIRLPOOL 2adc459b3b26693b136816b03aae9bb2050708fb697f0bbe63c96294e751d5c52925d9996fc6f5824fd9b5ef5aa2b7f76b48f4578096f3ea60d2693c0cd41542 EBUILD grub-2.00_beta6.ebuild 7140 SHA256 8026d9d32d21863e5427cac5b641fbc5f799662437bd9a40daa3f9a377a0de68 SHA512 35b5a7aa5224ba1f0d3dabaeb03d915b86a3c16419f6ef012c8092b198e8bbc054f22e4658930f704402066622b98c67c869f0c9cf5d74637c34ae786b0861fa WHIRLPOOL 54839cae4be956d12f8c62524923e9087f76c5e2c3c7db7cca074084deba71cd870238e514227a73a1131748fac501566afe29866231b68e4bbddbf2b465a71b -EBUILD grub-9999.ebuild 6136 SHA256 b97d72b5b53b21e08bfea4c02c4db52c6d06dbd12cc57616db5b7bfc82afd2ce SHA512 066a72e29e59775c81d3835a0e60e003035056258b1d7aea22efb80f7d57487fafcb828e029b7a61449d0822c8a110b8840dd1dac47006abe9b45269dc2c8f0c WHIRLPOOL 9c1c1a63dc2469614d1491e47a5e9ff11d6c9db4960185dac7ec2df3bf3d06e56668afea70ffe248b58d723a2ed7eed0cca52985e08aad234d0e3f2755f424ce -MISC ChangeLog 49801 SHA256 3c73411195c386f17f4021b69555725c3572f00f547676be60b776e24ee0e193 SHA512 7d86c80e09335f494adf08c3a7b39eab59699d57c922275d1a0a508b4c49bd0085223ce88af08fdc33d1a0bdcbc0c368b89eedaa14b86731e8e3e5187313c161 WHIRLPOOL e11bf8bca2a9a84d4cc03d181eb06a50a30e902df0be363fed09efd2ef0306e46418bcc19bee2be1753c9825edf880b1eabae66c3e5d6e89e61f0d255f6e8e39 +EBUILD grub-9999.ebuild 6163 SHA256 447bebbe7d9ec0187045ee55e80aae1dc27b5e81c2c56e128e0f2097b27b028d SHA512 69f62ec79f43ede2c5c9cb6f20601da4ebda78ce4ca79d9252cbf1edcc4bfb99443631338a220ce16f7f588618b5f067a8eddf00750dbfa062e9d01ec9f35657 WHIRLPOOL 38d41f5f041f1b111db91331224f791f322fc5e694b0d0329c4068efa5cb27ef7b9e256422370c1e4f7358a18af62b7657adaa50fa1fd4545afc90b309741ff6 +MISC ChangeLog 49908 SHA256 6fcbc15065218b0a27166588c69bd2db43f2ec4f9cf0d377e31b19afa02c52fb SHA512 6c39c3ffcbb93176d558744b11af0b2f09e75e0eb2703ca612daeb69c59618b2f3ca0a56be4eda3551425db5efa44e1ae3bc8fdd9fb118b957cf763d9a505259 WHIRLPOOL e3d386769e86309b117ba17109bfd9d0fc4bc4a0a40e30f37ae7b7e1c1a7880f57fa4f29bc5e4832392bb55639529aa7bb15f2653d342f31a4b59edc5985d93b MISC metadata.xml 852 SHA256 d03182ca221633a5a479beec5bad1444859f2c586ad4d7764a9f531687cc73c0 SHA512 190483450afea0409f50f592e0290744cfc9e10362ec9c0c0d02b6f9933788bfc6b88a2e37a7e5a26066b914b6979a5dac6c6a2e7fa861dc5e728b34aec37e5b WHIRLPOOL 9c904cae80a6cbe7a7b35ef1d889478e79aac5006aa693af2884a7c21483f90f943322bf9206921db39db706cb36b5b509b420199269a385b47e75c8b2c2bb42 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAlF9fA4ACgkQC77qH+pIQ6R1fgEAhZpp9JfnWZ1aMEPJZIoaKUIQ -i0VVMK3jargFylcRusAA/iHzFGvHsHlEeH8ZVJXhHoobJyyWNcMjaNcsB/yHNZ8g -=qdyy +iF4EAREIAAYFAlF9tdYACgkQC77qH+pIQ6TA+QD8DWzjriJbCEt00nXI7tHcc/yA +A+KTwverXlbkm69LV84BAJo+aram2bs1AmJ11vyDirolHdYk1koOOY6yqb7DPjVy +=Qls8 -----END PGP SIGNATURE----- diff --git a/sys-boot/grub/grub-2.00-r3.ebuild b/sys-boot/grub/grub-2.00-r3.ebuild index 268ed4f05d38..634fd0f51f97 100644 --- a/sys-boot/grub/grub-2.00-r3.ebuild +++ b/sys-boot/grub/grub-2.00-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00-r3.ebuild,v 1.1 2013/04/27 20:56:04 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00-r3.ebuild,v 1.2 2013/04/28 23:50:44 floppym Exp $ EAPI=4 @@ -180,7 +180,7 @@ grub_src_configure() { ECONF_SOURCE="${S}" \ econf \ - --libdir=/usr/lib \ + --libdir="${EPREFIX}"/usr/lib \ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ --disable-werror \ --program-prefix= \ @@ -333,7 +333,7 @@ src_install() { use doc && grub_run_phase install_docs ${i} - mv "${ED}"usr/share/info/grub{,2}.info || die + mv "${ED%/}"/usr/share/info/grub{,2}.info || die # can't be in docs array as we use default_src_install in different builddir dodoc AUTHORS ChangeLog NEWS README THANKS TODO diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index d4e7f4d8678a..14c349d47313 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.89 2013/04/28 19:44:09 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.90 2013/04/28 23:50:44 floppym Exp $ EAPI=5 AUTOTOOLS_AUTO_DEPEND=yes @@ -167,8 +167,8 @@ grub_configure() { local myeconfargs=( --disable-werror --program-prefix= - --libdir=/usr/lib - --htmldir=/usr/share/doc/${PF}/html + --libdir="${EPREFIX}"/usr/lib + --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html $(use_enable debug mm-debug) $(use_enable debug grub-emu-usb) $(use_enable efiemu) @@ -217,7 +217,7 @@ src_install() { emake -C docs DESTDIR="${D}" install-html if use multislot; then - mv "${ED}"usr/share/info/grub{,2}.info || die + mv "${ED%/}"/usr/share/info/grub{,2}.info || die fi insinto /etc/default |