| 1 |
scarabeus 09/06/05 11:42:55 |
| 2 |
|
| 3 |
Modified: libopensync-0.36.ebuild libopensync-0.35.ebuild |
| 4 |
libopensync-9999.ebuild libopensync-0.38.ebuild |
| 5 |
ChangeLog libopensync-0.36-r1.ebuild |
| 6 |
Log: |
| 7 |
Adjust cmake build system to actualy work. Per bug #269639. |
| 8 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.3 app-pda/libopensync/libopensync-0.36.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/libopensync-0.36.ebuild?rev=1.3&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/libopensync-0.36.ebuild?rev=1.3&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/libopensync-0.36.ebuild?r1=1.2&r2=1.3 |
| 16 |
|
| 17 |
Index: libopensync-0.36.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.36.ebuild,v |
| 20 |
retrieving revision 1.2 |
| 21 |
retrieving revision 1.3 |
| 22 |
diff -u -r1.2 -r1.3 |
| 23 |
--- libopensync-0.36.ebuild 20 Apr 2008 17:07:42 -0000 1.2 |
| 24 |
+++ libopensync-0.36.ebuild 5 Jun 2009 11:42:55 -0000 1.3 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
-# Copyright 1999-2008 Gentoo Foundation |
| 27 |
+# Copyright 1999-2009 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.36.ebuild,v 1.2 2008/04/20 17:07:42 flameeyes Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.36.ebuild,v 1.3 2009/06/05 11:42:55 scarabeus Exp $ |
| 31 |
|
| 32 |
inherit cmake-utils eutils |
| 33 |
|
| 34 |
@@ -25,21 +25,22 @@ |
| 35 |
|
| 36 |
DEPEND="${RDEPEND} |
| 37 |
python? ( >=dev-lang/swig-1.3.17 ) |
| 38 |
- >=dev-util/cmake-2.4.7 |
| 39 |
>=dev-util/pkgconfig-0.9.0 |
| 40 |
doc? ( app-doc/doxygen )" |
| 41 |
|
| 42 |
src_compile() { |
| 43 |
local mycmakeargs |
| 44 |
- mycmakeargs="${mycmakeargs} -DCMAKE_SKIP_RPATH=ON" |
| 45 |
- mycmakeargs="${mycmakeargs} -DOPENSYNC_TRACE=$(use debug && echo ON || echo OFF)" |
| 46 |
- mycmakeargs="${mycmakeargs} -DOPENSYNC_DEBUG_MODULES=$(use debug && echo ON || echo OFF)" |
| 47 |
- mycmakeargs="${mycmakeargs} -DOPENSYNC_PYTHONBINDINGS=$(use python && echo ON || echo OFF)" |
| 48 |
- mycmakeargs="${mycmakeargs} -DBUILD_DOCUMENTATION=$(use doc && echo ON || echo OFF)" |
| 49 |
+ mycmakeargs="${mycmakeargs} -DCMAKE_SKIP_RPATH=ON |
| 50 |
+ $(cmake-utils_use debug OPENSYNC_TRACE) |
| 51 |
+ $(cmake-utils_use debug OPENSYNC_DEBUG_MODULES) |
| 52 |
+ $(cmake-utils_use python OPENSYNC_PYTHONBINDINGS) |
| 53 |
+ $(cmake-utils_use_build doc DOCUMENTATION) |
| 54 |
+ " |
| 55 |
+ |
| 56 |
cmake-utils_src_compile |
| 57 |
|
| 58 |
if use doc ; then |
| 59 |
- cd "${WORKDIR}/${PN}_build" |
| 60 |
+ cd "${CMAKE_BUILD_DIR}" |
| 61 |
doxygen Doxyfile || die "Failed to generate docs." |
| 62 |
fi |
| 63 |
} |
| 64 |
@@ -47,9 +48,9 @@ |
| 65 |
src_test() { |
| 66 |
echo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
| 67 |
|
| 68 |
- pushd "${WORKDIR}/${PN}_build" > /dev/null |
| 69 |
+ pushd "${CMAKE_BUILD_DIR}" > /dev/null |
| 70 |
|
| 71 |
- if ! LD_LIBRARY_PATH="${WORKDIR}/${PN}_build/opensync/" emake -j1 test ; then |
| 72 |
+ if ! LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/opensync/" emake -j1 test ; then |
| 73 |
die "Make test failed. See above for details." |
| 74 |
fi |
| 75 |
|
| 76 |
@@ -60,7 +61,7 @@ |
| 77 |
cmake-utils_src_install |
| 78 |
|
| 79 |
if use doc ; then |
| 80 |
- cd "${WORKDIR}/${PN}_build" |
| 81 |
+ cd "${CMAKE_BUILD_DIR}" |
| 82 |
dohtml docs/html/* || die "Failed to install docs." |
| 83 |
fi |
| 84 |
} |
| 85 |
|
| 86 |
|
| 87 |
|
| 88 |
1.3 app-pda/libopensync/libopensync-0.35.ebuild |
| 89 |
|
| 90 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/libopensync-0.35.ebuild?rev=1.3&view=markup |
| 91 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/libopensync-0.35.ebuild?rev=1.3&content-type=text/plain |
| 92 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/libopensync-0.35.ebuild?r1=1.2&r2=1.3 |
| 93 |
|
| 94 |
Index: libopensync-0.35.ebuild |
| 95 |
=================================================================== |
| 96 |
RCS file: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.35.ebuild,v |
| 97 |
retrieving revision 1.2 |
| 98 |
retrieving revision 1.3 |
| 99 |
diff -u -r1.2 -r1.3 |
| 100 |
--- libopensync-0.35.ebuild 23 Dec 2007 02:19:16 -0000 1.2 |
| 101 |
+++ libopensync-0.35.ebuild 5 Jun 2009 11:42:55 -0000 1.3 |
| 102 |
@@ -1,6 +1,6 @@ |
| 103 |
-# Copyright 1999-2007 Gentoo Foundation |
| 104 |
+# Copyright 1999-2009 Gentoo Foundation |
| 105 |
# Distributed under the terms of the GNU General Public License v2 |
| 106 |
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.35.ebuild,v 1.2 2007/12/23 02:19:16 peper Exp $ |
| 107 |
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.35.ebuild,v 1.3 2009/06/05 11:42:55 scarabeus Exp $ |
| 108 |
|
| 109 |
inherit cmake-utils eutils |
| 110 |
|
| 111 |
@@ -24,21 +24,21 @@ |
| 112 |
python? ( >=dev-lang/python-2.2 >=dev-lang/swig-1.3.17 )" |
| 113 |
|
| 114 |
DEPEND="${RDEPEND} |
| 115 |
- >=dev-util/cmake-2.4.7 |
| 116 |
>=dev-util/pkgconfig-0.9.0 |
| 117 |
doc? ( app-doc/doxygen )" |
| 118 |
|
| 119 |
src_compile() { |
| 120 |
local mycmakeargs |
| 121 |
- mycmakeargs="${mycmakeargs} -DCMAKE_SKIP_RPATH=ON" |
| 122 |
- mycmakeargs="${mycmakeargs} -DOPENSYNC_TRACE=$(use debug && echo ON || echo OFF)" |
| 123 |
- mycmakeargs="${mycmakeargs} -DOPENSYNC_DEBUG_MODULES=$(use debug && echo ON || echo OFF)" |
| 124 |
- mycmakeargs="${mycmakeargs} -DOPENSYNC_PYTHONBINDINGS=$(use python && echo ON || echo OFF)" |
| 125 |
- mycmakeargs="${mycmakeargs} -DBUILD_DOCUMENTATION=$(use doc && echo ON || echo OFF)" |
| 126 |
+ mycmakeargs="${mycmakeargs} -DCMAKE_SKIP_RPATH=ON |
| 127 |
+ $(cmake-utils_use debug OPENSYNC_TRACE) |
| 128 |
+ $(cmake-utils_use debug OPENSYNC_DEBUG_MODULES) |
| 129 |
+ $(cmake-utils_use python OPENSYNC_PYTHONBINDINGS) |
| 130 |
+ $(cmake-utils_use_build doc DOCUMENTATION) |
| 131 |
+ " |
| 132 |
cmake-utils_src_compile |
| 133 |
|
| 134 |
if use doc ; then |
| 135 |
- cd "${WORKDIR}/${PN}_build" |
| 136 |
+ cd "${CMAKE_BUILD_DIR}" |
| 137 |
doxygen Doxyfile || die "Failed to generate docs." |
| 138 |
fi |
| 139 |
} |
| 140 |
@@ -47,7 +47,7 @@ |
| 141 |
cmake-utils_src_install |
| 142 |
|
| 143 |
if use doc ; then |
| 144 |
- cd "${WORKDIR}/${PN}_build" |
| 145 |
+ cd "${CMAKE_BUILD_DIR}" |
| 146 |
dohtml docs/html/* || die "Failed to install docs." |
| 147 |
fi |
| 148 |
} |
| 149 |
|
| 150 |
|
| 151 |
|
| 152 |
1.5 app-pda/libopensync/libopensync-9999.ebuild |
| 153 |
|
| 154 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/libopensync-9999.ebuild?rev=1.5&view=markup |
| 155 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/libopensync-9999.ebuild?rev=1.5&content-type=text/plain |
| 156 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/libopensync-9999.ebuild?r1=1.4&r2=1.5 |
| 157 |
|
| 158 |
Index: libopensync-9999.ebuild |
| 159 |
=================================================================== |
| 160 |
RCS file: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-9999.ebuild,v |
| 161 |
retrieving revision 1.4 |
| 162 |
retrieving revision 1.5 |
| 163 |
diff -u -r1.4 -r1.5 |
| 164 |
--- libopensync-9999.ebuild 20 Apr 2008 17:07:42 -0000 1.4 |
| 165 |
+++ libopensync-9999.ebuild 5 Jun 2009 11:42:55 -0000 1.5 |
| 166 |
@@ -1,6 +1,6 @@ |
| 167 |
-# Copyright 1999-2008 Gentoo Foundation |
| 168 |
+# Copyright 1999-2009 Gentoo Foundation |
| 169 |
# Distributed under the terms of the GNU General Public License v2 |
| 170 |
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-9999.ebuild,v 1.4 2008/04/20 17:07:42 flameeyes Exp $ |
| 171 |
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-9999.ebuild,v 1.5 2009/06/05 11:42:55 scarabeus Exp $ |
| 172 |
|
| 173 |
inherit cmake-utils eutils subversion |
| 174 |
|
| 175 |
@@ -27,30 +27,43 @@ |
| 176 |
|
| 177 |
DEPEND="${RDEPEND} |
| 178 |
python? ( >=dev-lang/swig-1.3.17 ) |
| 179 |
- >=dev-util/cmake-2.4.7 |
| 180 |
>=dev-util/pkgconfig-0.9.0 |
| 181 |
doc? ( app-doc/doxygen )" |
| 182 |
|
| 183 |
src_compile() { |
| 184 |
local mycmakeargs |
| 185 |
- mycmakeargs="${mycmakeargs} -DCMAKE_SKIP_RPATH=ON" |
| 186 |
- mycmakeargs="${mycmakeargs} -DOPENSYNC_TRACE=$(use debug && echo ON || echo OFF)" |
| 187 |
- mycmakeargs="${mycmakeargs} -DOPENSYNC_DEBUG_MODULES=$(use debug && echo ON || echo OFF)" |
| 188 |
- mycmakeargs="${mycmakeargs} -DOPENSYNC_PYTHONBINDINGS=$(use python && echo ON || echo OFF)" |
| 189 |
- mycmakeargs="${mycmakeargs} -DBUILD_DOCUMENTATION=$(use doc && echo ON || echo OFF)" |
| 190 |
+ mycmakeargs="${mycmakeargs} -DCMAKE_SKIP_RPATH=ON |
| 191 |
+ $(cmake-utils_use debug OPENSYNC_TRACE) |
| 192 |
+ $(cmake-utils_use debug OPENSYNC_DEBUG_MODULES) |
| 193 |
+ $(cmake-utils_use python OPENSYNC_PYTHONBINDINGS) |
| 194 |
+ $(cmake-utils_use_build doc DOCUMENTATION) |
| 195 |
+ " |
| 196 |
+ |
| 197 |
cmake-utils_src_compile |
| 198 |
|
| 199 |
if use doc ; then |
| 200 |
- cd "${WORKDIR}/${PN}_build" |
| 201 |
+ cd "${CMAKE_BUILD_DIR}" |
| 202 |
doxygen Doxyfile || die "Failed to generate docs." |
| 203 |
fi |
| 204 |
} |
| 205 |
|
| 206 |
+src_test() { |
| 207 |
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
| 208 |
+ |
| 209 |
+ pushd "${CMAKE_BUILD_DIR}" > /dev/null |
| 210 |
+ |
| 211 |
+ if ! LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/opensync/" emake -j1 test ; then |
| 212 |
+ die "Make test failed. See above for details." |
| 213 |
+ fi |
| 214 |
+ |
| 215 |
+ popd > /dev/null |
| 216 |
+} |
| 217 |
+ |
| 218 |
src_install() { |
| 219 |
cmake-utils_src_install |
| 220 |
|
| 221 |
if use doc ; then |
| 222 |
- cd "${WORKDIR}/${PN}_build" |
| 223 |
+ cd "${CMAKE_BUILD_DIR}" |
| 224 |
dohtml docs/html/* || die "Failed to install docs." |
| 225 |
fi |
| 226 |
} |
| 227 |
|
| 228 |
|
| 229 |
|
| 230 |
1.2 app-pda/libopensync/libopensync-0.38.ebuild |
| 231 |
|
| 232 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/libopensync-0.38.ebuild?rev=1.2&view=markup |
| 233 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/libopensync-0.38.ebuild?rev=1.2&content-type=text/plain |
| 234 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/libopensync-0.38.ebuild?r1=1.1&r2=1.2 |
| 235 |
|
| 236 |
Index: libopensync-0.38.ebuild |
| 237 |
=================================================================== |
| 238 |
RCS file: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.38.ebuild,v |
| 239 |
retrieving revision 1.1 |
| 240 |
retrieving revision 1.2 |
| 241 |
diff -u -r1.1 -r1.2 |
| 242 |
--- libopensync-0.38.ebuild 26 Apr 2009 20:51:40 -0000 1.1 |
| 243 |
+++ libopensync-0.38.ebuild 5 Jun 2009 11:42:55 -0000 1.2 |
| 244 |
@@ -1,6 +1,6 @@ |
| 245 |
# Copyright 1999-2009 Gentoo Foundation |
| 246 |
# Distributed under the terms of the GNU General Public License v2 |
| 247 |
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.38.ebuild,v 1.1 2009/04/26 20:51:40 patrick Exp $ |
| 248 |
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.38.ebuild,v 1.2 2009/06/05 11:42:55 scarabeus Exp $ |
| 249 |
|
| 250 |
inherit cmake-utils eutils |
| 251 |
|
| 252 |
@@ -25,27 +25,27 @@ |
| 253 |
|
| 254 |
DEPEND="${RDEPEND} |
| 255 |
python? ( >=dev-lang/swig-1.3.17 ) |
| 256 |
- >=dev-util/cmake-2.4.7 |
| 257 |
>=dev-util/pkgconfig-0.9.0 |
| 258 |
doc? ( app-doc/doxygen )" |
| 259 |
|
| 260 |
src_unpack() { |
| 261 |
- unpack $A |
| 262 |
- cd $PN-$PV |
| 263 |
+ unpack ${A} |
| 264 |
+ cd "${S}" |
| 265 |
epatch "$FILESDIR/libopensync-py2.6.patch" |
| 266 |
} |
| 267 |
|
| 268 |
src_compile() { |
| 269 |
local mycmakeargs |
| 270 |
- mycmakeargs="${mycmakeargs} -DCMAKE_SKIP_RPATH=ON" |
| 271 |
- mycmakeargs="${mycmakeargs} -DOPENSYNC_TRACE=$(use debug && echo ON || echo OFF)" |
| 272 |
- mycmakeargs="${mycmakeargs} -DOPENSYNC_DEBUG_MODULES=$(use debug && echo ON || echo OFF)" |
| 273 |
- mycmakeargs="${mycmakeargs} -DOPENSYNC_PYTHONBINDINGS=$(use python && echo ON || echo OFF)" |
| 274 |
- mycmakeargs="${mycmakeargs} -DBUILD_DOCUMENTATION=$(use doc && echo ON || echo OFF)" |
| 275 |
+ mycmakeargs="${mycmakeargs} -DCMAKE_SKIP_RPATH=ON |
| 276 |
+ $(cmake-utils_use debug OPENSYNC_TRACE) |
| 277 |
+ $(cmake-utils_use debug OPENSYNC_DEBUG_MODULES) |
| 278 |
+ $(cmake-utils_use python OPENSYNC_PYTHONBINDINGS) |
| 279 |
+ $(cmake-utils_use_build doc DOCUMENTATION) |
| 280 |
+ " |
| 281 |
cmake-utils_src_compile |
| 282 |
|
| 283 |
if use doc ; then |
| 284 |
- cd "${WORKDIR}/${PN}_build" |
| 285 |
+ cd "${CMAKE_BUILD_DIR}" |
| 286 |
doxygen Doxyfile || die "Failed to generate docs." |
| 287 |
fi |
| 288 |
} |
| 289 |
@@ -53,9 +53,9 @@ |
| 290 |
src_test() { |
| 291 |
echo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
| 292 |
|
| 293 |
- pushd "${WORKDIR}/${PN}_build" > /dev/null |
| 294 |
+ pushd "${CMAKE_BUILD_DIR}" > /dev/null |
| 295 |
|
| 296 |
- if ! LD_LIBRARY_PATH="${WORKDIR}/${PN}_build/opensync/" emake -j1 test ; then |
| 297 |
+ if ! LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/opensync/" emake -j1 test ; then |
| 298 |
die "Make test failed. See above for details." |
| 299 |
fi |
| 300 |
|
| 301 |
@@ -66,7 +66,7 @@ |
| 302 |
cmake-utils_src_install |
| 303 |
|
| 304 |
if use doc ; then |
| 305 |
- cd "${WORKDIR}/${PN}_build" |
| 306 |
+ cd "${CMAKE_BUILD_DIR}" |
| 307 |
dohtml docs/html/* || die "Failed to install docs." |
| 308 |
fi |
| 309 |
} |
| 310 |
|
| 311 |
|
| 312 |
|
| 313 |
1.32 app-pda/libopensync/ChangeLog |
| 314 |
|
| 315 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/ChangeLog?rev=1.32&view=markup |
| 316 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/ChangeLog?rev=1.32&content-type=text/plain |
| 317 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/ChangeLog?r1=1.31&r2=1.32 |
| 318 |
|
| 319 |
Index: ChangeLog |
| 320 |
=================================================================== |
| 321 |
RCS file: /var/cvsroot/gentoo-x86/app-pda/libopensync/ChangeLog,v |
| 322 |
retrieving revision 1.31 |
| 323 |
retrieving revision 1.32 |
| 324 |
diff -u -r1.31 -r1.32 |
| 325 |
--- ChangeLog 31 May 2009 20:22:10 -0000 1.31 |
| 326 |
+++ ChangeLog 5 Jun 2009 11:42:55 -0000 1.32 |
| 327 |
@@ -1,6 +1,11 @@ |
| 328 |
# ChangeLog for app-pda/libopensync |
| 329 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 330 |
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/ChangeLog,v 1.31 2009/05/31 20:22:10 nixnut Exp $ |
| 331 |
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/ChangeLog,v 1.32 2009/06/05 11:42:55 scarabeus Exp $ |
| 332 |
+ |
| 333 |
+ 05 Jun 2009; Tomas Chvatal <scarabeus@g.o> libopensync-0.35.ebuild, |
| 334 |
+ libopensync-0.36.ebuild, libopensync-0.36-r1.ebuild, |
| 335 |
+ libopensync-0.38.ebuild, libopensync-9999.ebuild: |
| 336 |
+ Adjust cmake build system to actualy work. Per bug #269639. |
| 337 |
|
| 338 |
31 May 2009; nixnut <nixnut@g.o> libopensync-0.36-r1.ebuild: |
| 339 |
reverting to ~ppc |
| 340 |
|
| 341 |
|
| 342 |
|
| 343 |
1.4 app-pda/libopensync/libopensync-0.36-r1.ebuild |
| 344 |
|
| 345 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/libopensync-0.36-r1.ebuild?rev=1.4&view=markup |
| 346 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/libopensync-0.36-r1.ebuild?rev=1.4&content-type=text/plain |
| 347 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-pda/libopensync/libopensync-0.36-r1.ebuild?r1=1.3&r2=1.4 |
| 348 |
|
| 349 |
Index: libopensync-0.36-r1.ebuild |
| 350 |
=================================================================== |
| 351 |
RCS file: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.36-r1.ebuild,v |
| 352 |
retrieving revision 1.3 |
| 353 |
retrieving revision 1.4 |
| 354 |
diff -u -r1.3 -r1.4 |
| 355 |
--- libopensync-0.36-r1.ebuild 31 May 2009 20:22:10 -0000 1.3 |
| 356 |
+++ libopensync-0.36-r1.ebuild 5 Jun 2009 11:42:55 -0000 1.4 |
| 357 |
@@ -1,6 +1,6 @@ |
| 358 |
# Copyright 1999-2009 Gentoo Foundation |
| 359 |
# Distributed under the terms of the GNU General Public License v2 |
| 360 |
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.36-r1.ebuild,v 1.3 2009/05/31 20:22:10 nixnut Exp $ |
| 361 |
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.36-r1.ebuild,v 1.4 2009/06/05 11:42:55 scarabeus Exp $ |
| 362 |
|
| 363 |
inherit cmake-utils eutils |
| 364 |
|
| 365 |
@@ -25,27 +25,27 @@ |
| 366 |
|
| 367 |
DEPEND="${RDEPEND} |
| 368 |
python? ( >=dev-lang/swig-1.3.17 ) |
| 369 |
- >=dev-util/cmake-2.4.7 |
| 370 |
>=dev-util/pkgconfig-0.9.0 |
| 371 |
doc? ( app-doc/doxygen )" |
| 372 |
|
| 373 |
src_unpack() { |
| 374 |
- unpack $A |
| 375 |
- cd $PN-$PV |
| 376 |
+ unpack ${A} |
| 377 |
+ cd "${S}" |
| 378 |
epatch "$FILESDIR/libopensync-py2.6.patch" |
| 379 |
} |
| 380 |
|
| 381 |
src_compile() { |
| 382 |
local mycmakeargs |
| 383 |
- mycmakeargs="${mycmakeargs} -DCMAKE_SKIP_RPATH=ON" |
| 384 |
- mycmakeargs="${mycmakeargs} -DOPENSYNC_TRACE=$(use debug && echo ON || echo OFF)" |
| 385 |
- mycmakeargs="${mycmakeargs} -DOPENSYNC_DEBUG_MODULES=$(use debug && echo ON || echo OFF)" |
| 386 |
- mycmakeargs="${mycmakeargs} -DOPENSYNC_PYTHONBINDINGS=$(use python && echo ON || echo OFF)" |
| 387 |
- mycmakeargs="${mycmakeargs} -DBUILD_DOCUMENTATION=$(use doc && echo ON || echo OFF)" |
| 388 |
+ mycmakeargs="${mycmakeargs} -DCMAKE_SKIP_RPATH=ON |
| 389 |
+ $(cmake-utils_use debug OPENSYNC_TRACE) |
| 390 |
+ $(cmake-utils_use debug OPENSYNC_DEBUG_MODULES) |
| 391 |
+ $(cmake-utils_use python OPENSYNC_PYTHONBINDINGS) |
| 392 |
+ $(cmake-utils_use_build doc DOCUMENTATION) |
| 393 |
+ " |
| 394 |
cmake-utils_src_compile |
| 395 |
|
| 396 |
if use doc ; then |
| 397 |
- cd "${WORKDIR}/${PN}_build" |
| 398 |
+ cd "${CMAKE_BUILD_DIR}" |
| 399 |
doxygen Doxyfile || die "Failed to generate docs." |
| 400 |
fi |
| 401 |
} |
| 402 |
@@ -53,9 +53,9 @@ |
| 403 |
src_test() { |
| 404 |
echo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
| 405 |
|
| 406 |
- pushd "${WORKDIR}/${PN}_build" > /dev/null |
| 407 |
+ pushd "${CMAKE_BUILD_DIR}" > /dev/null |
| 408 |
|
| 409 |
- if ! LD_LIBRARY_PATH="${WORKDIR}/${PN}_build/opensync/" emake -j1 test ; then |
| 410 |
+ if ! LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/opensync/" emake -j1 test ; then |
| 411 |
die "Make test failed. See above for details." |
| 412 |
fi |
| 413 |
|
| 414 |
@@ -66,7 +66,7 @@ |
| 415 |
cmake-utils_src_install |
| 416 |
|
| 417 |
if use doc ; then |
| 418 |
- cd "${WORKDIR}/${PN}_build" |
| 419 |
+ cd "${CMAKE_BUILD_DIR}" |
| 420 |
dohtml docs/html/* || die "Failed to install docs." |
| 421 |
fi |
| 422 |
} |
Archives