aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <seb@localhost.(none)>2010-02-04 18:21:12 +0000
committerSebastien Fabbro <seb@localhost.(none)>2010-02-04 18:21:12 +0000
commitfe98906ece1401fb3ed90302a62c69c6843fecc2 (patch)
treeee6f6095e03f51d5ae8c51f55f7049ef799d229e
parentMerge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci (diff)
downloadsci-fe98906ece1401fb3ed90302a62c69c6843fecc2.tar.gz
sci-fe98906ece1401fb3ed90302a62c69c6843fecc2.tar.bz2
sci-fe98906ece1401fb3ed90302a62c69c6843fecc2.zip
Fixed conflict man dir for brlcad
-rw-r--r--sci-misc/brlcad/ChangeLog3
-rw-r--r--sci-misc/brlcad/Manifest14
-rw-r--r--sci-misc/brlcad/brlcad-7.16.4.ebuild2
3 files changed, 6 insertions, 13 deletions
diff --git a/sci-misc/brlcad/ChangeLog b/sci-misc/brlcad/ChangeLog
index 831b23328..5d8bd2aa2 100644
--- a/sci-misc/brlcad/ChangeLog
+++ b/sci-misc/brlcad/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 04 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org> brlcad-7.16.4.ebuild:
+ Changed man directory to avoid conflicts
+
*brlcad-7.16.4 (02 Feb 2010)
02 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-misc/brlcad/Manifest b/sci-misc/brlcad/Manifest
index f8a16e177..4186e6de1 100644
--- a/sci-misc/brlcad/Manifest
+++ b/sci-misc/brlcad/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX brlcad-7.16.4-as-needed.patch 523 RMD160 6517dca7843970851e09b9e3194e2bdef617859a SHA1 feeff9d7a85dc8279e2b7b26f0faef8da607c079 SHA256 ab12e2495092f72caff79c949b50b3a5a1b0375ed0093a1bece01176ae32b219
DIST brlcad-7.16.4.tar.gz 51167790 RMD160 0616e179ff4f6f9a8cfc1f132423f1941b4ca27d SHA1 27cb2defd343e08199ebca77302ca2f3b2a8dd70 SHA256 3c1dbbb264dbbcabe0aa080f566c62748d7bcc44b667172bcbbef20dd1f90f54
-EBUILD brlcad-7.16.4.ebuild 2253 RMD160 2a0247b9bc21859b341737e758d74e714c0d232d SHA1 cdf1a2617ffa311c9ac452324469d8b63c2e100e SHA256 5b47637782c2e8dadec75a5b7240d41aadc29ddd2093c76c859eb61510b46a80
-MISC ChangeLog 1169 RMD160 59f209136706d3adb4dc265d5070d3f213fa4ec1 SHA1 65f280fd78efa3a9a1cdca0ad0f2e81ff78f288d SHA256 725aa8db93847a0a24479d943aee7cc1c1aa35bbf7bc7d2485ddb77ef7aadc31
+EBUILD brlcad-7.16.4.ebuild 2256 RMD160 69db7db4fd46d4dfc009dde1aa0e24569337f710 SHA1 c0935c38b85474428213fd004717e6bf008404f8 SHA256 9c1298ec283d7b025ff341eefd40f7313736c6b83217d21d51a8e2c2a426e4e6
+MISC ChangeLog 1290 RMD160 c2276e47e530d148109d0362233a810f9f226524 SHA1 736f8a70765dc31782c3cd658f5d0a44d880e777 SHA256 f5bedaa5ca75db86c07e6a06f8d0634b5ea08ac746b718e81e82aeaa0a76d263
MISC metadata.xml 993 RMD160 2d5c3e246d2a1ce29f86d2de3e7e1ee1edfc6439 SHA1 a1388baccc66f393c78915d72f2a96a4bcb92156 SHA256 b3dd606feb759dba2840423c656bb78dfd324dd2e95f1def30a8340c090b8c19
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktolDIACgkQ1ycZbhPLE2A1mQCdG3vLuylJjC9Al95KVItFlViV
-jbAAn3btcEETANca8LFwQgfzsMGsJ2V4
-=z88g
------END PGP SIGNATURE-----
diff --git a/sci-misc/brlcad/brlcad-7.16.4.ebuild b/sci-misc/brlcad/brlcad-7.16.4.ebuild
index 2b28a97f5..14bc6af06 100644
--- a/sci-misc/brlcad/brlcad-7.16.4.ebuild
+++ b/sci-misc/brlcad/brlcad-7.16.4.ebuild
@@ -47,7 +47,7 @@ src_configure() {
econf \
--prefix="${BRLCAD_DIR}" \
--datadir="/usr/share/${PN}" \
- --mandir="/usr/share/man" \
+ --mandir="${BRLCAR_DIR}/man" \
--disable-almost-everything \
--disable-regex-build \
--disable-png-build \