| 1 |
scarabeus 11/01/05 08:47:07 |
| 2 |
|
| 3 |
Modified: gle-3.1.0-r1.ebuild gle-3.0.1-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix building stable version. Update to EAPI=3. Introduce static-libs. Drop unneeded patch. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha10/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.11 media-libs/gle/gle-3.1.0-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gle/gle-3.1.0-r1.ebuild?rev=1.11&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gle/gle-3.1.0-r1.ebuild?rev=1.11&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gle/gle-3.1.0-r1.ebuild?r1=1.10&r2=1.11 |
| 15 |
|
| 16 |
Index: gle-3.1.0-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.1.0-r1.ebuild,v |
| 19 |
retrieving revision 1.10 |
| 20 |
retrieving revision 1.11 |
| 21 |
diff -u -r1.10 -r1.11 |
| 22 |
--- gle-3.1.0-r1.ebuild 5 Jan 2011 07:14:34 -0000 1.10 |
| 23 |
+++ gle-3.1.0-r1.ebuild 5 Jan 2011 08:47:06 -0000 1.11 |
| 24 |
@@ -1,6 +1,8 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.1.0-r1.ebuild,v 1.10 2011/01/05 07:14:34 xarthisius Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.1.0-r1.ebuild,v 1.11 2011/01/05 08:47:06 scarabeus Exp $ |
| 29 |
+ |
| 30 |
+EAPI=3 |
| 31 |
|
| 32 |
inherit autotools multilib |
| 33 |
|
| 34 |
@@ -11,22 +13,22 @@ |
| 35 |
LICENSE="Artistic GPL-2" |
| 36 |
SLOT="0" |
| 37 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
| 38 |
-IUSE="doc" |
| 39 |
+IUSE="doc static-libs" |
| 40 |
|
| 41 |
DEPEND="virtual/opengl |
| 42 |
- virtual/glu |
| 43 |
media-libs/freeglut |
| 44 |
app-admin/eselect-opengl" |
| 45 |
RDEPEND="${DEPEND}" |
| 46 |
|
| 47 |
-src_unpack() { |
| 48 |
- unpack ${A} |
| 49 |
- cd "${S}" |
| 50 |
- |
| 51 |
+src_prepare() { |
| 52 |
# Replace inclusion of malloc.h with stdlib.h as needed by Mac OS X and |
| 53 |
# FreeBSD. See bug #130340 |
| 54 |
sed -i -e 's:malloc.h:stdlib.h:g' src/* || die |
| 55 |
|
| 56 |
+ # use proper docdir |
| 57 |
+ sed -i -e 's:\$(datadir)/doc/gle:\$(datadir)/doc/${PF}:' doc/Makefile.am || die |
| 58 |
+ sed -i -e 's:\$(datadir)/doc/gle/html:\$(datadir)/doc/${PF}/html:' doc/html/Makefile.am || die |
| 59 |
+ |
| 60 |
# Don't build binary examples as they never get installed. See bug 141859 |
| 61 |
sed -i -e 's:examples::' Makefile.am || die |
| 62 |
|
| 63 |
@@ -35,21 +37,14 @@ |
| 64 |
eautoreconf |
| 65 |
} |
| 66 |
|
| 67 |
-src_compile() { |
| 68 |
- econf --with-x --x-libraries=/usr/$(get_libdir)/opengl/xorg-x11 |
| 69 |
- |
| 70 |
- if use doc; then |
| 71 |
- sed -e 's:\$(datadir)/doc/gle:\$(datadir)/doc/${PF}:' \ |
| 72 |
- -i doc/Makefile || die |
| 73 |
- sed -e 's:\$(datadir)/doc/gle/html:\$(datadir)/doc/${PF}/html:' \ |
| 74 |
- -i doc/html/Makefile || die |
| 75 |
- fi |
| 76 |
- |
| 77 |
- emake || die |
| 78 |
+src_configure() { |
| 79 |
+ econf \ |
| 80 |
+ --with-x \ |
| 81 |
+ $(use_enable static-libs static) \ |
| 82 |
+ --x-libraries=/usr/$(get_libdir)/opengl/xorg-x11 |
| 83 |
} |
| 84 |
|
| 85 |
src_install() { |
| 86 |
- emake -j1 DESTDIR="${D}" install || die |
| 87 |
- dodoc AUTHORS ChangeLog NEWS README || die |
| 88 |
- rm -rf "${D}"/usr/share/doc/gle |
| 89 |
+ emake -j1 DESTDIR="${D}" install || die "emake install failed" |
| 90 |
+ dodoc AUTHORS README |
| 91 |
} |
| 92 |
|
| 93 |
|
| 94 |
|
| 95 |
1.34 media-libs/gle/gle-3.0.1-r2.ebuild |
| 96 |
|
| 97 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gle/gle-3.0.1-r2.ebuild?rev=1.34&view=markup |
| 98 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gle/gle-3.0.1-r2.ebuild?rev=1.34&content-type=text/plain |
| 99 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gle/gle-3.0.1-r2.ebuild?r1=1.33&r2=1.34 |
| 100 |
|
| 101 |
Index: gle-3.0.1-r2.ebuild |
| 102 |
=================================================================== |
| 103 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.0.1-r2.ebuild,v |
| 104 |
retrieving revision 1.33 |
| 105 |
retrieving revision 1.34 |
| 106 |
diff -u -r1.33 -r1.34 |
| 107 |
--- gle-3.0.1-r2.ebuild 5 Jan 2011 07:14:34 -0000 1.33 |
| 108 |
+++ gle-3.0.1-r2.ebuild 5 Jan 2011 08:47:06 -0000 1.34 |
| 109 |
@@ -1,41 +1,46 @@ |
| 110 |
# Copyright 1999-2011 Gentoo Foundation |
| 111 |
# Distributed under the terms of the GNU General Public License v2 |
| 112 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.0.1-r2.ebuild,v 1.33 2011/01/05 07:14:34 xarthisius Exp $ |
| 113 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.0.1-r2.ebuild,v 1.34 2011/01/05 08:47:06 scarabeus Exp $ |
| 114 |
|
| 115 |
-inherit eutils |
| 116 |
+EAPI=3 |
| 117 |
+ |
| 118 |
+inherit autotools multilib |
| 119 |
|
| 120 |
DESCRIPTION="GL extrusion library" |
| 121 |
HOMEPAGE="http://www.linas.org/gle" |
| 122 |
-SRC_URI="http://www.linas.org/gle/pub/gle-3.0.1.tar.gz" |
| 123 |
+SRC_URI="http://www.linas.org/gle/pub/${P}.tar.gz" |
| 124 |
|
| 125 |
LICENSE="Artistic GPL-2" |
| 126 |
SLOT="0" |
| 127 |
KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86" |
| 128 |
-IUSE="" |
| 129 |
+IUSE="doc static-libs" |
| 130 |
|
| 131 |
DEPEND="virtual/opengl |
| 132 |
- virtual/glu |
| 133 |
- media-libs/freeglut" |
| 134 |
-RDEPEND="${DEPEND}" |
| 135 |
- |
| 136 |
-src_unpack() { |
| 137 |
- unpack ${A} |
| 138 |
- cd "${S}" |
| 139 |
- |
| 140 |
- epatch "${FILESDIR}"/configure-LANG.patch |
| 141 |
+ media-libs/freeglut |
| 142 |
+ app-admin/eselect-opengl" |
| 143 |
|
| 144 |
+src_prepare() { |
| 145 |
# Replace inclusion of malloc.h with stdlib.h as needed by Mac OS X and |
| 146 |
- # FreeBSD. |
| 147 |
- sed -i -e 's:malloc.h:stdlib.h:g' "${S}"/src/* |
| 148 |
+ # FreeBSD. See bug #130340 |
| 149 |
+ sed -i -e 's:malloc.h:stdlib.h:g' src/* |
| 150 |
+ |
| 151 |
+ # Don't build binary examples as they never get installed. See bug 141859 |
| 152 |
+ sed -i -e 's:examples::' Makefile.am |
| 153 |
+ |
| 154 |
+ sed -i -e 's:SUFFIXES +=:SUFFIXES =:' man/Makefile.am public_html/Makefile.am |
| 155 |
+ sed -i -e 's:CLEANFILES +=:CLEANFILES =:' man/Makefile.am |
| 156 |
+ |
| 157 |
+ eautoreconf |
| 158 |
} |
| 159 |
|
| 160 |
-src_compile() { |
| 161 |
- econf --with-x || die |
| 162 |
- emake || die |
| 163 |
+src_configure() { |
| 164 |
+ econf \ |
| 165 |
+ --with-x \ |
| 166 |
+ $(use_enable static-libs static) \ |
| 167 |
+ --x-libraries=/usr/$(get_libdir)/opengl/xorg-x11 |
| 168 |
} |
| 169 |
|
| 170 |
src_install() { |
| 171 |
- make DESTDIR="${D}" install || die |
| 172 |
- dodoc AUTHORS ChangeLog NEWS README |
| 173 |
- dohtml -r public_html |
| 174 |
+ emake -j1 DESTDIR="${D}" install || die "emake install failed" |
| 175 |
+ dodoc AUTHORS README |
| 176 |
} |
| 177 |
|
| 178 |
|
| 179 |
|
| 180 |
1.33 media-libs/gle/ChangeLog |
| 181 |
|
| 182 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gle/ChangeLog?rev=1.33&view=markup |
| 183 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gle/ChangeLog?rev=1.33&content-type=text/plain |
| 184 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gle/ChangeLog?r1=1.32&r2=1.33 |
| 185 |
|
| 186 |
Index: ChangeLog |
| 187 |
=================================================================== |
| 188 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/gle/ChangeLog,v |
| 189 |
retrieving revision 1.32 |
| 190 |
retrieving revision 1.33 |
| 191 |
diff -u -r1.32 -r1.33 |
| 192 |
--- ChangeLog 5 Jan 2011 07:14:34 -0000 1.32 |
| 193 |
+++ ChangeLog 5 Jan 2011 08:47:06 -0000 1.33 |
| 194 |
@@ -1,6 +1,11 @@ |
| 195 |
# ChangeLog for media-libs/gle |
| 196 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 197 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/ChangeLog,v 1.32 2011/01/05 07:14:34 xarthisius Exp $ |
| 198 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/ChangeLog,v 1.33 2011/01/05 08:47:06 scarabeus Exp $ |
| 199 |
+ |
| 200 |
+ 05 Jan 2011; Tomáš Chvátal <scarabeus@g.o> gle-3.0.1-r2.ebuild, |
| 201 |
+ gle-3.1.0-r1.ebuild, -files/configure-LANG.patch: |
| 202 |
+ Fix building stable version. Update to EAPI=3. Introduce static-libs. Drop |
| 203 |
+ unneeded patch. |
| 204 |
|
| 205 |
05 Jan 2011; Kacper Kowalik <xarthisius@g.o> gle-3.0.1-r2.ebuild, |
| 206 |
gle-3.1.0-r1.ebuild: |
Archives