| 1 |
nerdboy 13/11/25 03:09:48 |
| 2 |
|
| 3 |
Modified: gnat-gcc-4.6.4.ebuild gnat-gcc-4.5.4.ebuild |
| 4 |
ChangeLog |
| 5 |
Log: |
| 6 |
Updates (and a patch) for texinfo borkage. |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key ) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.3 dev-lang/gnat-gcc/gnat-gcc-4.6.4.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.6.4.ebuild?rev=1.3&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.6.4.ebuild?rev=1.3&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.6.4.ebuild?r1=1.2&r2=1.3 |
| 16 |
|
| 17 |
Index: gnat-gcc-4.6.4.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.6.4.ebuild,v |
| 20 |
retrieving revision 1.2 |
| 21 |
retrieving revision 1.3 |
| 22 |
diff -u -r1.2 -r1.3 |
| 23 |
--- gnat-gcc-4.6.4.ebuild 20 Nov 2013 06:39:32 -0000 1.2 |
| 24 |
+++ gnat-gcc-4.6.4.ebuild 25 Nov 2013 03:09:47 -0000 1.3 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2013 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.6.4.ebuild,v 1.2 2013/11/20 06:39:32 nerdboy Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.6.4.ebuild,v 1.3 2013/11/25 03:09:47 nerdboy Exp $ |
| 30 |
|
| 31 |
inherit gnatbuild |
| 32 |
|
| 33 |
@@ -8,7 +8,7 @@ |
| 34 |
HOMEPAGE="http://gcc.gnu.org/" |
| 35 |
LICENSE="GMGPL" |
| 36 |
|
| 37 |
-IUSE="lto openmp" |
| 38 |
+IUSE="doc lto openmp" |
| 39 |
|
| 40 |
BOOT_SLOT="4.4" |
| 41 |
|
| 42 |
@@ -31,7 +31,7 @@ |
| 43 |
>=sys-libs/ncurses-5.7" |
| 44 |
|
| 45 |
DEPEND="${RDEPEND} |
| 46 |
- <sys-apps/texinfo-5.1 |
| 47 |
+ doc? ( >=sys-apps/texinfo-5 ) |
| 48 |
>=sys-devel/bison-1.875 |
| 49 |
>=sys-libs/glibc-2.8 |
| 50 |
>=sys-devel/binutils-2.20" |
| 51 |
|
| 52 |
|
| 53 |
|
| 54 |
1.3 dev-lang/gnat-gcc/gnat-gcc-4.5.4.ebuild |
| 55 |
|
| 56 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.5.4.ebuild?rev=1.3&view=markup |
| 57 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.5.4.ebuild?rev=1.3&content-type=text/plain |
| 58 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.5.4.ebuild?r1=1.2&r2=1.3 |
| 59 |
|
| 60 |
Index: gnat-gcc-4.5.4.ebuild |
| 61 |
=================================================================== |
| 62 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.5.4.ebuild,v |
| 63 |
retrieving revision 1.2 |
| 64 |
retrieving revision 1.3 |
| 65 |
diff -u -r1.2 -r1.3 |
| 66 |
--- gnat-gcc-4.5.4.ebuild 8 Oct 2013 18:58:47 -0000 1.2 |
| 67 |
+++ gnat-gcc-4.5.4.ebuild 25 Nov 2013 03:09:48 -0000 1.3 |
| 68 |
@@ -1,6 +1,6 @@ |
| 69 |
# Copyright 1999-2013 Gentoo Foundation |
| 70 |
# Distributed under the terms of the GNU General Public License v2 |
| 71 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.5.4.ebuild,v 1.2 2013/10/08 18:58:47 george Exp $ |
| 72 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.5.4.ebuild,v 1.3 2013/11/25 03:09:48 nerdboy Exp $ |
| 73 |
|
| 74 |
inherit gnatbuild |
| 75 |
|
| 76 |
@@ -8,7 +8,7 @@ |
| 77 |
HOMEPAGE="http://gcc.gnu.org/" |
| 78 |
LICENSE="GMGPL" |
| 79 |
|
| 80 |
-IUSE="" |
| 81 |
+IUSE="doc" |
| 82 |
|
| 83 |
BOOT_SLOT="4.4" |
| 84 |
|
| 85 |
@@ -30,7 +30,7 @@ |
| 86 |
>=sys-libs/ncurses-5.7" |
| 87 |
|
| 88 |
DEPEND="${RDEPEND} |
| 89 |
- <sys-apps/texinfo-5.1 |
| 90 |
+ doc? ( sys-apps/texinfo ) |
| 91 |
>=sys-devel/bison-1.875 |
| 92 |
>=sys-libs/glibc-2.8 |
| 93 |
>=sys-devel/binutils-2.20" |
| 94 |
@@ -57,6 +57,18 @@ |
| 95 |
} |
| 96 |
|
| 97 |
src_compile() { |
| 98 |
+ # work-around for downgrading texinfo. See bug #483192 |
| 99 |
+ if use doc ; then |
| 100 |
+ if has_version ">=sys-apps/texinfo-5.1" ; then |
| 101 |
+ ewarn "Disabling info docs. Please downgrade texinfo to less than 5.x or" |
| 102 |
+ ewarn "use ${PN}-4.6 instead (as upstream has only patched 4.6 and higher)." |
| 103 |
+ epatch "${FILESDIR}"/${P}-tex-version-workaround.patch |
| 104 |
+ fi |
| 105 |
+ else |
| 106 |
+ elog "Disabling info docs." |
| 107 |
+ epatch "${FILESDIR}"/${P}-tex-version-workaround.patch |
| 108 |
+ fi |
| 109 |
+ |
| 110 |
# looks like gnatlib_and_tools and gnatlib_shared have become part of |
| 111 |
# bootstrap |
| 112 |
gnatbuild_src_compile configure make-tools bootstrap |
| 113 |
|
| 114 |
|
| 115 |
|
| 116 |
1.66 dev-lang/gnat-gcc/ChangeLog |
| 117 |
|
| 118 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gnat-gcc/ChangeLog?rev=1.66&view=markup |
| 119 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gnat-gcc/ChangeLog?rev=1.66&content-type=text/plain |
| 120 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gnat-gcc/ChangeLog?r1=1.65&r2=1.66 |
| 121 |
|
| 122 |
Index: ChangeLog |
| 123 |
=================================================================== |
| 124 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/ChangeLog,v |
| 125 |
retrieving revision 1.65 |
| 126 |
retrieving revision 1.66 |
| 127 |
diff -u -r1.65 -r1.66 |
| 128 |
--- ChangeLog 20 Nov 2013 06:39:32 -0000 1.65 |
| 129 |
+++ ChangeLog 25 Nov 2013 03:09:48 -0000 1.66 |
| 130 |
@@ -1,6 +1,13 @@ |
| 131 |
# ChangeLog for dev-lang/gnat-gcc |
| 132 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 133 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/ChangeLog,v 1.65 2013/11/20 06:39:32 nerdboy Exp $ |
| 134 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/ChangeLog,v 1.66 2013/11/25 03:09:48 nerdboy Exp $ |
| 135 |
+ |
| 136 |
+ 25 Nov 2013; Steve Arnold <nerdboy@g.o> gnat-gcc-4.5.4.ebuild, |
| 137 |
+ gnat-gcc-4.6.4.ebuild, +files/gnat-gcc-4.5.4-tex-version-workaround.patch: |
| 138 |
+ Updates (and a patch from Martin von Gagern) for texinfo borkage. Closes |
| 139 |
+ bug #483192). Upstream patches only go back to 4.6.4 so the workaround |
| 140 |
+ uses the aforementioned patch to disable info docs if texinfo-5.x is |
| 141 |
+ installed and the doc USE flag is enabled. |
| 142 |
|
| 143 |
20 Nov 2013; Steve Arnold <nerdboy@g.o> gnat-gcc-4.6.4.ebuild: |
| 144 |
Adding openmp USE flag for updated gnatbuild.eclass. |
Archives