summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-06-01 18:26:26 +0000
committerUlrich Müller <ulm@gentoo.org>2013-06-01 18:26:26 +0000
commit102984be5c0dfed723fe611aed141001188734b8 (patch)
tree1ff071a1891072b6a1d6402944011c42d46f5107
parenttake ownership (diff)
downloadhistorical-102984be5c0dfed723fe611aed141001188734b8.tar.gz
historical-102984be5c0dfed723fe611aed141001188734b8.tar.bz2
historical-102984be5c0dfed723fe611aed141001188734b8.zip
Patchset moved to Gentoo mirrors.
Package-Manager: portage-2.1.12.2/cvs/Linux x86_64 Manifest-Sign-Key: 0x9433907D693FB5B8!
-rw-r--r--x11-libs/motif/ChangeLog8
-rw-r--r--x11-libs/motif/Manifest32
-rw-r--r--x11-libs/motif/files/motif-2.3.4-automake-1.13.patch18
-rw-r--r--x11-libs/motif/files/motif-2.3.4-fc-config.patch25
-rw-r--r--x11-libs/motif/files/motif-2.3.4-install-dirs.patch18
-rw-r--r--x11-libs/motif/files/motif-2.3.4-parallel-make.patch15
-rw-r--r--x11-libs/motif/files/motif-2.3.4-solaris-11.patch13
-rw-r--r--x11-libs/motif/motif-2.3.4-r1.ebuild13
8 files changed, 25 insertions, 117 deletions
diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog
index c608c54f902e..0f1fa721674e 100644
--- a/x11-libs/motif/ChangeLog
+++ b/x11-libs/motif/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/motif
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.31 2013/05/13 20:02:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.32 2013/06/01 18:25:55 ulm Exp $
+
+ 01 Jun 2013; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r1.ebuild,
+ -files/motif-2.3.4-automake-1.13.patch, -files/motif-2.3.4-fc-config.patch,
+ -files/motif-2.3.4-install-dirs.patch,
+ -files/motif-2.3.4-parallel-make.patch, -files/motif-2.3.4-solaris-11.patch:
+ Patchset moved to Gentoo mirrors.
13 May 2013; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r1.ebuild,
+files/motif-2.3.4-solaris-11.patch:
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 0b9c7bbf9f49..dc48ae88280c 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -4,33 +4,29 @@ Hash: SHA256
AUX Mwm.defaults 536 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab WHIRLPOOL dbef57a2fb37b93f38993aa4ca04b082a4e8fbde3142867c11c4acd2e7a53ffdb65ef299d8f96cc06eb6572aa29ae8e6db8f3f9499aa46669f199f9f35023db1
AUX motif-2.3.2-sanitise-paths.patch 734 SHA256 dfdbe238d4009588ee8d3a0a1f8eacf1fffabff746504393a3da87a643c7c086 SHA512 336b02bf89ac049ba01552b191dc3611c060b63217387acc0be0774a2351e1ba9cf094be913d6081aba5f096d39cd4c21c9545fba5452815812f54bdb645d5be WHIRLPOOL 224f4da595f8240ae2a2c7f5e3281dee5272c3b5101c7c650b04e6768d8d1b2355969581461442918bed900fdcba659cdd23ff78b7985a982c779675646c9a93
AUX motif-2.3.2-solaris-2.11.patch 409 SHA256 cfd6f6dde2edd3907b3dc712d2df2096478b20ca4d4dc523b45058c50656a0b7 SHA512 f9b318b62f9c64409c1867f037eb9d52f0b56c538f16b046b1808a14fbc47aa27ae234402df43e03c4cd209df2dd58a7072d969f20717f97de0c662cc72db526 WHIRLPOOL 309800a01dd44ecbc6bed7ac519ec4c9f0add5451dccdd2130e8c1204a9ae4e76b65b01ed9e03d7335155ff3fe3840f875de69536fd03928392574d2a08944db
-AUX motif-2.3.4-automake-1.13.patch 358 SHA256 3e17cef2e33f8e952505972e7bd625b617fd54a829e370298ef5570cf697d803 SHA512 1d6df2858ae3064fb6f71e9c2673559b7d2ccc729b2dcdda4b71f8052491fb4225e253ca9326f016c898d499409bb75be0c1cb8dbd40d948c67b4333722f3a35 WHIRLPOOL f22323f33351b3bb3ca166ab91919b98c0a8de5520a4cb4007ccd465197a096de5dc5f049a04348ba4be8494341353003d1e10af2ed94d40b722f4a49a45811e
-AUX motif-2.3.4-fc-config.patch 638 SHA256 85e3d8d4db3d9f19a2592517a9473f4fbc454e4fc41136d20c21bf5a8f485bd6 SHA512 0785e4a8528063b01383a52835327425b10b4af955f9365c3d06008346158f2497338afbb52ca65e64140f51195427f1ce8e16717574f2d9622ed7bf6a34c456 WHIRLPOOL 2567538813462c4f93a2ba478e9eb87b0f7d055eaa242e2334c7403269c2b85c40bfcab86876ea973a4fb3de47a84600864500f9a636c65c96224fedd56c2ae9
-AUX motif-2.3.4-install-dirs.patch 394 SHA256 70d14182d1f5695f9f4b7e49fa521dfd87d0f61e396006554feee0cde7a0cf31 SHA512 ecc8c02cf8636a35399e69d8f44949cd9072689d4d4d9973d9979866a3694a6c3f91e7e33b793cd816f20ced06702b2d66dcf54024c09c37f43bb2ccb1010ad2 WHIRLPOOL db5744ecc6a6d554042a1dfda2966ff0e5334dbc20752155a29ec9e7b744128440ac96c4873b10a6bd412180d87c9a17c47e716b967aacc428f855aa3e42d7e2
-AUX motif-2.3.4-parallel-make.patch 792 SHA256 045b1003a819db5ba7cf9e2658cf50ea133c24fc3b89acca676bf59177f54006 SHA512 6e6550a76e15cdca6a4374ed4a1ec941c4438e88e4cd147ebe11fdff5765bebbb242f9981b8602807faf15d8a3f7ce8507517809cf37cc81bf89a6f0fd2e9d8c WHIRLPOOL 9d60ca2a53162198b9044d5acde9d3801d14c4ae20f205c77b316869182bd647c63e0433e58aeba5add87a42fbb0233d8d3f195b5d856d6e9983e938e115081a
-AUX motif-2.3.4-solaris-11.patch 483 SHA256 a2389f77d1ae2c0c4772dc2389c427a3790bee9ad63aab59f65f1b862a78270a SHA512 d4b5c8cfcbfc990686b075f2d675e4ce11dd438bda7e87adba05dc29782eb6221d1c69a8cfca0037d60a7e91ed2a45b88067c63f27a9bdb3b2e04dc889a58b15 WHIRLPOOL 10e712326563e60581975fbe882cd693b880dd1e8f6775b38a3c5b86040c01284878c3e2b17ce802f41b53015c3a3010b5b38b2fd4ffb56238c49015ea55289d
AUX motif-2.3.4-solaris.patch 541 SHA256 b9b6b9eb830d950214b2826d08e946440950593cbd881f9c0e8e68800ba74ec9 SHA512 aab5062aad07007241f8e5f37f73b5a6b68bea8811a0946895bb583435f09b6549657501bc61bd458bdae77c2d245e45b2544675aa41197d9f473711279b6641 WHIRLPOOL 153ca01765883e13f21dce0131db5981a2175752b0388503a4e72273999bd7f86ee87b9562d3f76c6df5e28783a9c67df2894f7edc4df2152d17b168161ff842
+DIST motif-2.3.4-patches-1.tar.xz 1776 SHA256 b5c9a0d026202c488a95b24beaefc63139b0cd30084af66da4247117c8c2d1e6 SHA512 f6773e0d7720adff8b5225025a682d12a4a60465c2a49d26df29daf7f8d7891f68b7ad3e284ff5cc73938ec4c78ed27216f9304f35905267b28c33f6d29b5666 WHIRLPOOL e677f210513dbb2ce68bffa0662443e232b2515c7796165cfe66e6c15cf765a9477362ba1d9ce42ef606c351df6e342063733fde907995d0954a10929ebacad1
DIST motif-2.3.4-src.tgz 9527040 SHA256 637efa09608e0b8f93465dbeb7c92e58ebb14c4bc1b488040eb79a65af3efbe0 SHA512 fb1033caa68f25b93282fa6700d5b7856be217b3651072d86e7c93a747df5b31219230998eb93deae22a8fa698e816b1a30e52b3ae88ae1c01c1f0aac59a2af2 WHIRLPOOL 9e4447fb1ac09a41cd6c61af52584f42fee3d026874bc15e258bc79f239f95a21bb3fe79ed7df08d86aaac370a669ec83cacc9eadb11320fbad6df6c27715d95
DIST openMotif-2.2.3.tar.gz 5149785 SHA256 12fc0d1de53ff30307603e31826db9b63a442f6f743451aed2cb7cedb038d3d9 SHA512 322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8 WHIRLPOOL 970f3f20eefde787af9fa932dcbf77e870ca6ba248e2632c358bbb7d149c2c4fef31a33a64888bc2b2e891f1c66a803a12e1121378539a94599e0be753c04bad
DIST openmotif-2.2.3-patches-4.tar.bz2 20601 SHA256 424bc4216db5f13bbe92dade35eb14dddc781a5598508539920595590169b449 SHA512 48490c4d031cdf1930035ad288ad85228168a9589db4f6660f2b6ccbca7e7c01d0bdf1c0e3583d3a83f0ae6b9f3dec7eb91bc0cf2e38a0f9fd35c9301c0a3428 WHIRLPOOL b3398492c05c01615ba751e6c04825415c4a168a3ab5144c35e8e110f53b8ccd96bf0568890184f8b4e54278cc0bbdf57a1d231f36a4a26b8f4179cfeeecc9df
DIST openmotif-2.2.3-patches-5.tar.xz 19972 SHA256 69e1b1e37023ce0aa65c1aa8bdb60a6b2ead3472df26f1d10bffae7386b24c35 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9 WHIRLPOOL e2f8abc439d25d631b8489e1007788e931ea4982957d50e0e3e1062b76a3d37b279140f30bac95ab378a76cc33d5a49c1c217a66c441959510d9a96d7409d4af
EBUILD motif-2.2.3-r11.ebuild 1649 SHA256 ab7c1ba8b77bfa9bd88793aa4a87ffdabda86670d03b7b800914ea4fa8ae0051 SHA512 129297b11c977ee879a34aafc5a22bdd05f0dfab18f50192d7116b1d550c92d7901ac2872d4f418f8bd3cf55da5b5ccda68aae7651e1e009e2602a459888e1f4 WHIRLPOOL e751d5ea8ae0ed54437c73ce81da716ca683994e5efa1dcda06689f905e73a7f9d3c483a0bcb2697938b023f5b8049f683a11990f83b58993877b0a73ac29785
EBUILD motif-2.2.3-r12.ebuild 1945 SHA256 578767e1ef42a2a698c71d70923b8eccb85d91c11783c3d3f45e7cb49c30720c SHA512 0252c70bad82ffee132de9bd43dbff849222fe6af6099aa3fafeac6f9b0f9bf999f717a61212cb38ee02d25fa66a6b59f3c26829a9c200c320b42d1e8f1dcc03 WHIRLPOOL da02b5b25fec30494319130f1cf721311bd53a41d2378fa9978022984de5e877cbe8909f77bdda34049bfb11c8ac933403c36055272f3fa460a83d9e71144c2c
-EBUILD motif-2.3.4-r1.ebuild 3992 SHA256 3086bc98c731f0f62bfffaf6e69c42958901dae62ade95ffed45a1013c97cf46 SHA512 2cdf816ca073e2f07d4d7070e831b3338bb0b89e477484079dee2300736f86fd1549515c361f1e51279ed80e3bbea5b6c543fa5382ab06d5864a6f1b7bf9735c WHIRLPOOL 80522231370e3de8d0ba55f1f47ee9eb24934c5fa22085789a3b17625ab5fee14feed54613191e8df5e5efc4123bf1a8c0920cad24217b3d8f09ed2d90b15b4b
+EBUILD motif-2.3.4-r1.ebuild 3736 SHA256 576f728b041d548a8365f73965934408c5977bcc7dd4f958e826eb3c1c72f319 SHA512 07242a614e45f6046ef164186123620cdeb0c6f2639de429ddf8eec26bfe34bf0a831a64eeaea4408cd8c69d65bbe0d8203505e53b49db461aa3d92210098109 WHIRLPOOL f3cd967abb09406d7256d5c1e2430d15caa74592e82ce2c587eda596776c6d7aff60b4eaaf28b81386ec5dbb315461d0ad8a8c502da57d594afaaab9da1357d8
EBUILD motif-2.3.4.ebuild 2860 SHA256 6cac577c5e54043e0f220f124f65020d867b5e9015f8f6036683fb91354503ac SHA512 d183b21cdcfb394db3b24d9e8ddf7161f67169c0354d52cf6e04d2b5e744bef9a2a3108f90025ce67d12a9ad210ab8edbddb26c2715e08435bcfe4e1c28c9a37 WHIRLPOOL 0e113655d2855700431f345b495912708f4ad093d7f11311629f06184c3a4db038062c6893e4177281dc1dfadd0a85426f2273d53875e1793c78d89674bc55fa
-MISC ChangeLog 45327 SHA256 e7cf398e8cc84b96e2f9754eb770d48241c09768609184edcd40b1768f979334 SHA512 e35b37e70cfbc6b8335a5737e60b5f62992cd8901a374526c6cd63dfcd0377b7598cebce19fe52bd39c8cb2bf326d55dbd006470801b0a3e504910c86d46bfef WHIRLPOOL 4d6d6ddd28349d47632351ee6f3614589fb61bf8f9953749ea4c4d6c42e7aec33f27f215bc05920c2be2cd725d14ea7a2ef58c5236cef422c90463b417be4c67
+MISC ChangeLog 45632 SHA256 81d1a4fbeac8f697ffefbe23439460833191ec7182ee99fd3d524e51ca2515f5 SHA512 2421fea498dcc3054af0b6154e09487583a55070081c9bc6366bd1e62d60d0e12c62a130de21a6ed68d8bc55ed0768ef17d5311405907e3b7e5bfdb324deee63 WHIRLPOOL ca32133ab93ecf19c06df83b33e056ca60633064cc030447a194785ef608dad656ce10ed4ac2cf69492909086af14660bd71d8aa1b65760a35ce9a77513077c7
MISC metadata.xml 289 SHA256 3c01ca1c89b14ec531baa83995a170fb4eaf7072daea1f12a87c5fe3aaec81a5 SHA512 f80ef1bc9169c6027df0715e76c50786aedb1053a35c699c5cacffd2c3e4d0640e123d5ec67634cfcfb1bdc2de43dba6f6819b1a3bd5458d061da675a23ecb80 WHIRLPOOL dbbda9b74ae8b7ed91a3abab4398484706036c51c4fb8c0f1df3c4539c9c2a8c4075abdd172ef2c734d952d13202928870d32b0b6189bbd41fa2431b53de72c3
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
-iQGcBAEBCAAGBQJRkUiqAAoJEJQzkH1pP7W4yL8L/RJ8JXAvWErPchikQsjbUUax
-w/zc8o4C3Pw5IZZPu3b3vwyGtw1TlV8jwD50CciLCjyyvFYIAWbiRzNXRZ83RkLv
-UFHrEOrB34vyeh3XHThkUEo01pa1SmTR1sfiAeeFaCjrvA4ryMRZXDGWZBx8PaJ3
-t3MjCX2Q7dk/DU4Vi6wM0IBpXHwQ0bZFbca2cqEuBAUeFNewhqDfJQgedvndt8ww
-RtM7F8duoSDm2VfR1xhAlZMeG5JXbKE8OYqw2YA4Ci6n1xGHlE+C/UcJ72IX2+wo
-id8wO949qJ0H9IvYCjTXCyu/4OvalkT222HXvQxrIlh9dMyU845FaYzxU4dFrRp4
-9sgF83yWn4j3qMeYIBTXAAoMxkJfspjsDU4/sdqyIErDmBUp0fkO+gHEPqJz3sFq
-geBiMhwmIzK/fklc6vKn9rQBfqy/vCuD3CZuF9zEkaGbtHwBe/Spxoujz1HBE5rU
-AAh6KK/JOgeqCtR34m5e7WEaWhVmOqIF75MdJg7Bqw==
-=1KvI
+iQGcBAEBCAAGBQJRqj6mAAoJEJQzkH1pP7W4y3gL/1XCu5ecFy+1IWtpGRNfu8vF
+98jCLkTZCKbcVEAyrl+UwzRjq8ZiKlmwnx5C5fX3Ip7AU2Ber5R06fJeR5ct+Pew
+PA2zBViM4fysNLR0GF2Qr1k5Gv2qOeEsyWCyW+vJBkLvvY4poPE69ELAJq0BndB9
+ckq/bAiidcPLrNEhWf5Nfx/nDgmHVOqDzyqBzWJD8hbhd96Jlk4o/s8vWJ2cPaAs
+5mbOgJusosyjxJwcfRsaQs/QbCK9Ris9mwhxDoGhHyjfczmfIPwc7wERYnGOZMH2
+3JJ4ZGOdefA9SY/O5J/eOkx1h/3AM4bFbxqZuVBLbaoD12sg/dwuOw2IsXQYI41n
+ikphGdqPHzEhqlq4Z/wPt6kcin5WiVwyuwqXfxpDzvKe500WyoWxbymS90SOPCT7
+pkiatut3AsSZzmnadvzWDG0w4HNnrlX7VPmfXzc8BgJrn6UtBlJmbwOllKFqO4PK
+7zUn/ss3wMYFOt3J1MuF1gMnMK5bhpD+lisw7GV/Fw==
+=wqGi
-----END PGP SIGNATURE-----
diff --git a/x11-libs/motif/files/motif-2.3.4-automake-1.13.patch b/x11-libs/motif/files/motif-2.3.4-automake-1.13.patch
deleted file mode 100644
index 3375f6e951e1..000000000000
--- a/x11-libs/motif/files/motif-2.3.4-automake-1.13.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-http://bugs.motifzone.net/show_bug.cgi?id=1595
-
---- motif-2.3.4-orig/configure.ac
-+++ motif-2.3.4/configure.ac
-@@ -31,12 +31,11 @@
- dnl
- dnl AC_DISABLE_STATIC
-
--AM_CONFIG_HEADER(include/config.h lib/Xm/Xm.h)
-+AC_CONFIG_HEADERS(include/config.h lib/Xm/Xm.h)
-
- dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_CPP
--AM_PROG_CC_STDC
- AM_PROG_LIBTOOL
-
- AC_EXEEXT
diff --git a/x11-libs/motif/files/motif-2.3.4-fc-config.patch b/x11-libs/motif/files/motif-2.3.4-fc-config.patch
deleted file mode 100644
index 6de250563415..000000000000
--- a/x11-libs/motif/files/motif-2.3.4-fc-config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-AC_FIND_XFT looks for the fontconfig-config program which does not
-exist any more. Fall back to "pkg-config fontconfig".
-https://bugs.gentoo.org/462232
-http://bugs.motifzone.net/show_bug.cgi?id=1593
-
---- motif-2.3.4-orig/ac_find_xft.m4
-+++ motif-2.3.4/ac_find_xft.m4
-@@ -189,7 +189,7 @@
- yes)
- case "$fc_config" in
- no)
-- FONTCONFIG_CFLAGS=""
-+ FONTCONFIG_CFLAGS="`pkg-config fontconfig --cflags`"
- ;;
- *)
- FONTCONFIG_CFLAGS="`$fc_config --cflags`"
-@@ -208,7 +208,7 @@
- yes)
- case "$fc_config" in
- no)
-- fontconfig_lib=""
-+ FONTCONFIG_LIBS="`pkg-config fontconfig --libs`"
- ;;
- *)
- FONTCONFIG_LIBS="`$fc_config --libs`"
diff --git a/x11-libs/motif/files/motif-2.3.4-install-dirs.patch b/x11-libs/motif/files/motif-2.3.4-install-dirs.patch
deleted file mode 100644
index 8b525aaccf20..000000000000
--- a/x11-libs/motif/files/motif-2.3.4-install-dirs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- motif-2.3.4-orig/configure.ac
-+++ motif-2.3.4/configure.ac
-@@ -179,13 +179,13 @@
- LIBDIR="${libdir}/X11"
- AC_SUBST(LIBDIR)
-
--MWMRCDIR="${libdir}/X11"
-+MWMRCDIR="${sysconfdir}/X11/mwm"
- AC_SUBST(MWMRCDIR)
-
- INCDIR="${includedir}/X11"
- AC_SUBST(INCDIR)
-
--XMBINDDIR_FALLBACK="${libdir}/X11/bindings"
-+XMBINDDIR_FALLBACK="${datadir}/X11/bindings"
- AC_SUBST(XMBINDDIR_FALLBACK)
-
- RM="rm -f"
diff --git a/x11-libs/motif/files/motif-2.3.4-parallel-make.patch b/x11-libs/motif/files/motif-2.3.4-parallel-make.patch
deleted file mode 100644
index c8733e9f6ae1..000000000000
--- a/x11-libs/motif/files/motif-2.3.4-parallel-make.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.motifzone.net/show_bug.cgi?id=1592
-
---- motif-2.3.4-orig/lib/Xm/Makefile.am
-+++ motif-2.3.4/lib/Xm/Makefile.am
-@@ -283,7 +283,9 @@
- $(top_builddir)/config/util/makestrs:
- ( cd $(top_builddir)/config/util && $(MAKE) $(AM_MAKEFLAGS) makestrs )
-
--$(STRING_FILES): Makefile $(XMSTRING_LIST) XmStrDefs.ht XmStrDefsI.ht XmStrDefs.ct $(top_builddir)/config/util/makestrs
-+XmStrDefs.h XmStrDefs22.h XmStrDefs23.h XmStrDefsI.h: XmStrDefs.c
-+
-+XmStrDefs.c: Makefile $(XMSTRING_LIST) XmStrDefs.ht XmStrDefsI.ht XmStrDefs.ct $(top_builddir)/config/util/makestrs
- test -f $(XMSTRING_LIST) || $(LN_S) $(srcdir)/$(XMSTRING_LIST) $(XMSTRING_LIST)
- test -f XmStrDefs.ht || $(LN_S) $(srcdir)/XmStrDefs.ht XmStrDefs.ht
- test -f XmStrDefs22.ht || $(LN_S) $(srcdir)/XmStrDefs22.ht XmStrDefs22.ht
diff --git a/x11-libs/motif/files/motif-2.3.4-solaris-11.patch b/x11-libs/motif/files/motif-2.3.4-solaris-11.patch
deleted file mode 100644
index 4a6b23661e47..000000000000
--- a/x11-libs/motif/files/motif-2.3.4-solaris-11.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/465426
-
---- motif-2.3.4-orig/lib/Xm/Xmos_r.h
-+++ motif-2.3.4/lib/Xm/Xmos_r.h
-@@ -602,7 +602,7 @@
- # endif
- } _Xreaddirparams;
-
--# if defined(AIXV3) || defined(AIXV4) || defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-+# if defined(AIXV3) || defined(AIXV4) || defined(HAVE_READDIR_R_3) || defined(_POSIX_THREAD_SAFE_FUNCTIONS)
- /* AIX defines the draft POSIX symbol, but uses the final API. */
- /* POSIX final API, returns (int)0 on success. */
- # if defined(__osf__)
diff --git a/x11-libs/motif/motif-2.3.4-r1.ebuild b/x11-libs/motif/motif-2.3.4-r1.ebuild
index a8d5d29913cd..56ae0b58d388 100644
--- a/x11-libs/motif/motif-2.3.4-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.18 2013/05/13 20:02:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.19 2013/06/01 18:25:55 ulm Exp $
EAPI=5
@@ -9,7 +9,8 @@ inherit autotools eutils flag-o-matic multilib multilib-minimal
DESCRIPTION="The Motif user interface component toolkit"
HOMEPAGE="http://sourceforge.net/projects/motif/
http://motif.ics.com/"
-SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}-src.tgz"
+SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}-src.tgz
+ mirror://gentoo/${P}-patches-1.tar.xz"
LICENSE="LGPL-2.1+ MIT"
SLOT="0"
@@ -39,13 +40,7 @@ DEPEND="${RDEPEND}
x11-misc/xbitmaps"
src_prepare() {
- epatch "${FILESDIR}/${P}-solaris.patch"
- epatch "${FILESDIR}/${PN}-2.3.2-sanitise-paths.patch"
- epatch "${FILESDIR}/${P}-parallel-make.patch"
- epatch "${FILESDIR}/${P}-install-dirs.patch"
- epatch "${FILESDIR}/${P}-fc-config.patch"
- epatch "${FILESDIR}/${P}-automake-1.13.patch"
- epatch "${FILESDIR}/${P}-solaris-11.patch"
+ EPATCH_SUFFIX=patch epatch
epatch_user
# disable compilation of demo binaries