Multilib fix for additional posix headers.

Package-Manager: portage-2.1.2_rc4-r2

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 4f57db7cb362fa2ac5cfd675c30374afb157c66b..5b3cbd99668670648af192b56e8f856e1273558c 100644 (file)
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mercury-extras
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.61 2007/01/13 11:04:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.62 2007/01/13 20:51:06 keri Exp $
+
+  13 Jan 2007; keri <keri@gentoo.org>
+  files/mercury-extras-0.12.2-posix.patch,
+  files/mercury-extras-0.13.1-posix.patch:
+  Multilib fix for additional posix headers.
 
   13 Jan 2007; keri <keri@gentoo.org> mercury-extras-0.12.2-r2.ebuild,
   mercury-extras-0.13.1.ebuild:

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 4ba2bd15733709fd748c3897789f130f262d8aa8..4b1a2ca15c2f4296ac39392ac052bc017784c582 100644 (file)
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -34,10 +34,10 @@ AUX mercury-extras-0.12.2-odbc.patch 1220 RMD160 e697733a639f81bcdc9010da481226f
 MD5 89a0a45245bd72fe139becbd4398ac29 files/mercury-extras-0.12.2-odbc.patch 1220
 RMD160 e697733a639f81bcdc9010da481226fbab50f375 files/mercury-extras-0.12.2-odbc.patch 1220
 SHA256 7b20c88383ced7e9d7c5be480885cf220c8cac65ef4729c441b7aca741d8d792 files/mercury-extras-0.12.2-odbc.patch 1220
-AUX mercury-extras-0.12.2-posix.patch 373 RMD160 4a451c2cb37d05aefac0f127f9971fba5bbc7535 SHA1 3c30540ffe61ebde533652736c65e9f935979dde SHA256 bb7f179bf838f76738d0cac0d1b30e07aea6ae6cb0a7e05ab2cba69bb3a5d85d
-MD5 9b59270ad11a77897c8ccb3a58dcf09c files/mercury-extras-0.12.2-posix.patch 373
-RMD160 4a451c2cb37d05aefac0f127f9971fba5bbc7535 files/mercury-extras-0.12.2-posix.patch 373
-SHA256 bb7f179bf838f76738d0cac0d1b30e07aea6ae6cb0a7e05ab2cba69bb3a5d85d files/mercury-extras-0.12.2-posix.patch 373
+AUX mercury-extras-0.12.2-posix.patch 354 RMD160 d9eaf3b52ad376a30b3b5b3a3229c0ef5ba51c93 SHA1 3077bb3556e387909bd9c0db8bdfa6f89657d41b SHA256 c27f7abb217d0db2c754aa4d4155bb26d86a3d21ec6a45f06ac93bd64643d0d7
+MD5 5cee8d0fc889e496ae8a4a4e60b0daa5 files/mercury-extras-0.12.2-posix.patch 354
+RMD160 d9eaf3b52ad376a30b3b5b3a3229c0ef5ba51c93 files/mercury-extras-0.12.2-posix.patch 354
+SHA256 c27f7abb217d0db2c754aa4d4155bb26d86a3d21ec6a45f06ac93bd64643d0d7 files/mercury-extras-0.12.2-posix.patch 354
 AUX mercury-extras-0.12.2-references.patch 513 RMD160 caa71ac5e0c9457b9ce48a0ea852fe107e3af0d8 SHA1 7944097b207480f6aede7d56754b6085e77b0c33 SHA256 02b567cd088fca260d80ca795d2f303860f87fd4005b7157ba97ef31f448fbe6
 MD5 b9fac0e10816ce66ea6e2ebe6034a1a9 files/mercury-extras-0.12.2-references.patch 513
 RMD160 caa71ac5e0c9457b9ce48a0ea852fe107e3af0d8 files/mercury-extras-0.12.2-references.patch 513
@@ -78,10 +78,10 @@ AUX mercury-extras-0.13.1-odbc.patch 420 RMD160 0ca91b65a8a3b7907abe793940b59756
 MD5 fa7bd6d2f5361c893a5ea11bd0e3b352 files/mercury-extras-0.13.1-odbc.patch 420
 RMD160 0ca91b65a8a3b7907abe793940b59756bb913fa1 files/mercury-extras-0.13.1-odbc.patch 420
 SHA256 39425688328508864a4335c116891c9cd8e1bd7bd0a51dc7e8bcf916eebe9cea files/mercury-extras-0.13.1-odbc.patch 420
