public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in x11-libs/motif: ChangeLog motif-2.3.4-r1.ebuild
@ 2013-03-16 17:58 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Mueller (ulm) @ 2013-03-16 17:58 UTC (permalink / raw
  To: gentoo-commits

ulm         13/03/16 17:58:06

  Modified:             ChangeLog motif-2.3.4-r1.ebuild
  Log:
  Install examples only once. Use default src_install function.
  
  (Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

Revision  Changes    Path
1.12                 x11-libs/motif/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?r1=1.11&r2=1.12

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog	15 Mar 2013 19:16:34 -0000	1.11
+++ ChangeLog	16 Mar 2013 17:58:06 -0000	1.12
@@ -1,6 +1,9 @@
 # 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.11 2013/03/15 19:16:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.12 2013/03/16 17:58:06 ulm Exp $
+
+  16 Mar 2013; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r1.ebuild:
+  Install examples only once. Use default src_install function.
 
 *motif-2.3.4-r1 (15 Mar 2013)
 *motif-2.2.3-r12 (15 Mar 2013)



1.2                  x11-libs/motif/motif-2.3.4-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?r1=1.1&r2=1.2

Index: motif-2.3.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- motif-2.3.4-r1.ebuild	15 Mar 2013 19:16:34 -0000	1.1
+++ motif-2.3.4-r1.ebuild	16 Mar 2013 17:58:06 -0000	1.2
@@ -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.1 2013/03/15 19:16:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.2 2013/03/16 17:58:06 ulm Exp $
 
 EAPI=5
 
@@ -106,17 +106,16 @@
 	multilib_foreach_abi my_other_abi_compile
 }
 
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	use examples && emake -C demos DESTDIR="${D}" install-data
-}
-
 multilib_src_install_all() {
 	# mwm default configs
 	insinto /usr/share/X11/app-defaults
 	newins "${FILESDIR}"/Mwm.defaults Mwm
 
 	if use examples; then
+		my_install_demos() {
+			emake -C "${BUILD_DIR}"/demos DESTDIR="${D}" install-data
+		}
+		multilib_for_best_abi my_install_demos
 		dodir /usr/share/doc/${PF}/demos
 		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
 	fi





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [gentoo-commits] gentoo-x86 commit in x11-libs/motif: ChangeLog motif-2.3.4-r1.ebuild
@ 2013-04-05 22:13 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Mueller (ulm) @ 2013-04-05 22:13 UTC (permalink / raw
  To: gentoo-commits

ulm         13/04/05 22:13:40

  Modified:             ChangeLog motif-2.3.4-r1.ebuild
  Log:
  Add slot operator to libpng dependency.
  
  (Portage version: 2.1.11.60/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

Revision  Changes    Path
1.16                 x11-libs/motif/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?r1=1.15&r2=1.16

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog	23 Mar 2013 15:07:24 -0000	1.15
+++ ChangeLog	5 Apr 2013 22:13:40 -0000	1.16
@@ -1,6 +1,9 @@
 # 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.15 2013/03/23 15:07:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.16 2013/04/05 22:13:40 ulm Exp $
+
+  05 Apr 2013; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r1.ebuild:
+  Add slot operator to libpng dependency.
 
   23 Mar 2013; Ulrich Müller <ulm@gentoo.org> motif-2.2.3-r12.ebuild,
   motif-2.3.4-r1.ebuild:



1.5                  x11-libs/motif/motif-2.3.4-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?r1=1.4&r2=1.5

Index: motif-2.3.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- motif-2.3.4-r1.ebuild	23 Mar 2013 15:07:24 -0000	1.4
+++ motif-2.3.4-r1.ebuild	5 Apr 2013 22:13:40 -0000	1.5
@@ -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.4 2013/03/23 15:07:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.5 2013/04/05 22:13:40 ulm Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@
 		x11-libs/libXft[${MULTILIB_USEDEP}]
 	)
 	jpeg? ( virtual/jpeg )
-	png? ( >=media-libs/libpng-1.4 )
+	png? ( >=media-libs/libpng-1.4:0= )
 	abi_x86_32? (
 		amd64? ( app-emulation/emul-linux-x86-baselibs )
 		!app-emulation/emul-linux-x86-motif





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [gentoo-commits] gentoo-x86 commit in x11-libs/motif: ChangeLog motif-2.3.4-r1.ebuild
@ 2013-04-15  9:18 Jeroen Roovers (jer)
  0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers (jer) @ 2013-04-15  9:18 UTC (permalink / raw
  To: gentoo-commits

jer         13/04/15 09:18:21

  Modified:             ChangeLog motif-2.3.4-r1.ebuild
  Log:
  Stable for HPPA (bug #465788).
  
  (Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.17                 x11-libs/motif/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?r1=1.16&r2=1.17

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog	5 Apr 2013 22:13:40 -0000	1.16
+++ ChangeLog	15 Apr 2013 09:18:21 -0000	1.17
@@ -1,6 +1,9 @@
 # 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.16 2013/04/05 22:13:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.17 2013/04/15 09:18:21 jer Exp $
+
+  15 Apr 2013; Jeroen Roovers <jer@gentoo.org> motif-2.3.4-r1.ebuild:
+  Stable for HPPA (bug #465788).
 
   05 Apr 2013; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r1.ebuild:
   Add slot operator to libpng dependency.



1.6                  x11-libs/motif/motif-2.3.4-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?r1=1.5&r2=1.6

Index: motif-2.3.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- motif-2.3.4-r1.ebuild	5 Apr 2013 22:13:40 -0000	1.5
+++ motif-2.3.4-r1.ebuild	15 Apr 2013 09:18:21 -0000	1.6
@@ -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.5 2013/04/05 22:13:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.6 2013/04/15 09:18:21 jer Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [gentoo-commits] gentoo-x86 commit in x11-libs/motif: ChangeLog motif-2.3.4-r1.ebuild
@ 2013-05-13 20:02 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Mueller (ulm) @ 2013-05-13 20:02 UTC (permalink / raw
  To: gentoo-commits

ulm         13/05/13 20:02:26

  Modified:             ChangeLog motif-2.3.4-r1.ebuild
  Log:
  Apply Solaris patch unconditionally, bug 465426.
  
  (Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

Revision  Changes    Path
1.31                 x11-libs/motif/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?r1=1.30&r2=1.31

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ChangeLog	7 May 2013 13:56:30 -0000	1.30
+++ ChangeLog	13 May 2013 20:02:26 -0000	1.31
@@ -1,6 +1,10 @@
 # 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.30 2013/05/07 13:56:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.31 2013/05/13 20:02:26 ulm Exp $
+
+  13 May 2013; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r1.ebuild,
+  +files/motif-2.3.4-solaris-11.patch:
+  Apply Solaris patch unconditionally, bug 465426.
 
   07 May 2013; Agostino Sarubbo <ago@gentoo.org> motif-2.3.4-r1.ebuild:
   Stable for sparc, wrt bug #465788



1.18                 x11-libs/motif/motif-2.3.4-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?r1=1.17&r2=1.18

Index: motif-2.3.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- motif-2.3.4-r1.ebuild	7 May 2013 13:56:30 -0000	1.17
+++ motif-2.3.4-r1.ebuild	13 May 2013 20:02:26 -0000	1.18
@@ -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.17 2013/05/07 13:56:30 ago Exp $
+# $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 $
 
 EAPI=5
 
@@ -45,9 +45,7 @@
 	epatch "${FILESDIR}/${P}-install-dirs.patch"
 	epatch "${FILESDIR}/${P}-fc-config.patch"
 	epatch "${FILESDIR}/${P}-automake-1.13.patch"
-	[[ ${CHOST} == *-solaris2.11 ]] \
-		&& epatch "${FILESDIR}/${PN}-2.3.2-solaris-2.11.patch"
-
+	epatch "${FILESDIR}/${P}-solaris-11.patch"
 	epatch_user
 
 	# disable compilation of demo binaries
@@ -68,7 +66,8 @@
 	append-flags -fno-strict-aliasing
 
 	# For Solaris Xos_r.h :(
-	[[ ${CHOST} == *-solaris2.11 ]] && append-flags -DNEED_XOS_R_H=1
+	[[ ${CHOST} == *-solaris2.11 ]] \
+		&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
 
 	if use !elibc_glibc && use !elibc_uclibc && use unicode; then
 		# libiconv detection in configure script doesn't always work





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [gentoo-commits] gentoo-x86 commit in x11-libs/motif: ChangeLog motif-2.3.4-r1.ebuild
@ 2013-06-01 18:25 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Mueller (ulm) @ 2013-06-01 18:25 UTC (permalink / raw
  To: gentoo-commits

ulm         13/06/01 18:25:55

  Modified:             ChangeLog motif-2.3.4-r1.ebuild
  Log:
  Patchset moved to Gentoo mirrors.
  
  (Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

Revision  Changes    Path
1.32                 x11-libs/motif/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?r1=1.31&r2=1.32

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ChangeLog	13 May 2013 20:02:26 -0000	1.31
+++ ChangeLog	1 Jun 2013 18:25:55 -0000	1.32
@@ -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:



1.19                 x11-libs/motif/motif-2.3.4-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?r1=1.18&r2=1.19

Index: motif-2.3.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- motif-2.3.4-r1.ebuild	13 May 2013 20:02:26 -0000	1.18
+++ motif-2.3.4-r1.ebuild	1 Jun 2013 18:25:55 -0000	1.19
@@ -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 @@
 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 @@
 	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





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [gentoo-commits] gentoo-x86 commit in x11-libs/motif: ChangeLog motif-2.3.4-r1.ebuild
@ 2013-08-05 21:27 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Mueller (ulm) @ 2013-08-05 21:27 UTC (permalink / raw
  To: gentoo-commits

ulm         13/08/05 21:27:45

  Modified:             ChangeLog motif-2.3.4-r1.ebuild
  Log:
  Workaround for missing pkgconfig files, bug 479876.
  
  (Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

Revision  Changes    Path
1.37                 x11-libs/motif/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?r1=1.36&r2=1.37

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog	4 Aug 2013 18:36:09 -0000	1.36
+++ ChangeLog	5 Aug 2013 21:27:45 -0000	1.37
@@ -1,6 +1,9 @@
 # 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.36 2013/08/04 18:36:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.37 2013/08/05 21:27:45 ulm Exp $
+
+  05 Aug 2013; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r1.ebuild:
+  Workaround for missing pkgconfig files, bug 479876.
 
   04 Aug 2013; Agostino Sarubbo <ago@gentoo.org> motif-2.2.3-r12.ebuild,
   motif-2.3.4-r1.ebuild:



1.24                 x11-libs/motif/motif-2.3.4-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?r1=1.23&r2=1.24

Index: motif-2.3.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- motif-2.3.4-r1.ebuild	4 Aug 2013 18:36:09 -0000	1.23
+++ motif-2.3.4-r1.ebuild	5 Aug 2013 21:27:45 -0000	1.24
@@ -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.23 2013/08/04 18:36:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.24 2013/08/05 21:27:45 ulm Exp $
 
 EAPI=5
 
@@ -79,10 +79,18 @@
 	# feel free to fix properly if you care
 	append-flags -fno-strict-aliasing
 
-	# For Solaris Xos_r.h :(
+	# for Solaris Xos_r.h :(
 	[[ ${CHOST} == *-solaris2.11 ]] \
 		&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
 
+	# workaround for missing pkgconfig files in emul-linux-x86-xlibs #479876
+	if use xft && use amd64 && use abi_x86_32 \
+		&& has_version "app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]"
+	then
+		append-cppflags -I/usr/include/freetype2
+		append-ldflags -lXft
+	fi
+
 	if use !elibc_glibc && use !elibc_uclibc && use unicode; then
 		# libiconv detection in configure script doesn't always work
 		# http://bugs.motifzone.net/show_bug.cgi?id=1423





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [gentoo-commits] gentoo-x86 commit in x11-libs/motif: ChangeLog motif-2.3.4-r1.ebuild
@ 2013-08-06 11:03 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Mueller (ulm) @ 2013-08-06 11:03 UTC (permalink / raw
  To: gentoo-commits

ulm         13/08/06 11:03:02

  Modified:             ChangeLog motif-2.3.4-r1.ebuild
  Log:
  Require USE=development for emul-linux-x86-xlibs, needed for pkg-config.
  
  (Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

Revision  Changes    Path
1.38                 x11-libs/motif/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?r1=1.37&r2=1.38

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ChangeLog	5 Aug 2013 21:27:45 -0000	1.37
+++ ChangeLog	6 Aug 2013 11:03:02 -0000	1.38
@@ -1,6 +1,9 @@
 # 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.37 2013/08/05 21:27:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.38 2013/08/06 11:03:02 ulm Exp $
+
+  06 Aug 2013; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r1.ebuild:
+  Require USE=development for emul-linux-x86-xlibs, needed for pkg-config.
 
   05 Aug 2013; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r1.ebuild:
   Workaround for missing pkgconfig files, bug 479876.



1.26                 x11-libs/motif/motif-2.3.4-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?r1=1.25&r2=1.26

Index: motif-2.3.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- motif-2.3.4-r1.ebuild	6 Aug 2013 00:05:06 -0000	1.25
+++ motif-2.3.4-r1.ebuild	6 Aug 2013 11:03:02 -0000	1.26
@@ -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.25 2013/08/06 00:05:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.26 2013/08/06 11:03:02 ulm Exp $
 
 EAPI=5
 
@@ -36,7 +36,9 @@
 		x11-libs/libXp
 		x11-libs/libXt
 		xft? ( media-libs/fontconfig x11-libs/libXft )
-		abi_x86_32? ( amd64? ( app-emulation/emul-linux-x86-xlibs ) )
+		abi_x86_32? ( amd64? (
+			app-emulation/emul-linux-x86-xlibs[development]
+		) )
 	) )
 	|| ( (
 		unicode? ( virtual/libiconv[${MULTILIB_USEDEP}] )





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [gentoo-commits] gentoo-x86 commit in x11-libs/motif: ChangeLog motif-2.3.4-r1.ebuild
@ 2013-10-08  6:27 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Mueller (ulm) @ 2013-10-08  6:27 UTC (permalink / raw
  To: gentoo-commits

ulm         13/10/08 06:27:35

  Modified:             ChangeLog motif-2.3.4-r1.ebuild
  Log:
  Remove pkgconfig workaround.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

Revision  Changes    Path
1.42                 x11-libs/motif/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?r1=1.41&r2=1.42

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ChangeLog	8 Oct 2013 06:22:34 -0000	1.41
+++ ChangeLog	8 Oct 2013 06:27:35 -0000	1.42
@@ -1,10 +1,10 @@
 # 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.41 2013/10/08 06:22:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.42 2013/10/08 06:27:35 ulm Exp $
 
   08 Oct 2013; Ulrich Müller <ulm@gentoo.org> motif-2.2.3-r12.ebuild,
   motif-2.3.4-r1.ebuild:
-  Update dependency on X libraries.
+  Update dependency on X libraries. Remove pkgconfig workaround.
 
   23 Aug 2013; Ulrich Müller <ulm@gentoo.org> -motif-2.2.3-r11.ebuild,
   -motif-2.3.4.ebuild, -files/motif-2.3.2-sanitise-paths.patch,



1.29                 x11-libs/motif/motif-2.3.4-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?r1=1.28&r2=1.29

Index: motif-2.3.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- motif-2.3.4-r1.ebuild	8 Oct 2013 06:22:34 -0000	1.28
+++ motif-2.3.4-r1.ebuild	8 Oct 2013 06:27:35 -0000	1.29
@@ -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.28 2013/10/08 06:22:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.29 2013/10/08 06:27:35 ulm Exp $
 
 EAPI=5
 
@@ -72,14 +72,6 @@
 	[[ ${CHOST} == *-solaris2.11 ]] \
 		&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
 
-	# workaround for missing pkgconfig files in emul-linux-x86-xlibs #479876
-	if use xft && use amd64 && use abi_x86_32 \
-		&& has_version "app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]"
-	then
-		append-cppflags -I/usr/include/freetype2
-		append-libs -lXft
-	fi
-
 	if use !elibc_glibc && use !elibc_uclibc && use unicode; then
 		# libiconv detection in configure script doesn't always work
 		# http://bugs.motifzone.net/show_bug.cgi?id=1423





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [gentoo-commits] gentoo-x86 commit in x11-libs/motif: ChangeLog motif-2.3.4-r1.ebuild
@ 2014-02-07 19:50 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Mueller (ulm) @ 2014-02-07 19:50 UTC (permalink / raw
  To: gentoo-commits

ulm         14/02/07 19:50:54

  Modified:             ChangeLog motif-2.3.4-r1.ebuild
  Log:
  Remove alternative dependencies on emul-linux-x86-* packages.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

Revision  Changes    Path
1.44                 x11-libs/motif/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?r1=1.43&r2=1.44

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog	21 Oct 2013 13:56:09 -0000	1.43
+++ ChangeLog	7 Feb 2014 19:50:54 -0000	1.44
@@ -1,6 +1,9 @@
 # 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.43 2013/10/21 13:56:09 grobian Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.44 2014/02/07 19:50:54 ulm Exp $
+
+  07 Feb 2014; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r1.ebuild:
+  Remove alternative dependencies on emul-linux-x86-* packages.
 
   21 Oct 2013; Fabian Groffen <grobian@gentoo.org> motif-2.3.4-r1.ebuild:
   Marked ~x64-macos, bug #486818



1.31                 x11-libs/motif/motif-2.3.4-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?r1=1.30&r2=1.31

Index: motif-2.3.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- motif-2.3.4-r1.ebuild	21 Oct 2013 13:56:09 -0000	1.30
+++ motif-2.3.4-r1.ebuild	7 Feb 2014 19:50:54 -0000	1.31
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.30 2013/10/21 13:56:09 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.31 2014/02/07 19:50:54 ulm Exp $
 
 EAPI=5
 
@@ -23,24 +23,13 @@
 	x11-libs/libXmu[${MULTILIB_USEDEP}]
 	x11-libs/libXp[${MULTILIB_USEDEP}]
 	x11-libs/libXt[${MULTILIB_USEDEP}]
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] )
+	unicode? ( virtual/libiconv[${MULTILIB_USEDEP}] )
 	xft? (
 		media-libs/fontconfig[${MULTILIB_USEDEP}]
 		x11-libs/libXft[${MULTILIB_USEDEP}]
-	)
-	|| ( (
-		unicode? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-		jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-		png? ( >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] )
-	)
-	(
-		unicode? ( virtual/libiconv )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		abi_x86_32? ( amd64? (
-			jpeg? ( app-emulation/emul-linux-x86-baselibs )
-			png? ( app-emulation/emul-linux-x86-baselibs )
-		) )
-	) )"
+	)"
 
 DEPEND="${RDEPEND}
 	sys-devel/flex





^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2014-02-07 19:50 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-06 11:03 [gentoo-commits] gentoo-x86 commit in x11-libs/motif: ChangeLog motif-2.3.4-r1.ebuild Ulrich Mueller (ulm)
  -- strict thread matches above, loose matches on Subject: below --
2014-02-07 19:50 Ulrich Mueller (ulm)
2013-10-08  6:27 Ulrich Mueller (ulm)
2013-08-05 21:27 Ulrich Mueller (ulm)
2013-06-01 18:25 Ulrich Mueller (ulm)
2013-05-13 20:02 Ulrich Mueller (ulm)
2013-04-15  9:18 Jeroen Roovers (jer)
2013-04-05 22:13 Ulrich Mueller (ulm)
2013-03-16 17:58 Ulrich Mueller (ulm)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox