| 1 |
jlec 12/05/02 10:33:43 |
| 2 |
|
| 3 |
Modified: ChangeLog sg-1.5.ebuild |
| 4 |
Log: |
| 5 |
media-libs/sg: Handle static libs |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.7 media-libs/sg/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sg/ChangeLog?rev=1.7&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sg/ChangeLog?rev=1.7&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sg/ChangeLog?r1=1.6&r2=1.7 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/sg/ChangeLog,v |
| 19 |
retrieving revision 1.6 |
| 20 |
retrieving revision 1.7 |
| 21 |
diff -u -r1.6 -r1.7 |
| 22 |
--- ChangeLog 13 Feb 2012 20:33:25 -0000 1.6 |
| 23 |
+++ ChangeLog 2 May 2012 10:33:43 -0000 1.7 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for media-libs/sg |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/ChangeLog,v 1.6 2012/02/13 20:33:25 jlec Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/ChangeLog,v 1.7 2012/05/02 10:33:43 jlec Exp $ |
| 29 |
+ |
| 30 |
+ 02 May 2012; Justin Lecher <jlec@g.o> sg-1.5.ebuild: |
| 31 |
+ Handle static libs |
| 32 |
|
| 33 |
13 Feb 2012; Justin Lecher <jlec@g.o> sg-1.4.ebuild, sg-1.5.ebuild: |
| 34 |
Add alternative to mase[motif] -> libGLw |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.4 media-libs/sg/sg-1.5.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sg/sg-1.5.ebuild?rev=1.4&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sg/sg-1.5.ebuild?rev=1.4&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sg/sg-1.5.ebuild?r1=1.3&r2=1.4 |
| 43 |
|
| 44 |
Index: sg-1.5.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/sg/sg-1.5.ebuild,v |
| 47 |
retrieving revision 1.3 |
| 48 |
retrieving revision 1.4 |
| 49 |
diff -u -r1.3 -r1.4 |
| 50 |
--- sg-1.5.ebuild 13 Feb 2012 20:33:25 -0000 1.3 |
| 51 |
+++ sg-1.5.ebuild 2 May 2012 10:33:43 -0000 1.4 |
| 52 |
@@ -1,10 +1,12 @@ |
| 53 |
# Copyright 1999-2012 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/sg-1.5.ebuild,v 1.3 2012/02/13 20:33:25 jlec Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/sg-1.5.ebuild,v 1.4 2012/05/02 10:33:43 jlec Exp $ |
| 57 |
|
| 58 |
-EAPI="3" |
| 59 |
+EAPI=4 |
| 60 |
|
| 61 |
-inherit autotools eutils multilib |
| 62 |
+AUTOTOOLS_AUTORECONF=true |
| 63 |
+ |
| 64 |
+inherit autotools-utils multilib |
| 65 |
|
| 66 |
DESCRIPTION="Socket Graphics tool for displaying polygons" |
| 67 |
HOMEPAGE="http://fetk.org/codes/sg/index.html" |
| 68 |
@@ -13,7 +15,7 @@ |
| 69 |
SLOT="0" |
| 70 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 71 |
LICENSE="GPL-2" |
| 72 |
-IUSE="doc opengl" |
| 73 |
+IUSE="doc opengl static-libs" |
| 74 |
|
| 75 |
RDEPEND=" |
| 76 |
dev-libs/maloc |
| 77 |
@@ -33,18 +35,20 @@ |
| 78 |
|
| 79 |
S="${WORKDIR}"/${PN} |
| 80 |
|
| 81 |
+PATCHES=( |
| 82 |
+ "${FILESDIR}"/1.4-opengl.patch |
| 83 |
+ "${FILESDIR}"/1.4-doc.patch |
| 84 |
+ ) |
| 85 |
+ |
| 86 |
src_prepare() { |
| 87 |
- rm src/{gl,glu,glw} -rf |
| 88 |
- epatch \ |
| 89 |
- "${FILESDIR}"/1.4-opengl.patch \ |
| 90 |
- "${FILESDIR}"/1.4-doc.patch |
| 91 |
- eautoreconf |
| 92 |
+ rm src/{gl,glu,glw} -rf || die |
| 93 |
+ autotools-utils_src_prepare |
| 94 |
} |
| 95 |
|
| 96 |
src_configure() { |
| 97 |
local sg_include |
| 98 |
local sg_lib |
| 99 |
- local myconf |
| 100 |
+ local myeconfargs |
| 101 |
|
| 102 |
sg_include="${EPREFIX}"/usr/include |
| 103 |
sg_lib="${EPREFIX}"/usr/$(get_libdir) |
| 104 |
@@ -59,17 +63,13 @@ |
| 105 |
export FETK_GL_INCLUDE="${sg_include}"/GL |
| 106 |
export FETK_MOTIF_INCLUDE="${sg_include}" |
| 107 |
|
| 108 |
- use doc || myconf="${myconf} --with-doxygen= --with-dot=" |
| 109 |
+ use doc || myeconfargs+=( --with-doxygen= --with-dot= ) |
| 110 |
|
| 111 |
- use opengl && myconf="${myconf} --enable-glforce --enable-gluforce --enable-glwforce" |
| 112 |
- |
| 113 |
- econf \ |
| 114 |
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \ |
| 115 |
- --disable-triplet \ |
| 116 |
- --enable-shared \ |
| 117 |
- ${myconf} |
| 118 |
-} |
| 119 |
+ use opengl && myeconfargs+=( --enable-glforce --enable-gluforce --enable-glwforce ) |
| 120 |
|
| 121 |
-src_install() { |
| 122 |
- emake DESTDIR="${D}" install || die |
| 123 |
+ myeconfargs+=( |
| 124 |
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} |
| 125 |
+ --disable-triplet |
| 126 |
+ ) |
| 127 |
+ autotools-utils_src_configure |
| 128 |
} |
Archives