-AUX mercury-extras-0.13.1-posix.patch 373 RMD160 56f1d00fa93aaf41400428b80f79f72c69126ba3 SHA1 6e72e54a7dd0e5e5dcd0f464c5dc86e472ab9f5a SHA256 7a31af4cb9621ada7653caa2c4acf3e882ec1472909ec5906c45ac815b25297d
-MD5 879eb5cc5e95fb5d5efe99aa6acf42e5 files/mercury-extras-0.13.1-posix.patch 373
-RMD160 56f1d00fa93aaf41400428b80f79f72c69126ba3 files/mercury-extras-0.13.1-posix.patch 373
-SHA256 7a31af4cb9621ada7653caa2c4acf3e882ec1472909ec5906c45ac815b25297d files/mercury-extras-0.13.1-posix.patch 373
+AUX mercury-extras-0.13.1-posix.patch 354 RMD160 3d8b68c5efabda81ad117c6282f09b25741366ac SHA1 d66442038b7d93a5b4cdc6a0ab9cb666cdef9c07 SHA256 d47871298f94007173f6aee19e1597f57400654d9ece94ae94cf14fa0118efdf
+MD5 ab8576cf80a278975537d87527d865cc files/mercury-extras-0.13.1-posix.patch 354
+RMD160 3d8b68c5efabda81ad117c6282f09b25741366ac files/mercury-extras-0.13.1-posix.patch 354
+SHA256 d47871298f94007173f6aee19e1597f57400654d9ece94ae94cf14fa0118efdf files/mercury-extras-0.13.1-posix.patch 354
 AUX mercury-extras-0.13.1-references.patch 513 RMD160 e9e24c95c60ac0eb5b7145d9c345ab604f0bbe93 SHA1 a07a8217d22a1f8fbdc5da804b074e6bc70cd29b SHA256 02e4142693f792af9457f68b90ee39560b62b4041e86a3099f7f9c49f07f30a6
 MD5 1f3595ccab1c235b110dcee1716c9f59 files/mercury-extras-0.13.1-references.patch 513
 RMD160 e9e24c95c60ac0eb5b7145d9c345ab604f0bbe93 files/mercury-extras-0.13.1-references.patch 513
@@ -100,10 +100,10 @@ EBUILD mercury-extras-0.13.1.ebuild 3637 RMD160 9606d5dcb7cb9225c29fe31efef14348
 MD5 8f2895c14768df02b19c8a97abe7d099 mercury-extras-0.13.1.ebuild 3637
 RMD160 9606d5dcb7cb9225c29fe31efef14348883f403a mercury-extras-0.13.1.ebuild 3637
 SHA256 488115e5f33c0c4c9dbcb411cb292bd186aa84f06352cc041905a515f575411a mercury-extras-0.13.1.ebuild 3637
-MISC ChangeLog 16566 RMD160 33c1290067a8c146048241f60b8d44d4d780e2a3 SHA1 9d22d8953ee3ccdab22d61b6986f7d269fda0072 SHA256 48023ef80a8bbf3285f79965a047ef6066a9823bf8193e689e05da36d86d580e
-MD5 512b89976f111d0a17c5acd92dae89b5 ChangeLog 16566
-RMD160 33c1290067a8c146048241f60b8d44d4d780e2a3 ChangeLog 16566
-SHA256 48023ef80a8bbf3285f79965a047ef6066a9823bf8193e689e05da36d86d580e ChangeLog 16566
+MISC ChangeLog 16736 RMD160 e68facc51f3f846febf97b3b3688146e988a5e87 SHA1 0b87f98bba6761300bc52c365760374af7b47280 SHA256 17cc7e8f91808a93d25e44e7f8e4076be0fbb554a27925d38fafcf3ef236a673
+MD5 e17b9137ff4b93d6024feeb61e565166 ChangeLog 16736
+RMD160 e68facc51f3f846febf97b3b3688146e988a5e87 ChangeLog 16736
+SHA256 17cc7e8f91808a93d25e44e7f8e4076be0fbb554a27925d38fafcf3ef236a673 ChangeLog 16736
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247

diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-posix.patch b/dev-lang/mercury-extras/files/mercury-extras-0.12.2-posix.patch
index c9316d91fea4565f36d0dc07341f5c35c39d6b81..b5beebc78cbf1bb90a9624818f73f51a601eaa40 100644 (file)
--- a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-posix.patch
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.12.2-posix.patch
@@ -5,7 +5,7 @@
  .PHONY: install
  install: libposix.install
 -      cp $(ADDITIONAL_HDRS) $(INSTALL_PREFIX)/lib/mercury/inc
-+      cp $(ADDITIONAL_HDRS) $(INSTALL_PREFIX)/lib/mercury-0.12.2/inc
++      cp $(ADDITIONAL_HDRS) $(INSTALL_LIBDIR)/inc
  
  .PHONY: clean
  clean:

diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-posix.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-posix.patch
index 270f0da84162970dde216e11b3ade6eb16d62424..2bdbc38dfd02f6c60784f1ac7f2a5f1945a488b9 100644 (file)
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-posix.patch
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-posix.patch
@@ -5,7 +5,7 @@
  .PHONY: install
  install: libposix.install
 -      cp $(ADDITIONAL_HDRS) $(INSTALL_PREFIX)/lib/mercury/inc
-+      cp $(ADDITIONAL_HDRS) $(INSTALL_PREFIX)/lib/mercury-0.13.0/inc
++      cp $(ADDITIONAL_HDRS) $(INSTALL_LIBDIR)/inc
  
  .PHONY: clean
  clean: