| 1 |
jlec 12/04/30 17:21:36 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog gamer-1.5.ebuild |
| 4 |
Log: |
| 5 |
sci-libs/gamer: Handle static libs |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 sci-libs/gamer/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gamer/metadata.xml?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gamer/metadata.xml?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gamer/metadata.xml?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gamer/metadata.xml,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- metadata.xml 1 Nov 2010 14:30:16 -0000 1.1 |
| 23 |
+++ metadata.xml 30 Apr 2012 17:21:36 -0000 1.2 |
| 24 |
@@ -1,8 +1,8 @@ |
| 25 |
<?xml version="1.0" encoding="UTF-8"?> |
| 26 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 27 |
<pkgmetadata> |
| 28 |
-<herd>sci</herd> |
| 29 |
-<maintainer> |
| 30 |
- <email>jlec@g.o</email> |
| 31 |
-</maintainer> |
| 32 |
+ <herd>sci</herd> |
| 33 |
+ <maintainer> |
| 34 |
+ <email>jlec@g.o</email> |
| 35 |
+ </maintainer> |
| 36 |
</pkgmetadata> |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.4 sci-libs/gamer/ChangeLog |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gamer/ChangeLog?rev=1.4&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gamer/ChangeLog?rev=1.4&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gamer/ChangeLog?r1=1.3&r2=1.4 |
| 45 |
|
| 46 |
Index: ChangeLog |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gamer/ChangeLog,v |
| 49 |
retrieving revision 1.3 |
| 50 |
retrieving revision 1.4 |
| 51 |
diff -u -r1.3 -r1.4 |
| 52 |
--- ChangeLog 16 Apr 2011 07:35:35 -0000 1.3 |
| 53 |
+++ ChangeLog 30 Apr 2012 17:21:36 -0000 1.4 |
| 54 |
@@ -1,6 +1,9 @@ |
| 55 |
# ChangeLog for sci-libs/gamer |
| 56 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gamer/ChangeLog,v 1.3 2011/04/16 07:35:35 jlec Exp $ |
| 58 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gamer/ChangeLog,v 1.4 2012/04/30 17:21:36 jlec Exp $ |
| 60 |
+ |
| 61 |
+ 30 Apr 2012; Justin Lecher <jlec@g.o> gamer-1.5.ebuild, metadata.xml: |
| 62 |
+ Handle static libs |
| 63 |
|
| 64 |
*gamer-1.5 (16 Apr 2011) |
| 65 |
|
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
1.2 sci-libs/gamer/gamer-1.5.ebuild |
| 70 |
|
| 71 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gamer/gamer-1.5.ebuild?rev=1.2&view=markup |
| 72 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gamer/gamer-1.5.ebuild?rev=1.2&content-type=text/plain |
| 73 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gamer/gamer-1.5.ebuild?r1=1.1&r2=1.2 |
| 74 |
|
| 75 |
Index: gamer-1.5.ebuild |
| 76 |
=================================================================== |
| 77 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gamer/gamer-1.5.ebuild,v |
| 78 |
retrieving revision 1.1 |
| 79 |
retrieving revision 1.2 |
| 80 |
diff -u -r1.1 -r1.2 |
| 81 |
--- gamer-1.5.ebuild 16 Apr 2011 07:35:35 -0000 1.1 |
| 82 |
+++ gamer-1.5.ebuild 30 Apr 2012 17:21:36 -0000 1.2 |
| 83 |
@@ -1,10 +1,12 @@ |
| 84 |
-# Copyright 1999-2011 Gentoo Foundation |
| 85 |
+# Copyright 1999-2012 Gentoo Foundation |
| 86 |
# Distributed under the terms of the GNU General Public License v2 |
| 87 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gamer/gamer-1.5.ebuild,v 1.1 2011/04/16 07:35:35 jlec Exp $ |
| 88 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gamer/gamer-1.5.ebuild,v 1.2 2012/04/30 17:21:36 jlec Exp $ |
| 89 |
|
| 90 |
-EAPI="3" |
| 91 |
+EAPI=4 |
| 92 |
|
| 93 |
-inherit autotools eutils multilib |
| 94 |
+AUTOTOOLS_AUTORECONF=yes |
| 95 |
+ |
| 96 |
+inherit autotools-utils multilib |
| 97 |
|
| 98 |
DESCRIPTION="Geometry-preserving Adaptive MeshER" |
| 99 |
HOMEPAGE="http://fetk.org/codes/gamer/index.html" |
| 100 |
@@ -13,7 +15,7 @@ |
| 101 |
SLOT="0" |
| 102 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 103 |
LICENSE="GPL-2" |
| 104 |
-IUSE="doc" |
| 105 |
+IUSE="doc static-libs" |
| 106 |
|
| 107 |
RDEPEND=">=dev-libs/maloc-1.4" |
| 108 |
DEPEND=" |
| 109 |
@@ -24,32 +26,26 @@ |
| 110 |
|
| 111 |
S="${WORKDIR}"/${PN} |
| 112 |
|
| 113 |
-src_prepare() { |
| 114 |
- epatch \ |
| 115 |
- "${FILESDIR}"/1.4-multilib.patch \ |
| 116 |
- "${FILESDIR}"/1.4-doc.patch |
| 117 |
- eautoreconf |
| 118 |
-} |
| 119 |
+PATCHES=( |
| 120 |
+ "${FILESDIR}"/1.4-multilib.patch |
| 121 |
+ "${FILESDIR}"/1.4-doc.patch ) |
| 122 |
|
| 123 |
src_configure() { |
| 124 |
local fetk_include |
| 125 |
local fetk_lib |
| 126 |
- local myconf |
| 127 |
+ local myeconfargs |
| 128 |
|
| 129 |
- use doc || myconf="${myconf} --with-doxygen= --with-dot=" |
| 130 |
+ use doc || myeconfargs+=( ${myconf} --with-doxygen= --with-dot= ) |
| 131 |
|
| 132 |
fetk_include="${EPREFIX}"/usr/include |
| 133 |
fetk_lib="${EPREFIX}"/usr/$(get_libdir) |
| 134 |
export FETK_INCLUDE="${fetk_include}" |
| 135 |
export FETK_LIBRARY="${fetk_lib}" |
| 136 |
|
| 137 |
- econf \ |
| 138 |
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \ |
| 139 |
- --disable-triplet \ |
| 140 |
- --enable-shared \ |
| 141 |
- ${myconf} |
| 142 |
-} |
| 143 |
- |
| 144 |
-src_install() { |
| 145 |
- emake DESTDIR="${D}" install || die |
| 146 |
+ myeconfargs+=( |
| 147 |
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} |
| 148 |
+ --disable-triplet |
| 149 |
+ --enable-shared |
| 150 |
+ ) |
| 151 |
+ autotools-utils_src_configure |
| 152 |
} |
Archives