| 1 |
aballier 08/06/24 09:02:56 |
| 2 |
|
| 3 |
Modified: ChangeLog unison-2.27.57-r1.ebuild |
| 4 |
unison-2.13.16-r1.ebuild |
| 5 |
Log: |
| 6 |
Add support for no-ocamlopt installs, bug #229129 |
| 7 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.53 net-misc/unison/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/unison/ChangeLog?rev=1.53&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/unison/ChangeLog?rev=1.53&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/unison/ChangeLog?r1=1.52&r2=1.53 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v |
| 19 |
retrieving revision 1.52 |
| 20 |
retrieving revision 1.53 |
| 21 |
diff -u -r1.52 -r1.53 |
| 22 |
--- ChangeLog 16 Jun 2008 20:51:23 -0000 1.52 |
| 23 |
+++ ChangeLog 24 Jun 2008 09:02:56 -0000 1.53 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for net-misc/unison |
| 26 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.52 2008/06/16 20:51:23 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.53 2008/06/24 09:02:56 aballier Exp $ |
| 29 |
+ |
| 30 |
+ 24 Jun 2008; Alexis Ballier <aballier@g.o> |
| 31 |
+ unison-2.13.16-r1.ebuild, unison-2.27.57-r1.ebuild: |
| 32 |
+ Add support for no-ocamlopt installs, bug #229129 |
| 33 |
|
| 34 |
16 Jun 2008; Alexis Ballier <aballier@g.o> unison-2.13.16.ebuild: |
| 35 |
quote variables and dont dodoc copying |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.6 net-misc/unison/unison-2.27.57-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/unison/unison-2.27.57-r1.ebuild?rev=1.6&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/unison/unison-2.27.57-r1.ebuild?rev=1.6&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/unison/unison-2.27.57-r1.ebuild?r1=1.5&r2=1.6 |
| 44 |
|
| 45 |
Index: unison-2.27.57-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.27.57-r1.ebuild,v |
| 48 |
retrieving revision 1.5 |
| 49 |
retrieving revision 1.6 |
| 50 |
diff -u -r1.5 -r1.6 |
| 51 |
--- unison-2.27.57-r1.ebuild 13 Jun 2008 19:34:39 -0000 1.5 |
| 52 |
+++ unison-2.27.57-r1.ebuild 24 Jun 2008 09:02:56 -0000 1.6 |
| 53 |
@@ -1,12 +1,12 @@ |
| 54 |
# Copyright 1999-2008 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.27.57-r1.ebuild,v 1.5 2008/06/13 19:34:39 mabi Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.27.57-r1.ebuild,v 1.6 2008/06/24 09:02:56 aballier Exp $ |
| 58 |
|
| 59 |
EAPI=1 |
| 60 |
|
| 61 |
inherit eutils versionator |
| 62 |
|
| 63 |
-IUSE="gtk doc static debug threads" |
| 64 |
+IUSE="gtk doc static debug threads +ocamlopt" |
| 65 |
|
| 66 |
DESCRIPTION="Two-way cross-platform file synchronizer" |
| 67 |
HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/" |
| 68 |
@@ -28,6 +28,15 @@ |
| 69 |
doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf |
| 70 |
http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )" |
| 71 |
|
| 72 |
+pkg_setup() { |
| 73 |
+ if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then |
| 74 |
+ eerror "In order to build ${PN} with native code support from ocaml" |
| 75 |
+ eerror "You first need to have a native code ocaml compiler." |
| 76 |
+ eerror "You need to install dev-lang/ocaml with ocamlopt useflag on." |
| 77 |
+ die "Please install ocaml with ocamlopt useflag" |
| 78 |
+ fi |
| 79 |
+} |
| 80 |
+ |
| 81 |
src_unpack() { |
| 82 |
unpack ${A} |
| 83 |
cd "${S}" |
| 84 |
@@ -55,6 +64,8 @@ |
| 85 |
myconf="$myconf UISTYLE=text" |
| 86 |
fi |
| 87 |
|
| 88 |
+ use ocamlopt || myconf="$myconf NATIVE=false" |
| 89 |
+ |
| 90 |
# Discard cflags as it will try to pass them to ocamlc... |
| 91 |
emake -j1 $myconf CFLAGS="" || die "error making unsion" |
| 92 |
} |
| 93 |
@@ -74,6 +85,7 @@ |
| 94 |
dohtml "${DISTDIR}/${P}-manual.html" || die |
| 95 |
dodoc "${DISTDIR}/${P}-manual.pdf" || die |
| 96 |
fi |
| 97 |
+ use ocamlopt || export STRIP_MASK="*/bin/*" |
| 98 |
} |
| 99 |
|
| 100 |
pkg_postinst() { |
| 101 |
|
| 102 |
|
| 103 |
|
| 104 |
1.2 net-misc/unison/unison-2.13.16-r1.ebuild |
| 105 |
|
| 106 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/unison/unison-2.13.16-r1.ebuild?rev=1.2&view=markup |
| 107 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/unison/unison-2.13.16-r1.ebuild?rev=1.2&content-type=text/plain |
| 108 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/unison/unison-2.13.16-r1.ebuild?r1=1.1&r2=1.2 |
| 109 |
|
| 110 |
Index: unison-2.13.16-r1.ebuild |
| 111 |
=================================================================== |
| 112 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.13.16-r1.ebuild,v |
| 113 |
retrieving revision 1.1 |
| 114 |
retrieving revision 1.2 |
| 115 |
diff -u -r1.1 -r1.2 |
| 116 |
--- unison-2.13.16-r1.ebuild 16 Jun 2008 20:20:07 -0000 1.1 |
| 117 |
+++ unison-2.13.16-r1.ebuild 24 Jun 2008 09:02:56 -0000 1.2 |
| 118 |
@@ -1,12 +1,12 @@ |
| 119 |
# Copyright 1999-2008 Gentoo Foundation |
| 120 |
# Distributed under the terms of the GNU General Public License v2 |
| 121 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.13.16-r1.ebuild,v 1.1 2008/06/16 20:20:07 aballier Exp $ |
| 122 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.13.16-r1.ebuild,v 1.2 2008/06/24 09:02:56 aballier Exp $ |
| 123 |
|
| 124 |
EAPI=1 |
| 125 |
|
| 126 |
inherit eutils versionator |
| 127 |
|
| 128 |
-IUSE="gtk doc static debug threads" |
| 129 |
+IUSE="gtk doc static debug threads +ocamlopt" |
| 130 |
|
| 131 |
DESCRIPTION="Two-way cross-platform file synchronizer" |
| 132 |
HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/" |
| 133 |
@@ -28,6 +28,15 @@ |
| 134 |
doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf |
| 135 |
http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )" |
| 136 |
|
| 137 |
+pkg_setup() { |
| 138 |
+ if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then |
| 139 |
+ eerror "In order to build ${PN} with native code support from ocaml" |
| 140 |
+ eerror "You first need to have a native code ocaml compiler." |
| 141 |
+ eerror "You need to install dev-lang/ocaml with ocamlopt useflag on." |
| 142 |
+ die "Please install ocaml with ocamlopt useflag" |
| 143 |
+ fi |
| 144 |
+} |
| 145 |
+ |
| 146 |
src_unpack() { |
| 147 |
unpack ${P}.tar.gz |
| 148 |
|
| 149 |
@@ -58,6 +67,8 @@ |
| 150 |
myconf="$myconf UISTYLE=text" |
| 151 |
fi |
| 152 |
|
| 153 |
+ use ocamlopt || myconf="$myconf NATIVE=false" |
| 154 |
+ |
| 155 |
# Discard cflags as it will try to pass them to ocamlc... |
| 156 |
emake -j1 $myconf CFLAGS="" || die "error making unsion" |
| 157 |
} |
| 158 |
@@ -73,6 +84,7 @@ |
| 159 |
dohtml "${DISTDIR}/${P}-manual.html" || die |
| 160 |
dodoc "${DISTDIR}/${P}-manual.pdf" || die |
| 161 |
fi |
| 162 |
+ use ocamlopt || export STRIP_MASK="*/bin/*" |
| 163 |
} |
| 164 |
|
| 165 |
pkg_postinst() { |
| 166 |
|
| 167 |
|
| 168 |
|
| 169 |
-- |
| 170 |
gentoo-commits@l.g.o mailing list |
Archives