Patchset moved to Gentoo mirrors.

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

7 files changed, 11 insertions, 99 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/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