* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog xorg-2.eclass
@ 2012-05-04 15:39 Chi-Thanh Christopher Nguyen (chithanh)
0 siblings, 0 replies; 10+ messages in thread
From: Chi-Thanh Christopher Nguyen (chithanh) @ 2012-05-04 15:39 UTC (permalink / raw
To: gentoo-commits
chithanh 12/05/04 15:39:29
Modified: ChangeLog xorg-2.eclass
Log:
Raise util-macros dependency.
Revision Changes Path
1.237 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.237&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.237&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.236&r2=1.237
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- ChangeLog 4 May 2012 08:31:43 -0000 1.236
+++ ChangeLog 4 May 2012 15:39:29 -0000 1.237
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.236 2012/05/04 08:31:43 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.237 2012/05/04 15:39:29 chithanh Exp $
+
+ 04 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ xorg-2.eclass:
+ Raise util-macros dependency.
04 May 2012; Krzysztof Pawlik <nelchael@gentoo.org>
python-distutils-ng.eclass:
1.54 eclass/xorg-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?r1=1.53&r2=1.54
Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xorg-2.eclass 2 May 2012 18:31:45 -0000 1.53
+++ xorg-2.eclass 4 May 2012 15:39:29 -0000 1.54
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.53 2012/05/02 18:31:45 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.54 2012/05/04 15:39:29 chithanh Exp $
# @ECLASS: xorg-2.eclass
# @MAINTAINER:
@@ -110,7 +110,7 @@
>=sys-devel/libtool-2.2.6a
sys-devel/m4"
if [[ ${PN} != util-macros ]] ; then
- EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.15.0"
+ EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.17"
# Required even by xorg-server
[[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
fi
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog xorg-2.eclass
@ 2012-05-09 20:19 Matt Turner (mattst88)
0 siblings, 0 replies; 10+ messages in thread
From: Matt Turner (mattst88) @ 2012-05-09 20:19 UTC (permalink / raw
To: gentoo-commits
mattst88 12/05/09 20:19:10
Modified: ChangeLog xorg-2.eclass
Log:
Fix xorg-2's git:// EGIT_REPO_URI.
Revision Changes Path
1.247 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.247&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.247&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.246&r2=1.247
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- ChangeLog 9 May 2012 16:12:16 -0000 1.246
+++ ChangeLog 9 May 2012 20:19:10 -0000 1.247
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.246 2012/05/09 16:12:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.247 2012/05/09 20:19:10 mattst88 Exp $
+
+ 09 May 2012; Matt Turner <mattst88@gentoo.org> xorg-2.eclass:
+ Fix xorg-2's git:// EGIT_REPO_URI.
09 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> office-ext.eclass:
Add the src_unpack phase for office-ext eclass.
1.55 eclass/xorg-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?r1=1.54&r2=1.55
Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- xorg-2.eclass 4 May 2012 15:39:29 -0000 1.54
+++ xorg-2.eclass 9 May 2012 20:19:10 -0000 1.55
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.54 2012/05/04 15:39:29 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.55 2012/05/09 20:19:10 mattst88 Exp $
# @ECLASS: xorg-2.eclass
# @MAINTAINER:
@@ -91,7 +91,7 @@
: ${XORG_PACKAGE_NAME:=${PN}}
if [[ -n ${GIT_ECLASS} ]]; then
- : ${EGIT_REPO_URI:="git://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME} http://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}"}
+ : ${EGIT_REPO_URI:="git://anongit.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME} http://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}"}
elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then
SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.bz2"
fi
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog xorg-2.eclass
@ 2012-06-11 12:57 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 10+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-06-11 12:57 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/06/11 12:57:14
Modified: ChangeLog xorg-2.eclass
Log:
Fix not assigned variable. IE bug#416673.
Revision Changes Path
1.307 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.307&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.307&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.306&r2=1.307
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- ChangeLog 10 Jun 2012 14:59:55 -0000 1.306
+++ ChangeLog 11 Jun 2012 12:57:14 -0000 1.307
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.306 2012/06/10 14:59:55 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.307 2012/06/11 12:57:14 scarabeus Exp $
+
+ 11 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> xorg-2.eclass:
+ Fix not assigned variable. IE bug#416673.
10 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
fix for strip-linguas en
1.56 eclass/xorg-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?r1=1.55&r2=1.56
Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xorg-2.eclass 9 May 2012 20:19:10 -0000 1.55
+++ xorg-2.eclass 11 Jun 2012 12:57:14 -0000 1.56
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.55 2012/05/09 20:19:10 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.56 2012/06/11 12:57:14 scarabeus Exp $
# @ECLASS: xorg-2.eclass
# @MAINTAINER:
@@ -418,7 +418,7 @@
eqawarn "to preserve namespace."
fi
- local xorgconfadd=(${CONFIGURE_OPTIONS})
+ local xorgconfadd=(${CONFIGURE_OPTIONS} ${XORG_CONFIGURE_OPTIONS})
else
local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}")
fi
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog xorg-2.eclass
@ 2012-08-14 6:34 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 10+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-08-14 6:34 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/08/14 06:34:16
Modified: ChangeLog xorg-2.eclass
Log:
Fix disable-dependency-tracking passing. Fixes bug#372239.
Revision Changes Path
1.369 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.369&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.369&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.368&r2=1.369
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- ChangeLog 13 Aug 2012 22:21:26 -0000 1.368
+++ ChangeLog 14 Aug 2012 06:34:16 -0000 1.369
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.368 2012/08/13 22:21:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.369 2012/08/14 06:34:16 scarabeus Exp $
+
+ 14 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> xorg-2.eclass:
+ Fix disable-dependency-tracking passing. Fixes bug#372239.
13 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> ruby-fakegem.eclass,
ruby-ng.eclass:
1.58 eclass/xorg-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?r1=1.57&r2=1.58
Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- xorg-2.eclass 11 Jun 2012 13:02:21 -0000 1.57
+++ xorg-2.eclass 14 Aug 2012 06:34:16 -0000 1.58
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.57 2012/06/11 13:02:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.58 2012/08/14 06:34:16 scarabeus Exp $
# @ECLASS: xorg-2.eclass
# @MAINTAINER:
@@ -424,8 +424,16 @@
fi
[[ -n "${FONT}" ]] && xorg-2_font_configure
+
+ # Check if package supports disabling of dep tracking
+ # Fixes warnings like:
+ # WARNING: unrecognized options: --disable-dependency-tracking
+ if grep -q -s "disable-depencency-tracking" ${ECONF_SOURCE:-.}/configure; then
+ local dep_track="--disable-dependency-tracking"
+ fi
+
local myeconfargs=(
- --disable-dependency-tracking
+ ${dep_track}
${FONT_OPTIONS}
"${xorgconfadd[@]}"
)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog xorg-2.eclass
@ 2013-01-31 14:12 Chi-Thanh Christopher Nguyen (chithanh)
0 siblings, 0 replies; 10+ messages in thread
From: Chi-Thanh Christopher Nguyen (chithanh) @ 2013-01-31 14:12 UTC (permalink / raw
To: gentoo-commits
chithanh 13/01/31 14:12:12
Modified: ChangeLog xorg-2.eclass
Log:
Add EAPI 5 sub-slot dependency on x11-base/xorg-server for packages which require rebuilding when the server is upgraded.
Revision Changes Path
1.656 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.656&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.656&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.655&r2=1.656
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.655
retrieving revision 1.656
diff -u -r1.655 -r1.656
--- ChangeLog 31 Jan 2013 09:26:42 -0000 1.655
+++ ChangeLog 31 Jan 2013 14:12:12 -0000 1.656
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.655 2013/01/31 09:26:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.656 2013/01/31 14:12:12 chithanh Exp $
+
+ 31 Jan 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ xorg-2.eclass:
+ Add EAPI 5 sub-slot dependency on x11-base/xorg-server for packages which
+ require rebuilding when the server is upgraded.
31 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> obs-service.eclass:
Additional files also must be versioned as they change between versions.
1.60 eclass/xorg-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?r1=1.59&r2=1.60
Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- xorg-2.eclass 27 Sep 2012 16:35:42 -0000 1.59
+++ xorg-2.eclass 31 Jan 2013 14:12:12 -0000 1.60
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.59 2012/09/27 16:35:42 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.60 2013/01/31 14:12:12 chithanh Exp $
# @ECLASS: xorg-2.eclass
# @MAINTAINER:
@@ -270,6 +270,28 @@
esac
unset DOC_DEPEND
+# @ECLASS-VARIABLE: XORG_MODULE_REBUILD
+# @DESCRIPTION:
+# Describes whether a package contains modules that need to be rebuilt on
+# xorg-server upgrade. This has an effect only since EAPI=5.
+# Possible values are "yes" or "no". Default value is "yes" for packages which
+# are recognized as DRIVER by this eclass and "no" for all other packages.
+if [[ "${DRIVER}" == yes ]]; then
+ : ${XORG_MODULE_REBUILD:="yes"}
+else
+ : ${XORG_MODULE_REBUILD:="no"}
+fi
+
+if [[ ${XORG_MODULE_REBUILD} == yes ]]; then
+ case ${EAPI} in
+ 3|4)
+ ;;
+ *)
+ RDEPEND+=" x11-base/xorg-server:="
+ ;;
+ esac
+fi
+
DEPEND+=" ${COMMON_DEPEND}"
RDEPEND+=" ${COMMON_DEPEND}"
unset COMMON_DEPEND
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog xorg-2.eclass
@ 2013-02-24 21:05 Michal Gorny (mgorny)
0 siblings, 0 replies; 10+ messages in thread
From: Michal Gorny (mgorny) @ 2013-02-24 21:05 UTC (permalink / raw
To: gentoo-commits
mgorny 13/02/24 21:05:09
Modified: ChangeLog xorg-2.eclass
Log:
Introduce multilib support for xlibs.
Revision Changes Path
1.682 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.682&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.682&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.681&r2=1.682
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.681
retrieving revision 1.682
diff -u -r1.681 -r1.682
--- ChangeLog 24 Feb 2013 16:31:35 -0000 1.681
+++ ChangeLog 24 Feb 2013 21:05:08 -0000 1.682
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.681 2013/02/24 16:31:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.682 2013/02/24 21:05:08 mgorny Exp $
+
+ 24 Feb 2013; Michał Górny <mgorny@gentoo.org> xorg-2.eclass:
+ Introduce multilib support for xlibs.
24 Feb 2013; Pacho Ramos <pacho@gentoo.org> emul-linux-x86.eclass:
Drop versionator eclass as it's not needed for a long time, also fixes bug
1.61 eclass/xorg-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?r1=1.60&r2=1.61
Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- xorg-2.eclass 31 Jan 2013 14:12:12 -0000 1.60
+++ xorg-2.eclass 24 Feb 2013 21:05:08 -0000 1.61
@@ -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/eclass/xorg-2.eclass,v 1.60 2013/01/31 14:12:12 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.61 2013/02/24 21:05:08 mgorny Exp $
# @ECLASS: xorg-2.eclass
# @MAINTAINER:
@@ -37,10 +37,20 @@
FONT_ECLASS="font"
fi
+# @ECLASS-VARIABLE: XORG_MULTILIB
+# @DESCRIPTION:
+# If set to 'yes', the multilib support for package will be enabled. Set
+# before inheriting this eclass.
+: ${XORG_MULTILIB:="no"}
+
# we need to inherit autotools first to get the deps
inherit autotools autotools-utils eutils libtool multilib toolchain-funcs \
flag-o-matic ${FONT_ECLASS} ${GIT_ECLASS}
+if [[ ${XORG_MULTILIB} == yes ]]; then
+ inherit autotools-multilib
+fi
+
EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
case "${EAPI:-0}" in
3|4|5) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
@@ -296,6 +306,10 @@
RDEPEND+=" ${COMMON_DEPEND}"
unset COMMON_DEPEND
+if [[ ${XORG_MULTILIB} == yes ]]; then
+ RDEPEND+=" abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20121202 )"
+fi
+
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}"
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: PDEPEND=${PDEPEND}"
@@ -460,7 +474,11 @@
"${xorgconfadd[@]}"
)
- autotools-utils_src_configure "$@"
+ if [[ ${XORG_MULTILIB} == yes ]]; then
+ autotools-multilib_src_configure "$@"
+ else
+ autotools-utils_src_configure "$@"
+ fi
}
# @FUNCTION: xorg-2_src_compile
@@ -469,7 +487,11 @@
xorg-2_src_compile() {
debug-print-function ${FUNCNAME} "$@"
- autotools-utils_src_compile "$@"
+ if [[ ${XORG_MULTILIB} == yes ]]; then
+ autotools-multilib_src_compile "$@"
+ else
+ autotools-utils_src_compile "$@"
+ fi
}
# @FUNCTION: xorg-2_src_install
@@ -479,13 +501,18 @@
xorg-2_src_install() {
debug-print-function ${FUNCNAME} "$@"
+ local install_args=( docdir="${EPREFIX}/usr/share/doc/${PF}" )
+
if [[ ${CATEGORY} == x11-proto ]]; then
- autotools-utils_src_install \
- ${PN/proto/}docdir="${EPREFIX}/usr/share/doc/${PF}" \
- docdir="${EPREFIX}/usr/share/doc/${PF}"
+ install_args+=(
+ ${PN/proto/}docdir="${EPREFIX}/usr/share/doc/${PF}"
+ )
+ fi
+
+ if [[ ${XORG_MULTILIB} == yes ]]; then
+ autotools-multilib_src_install "${install_args[@]}"
else
- autotools-utils_src_install \
- docdir="${EPREFIX}/usr/share/doc/${PF}"
+ autotools-utils_src_install "${install_args[@]}"
fi
if [[ -n ${GIT_ECLASS} ]]; then
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog xorg-2.eclass
@ 2013-02-25 20:27 Michal Gorny (mgorny)
0 siblings, 0 replies; 10+ messages in thread
From: Michal Gorny (mgorny) @ 2013-02-25 20:27 UTC (permalink / raw
To: gentoo-commits
mgorny 13/02/25 20:27:27
Modified: ChangeLog xorg-2.eclass
Log:
Bump the emul-linux-x86 blocker to match the new release.
Revision Changes Path
1.684 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.684&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.684&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.683&r2=1.684
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.683
retrieving revision 1.684
diff -u -r1.683 -r1.684
--- ChangeLog 24 Feb 2013 23:30:02 -0000 1.683
+++ ChangeLog 25 Feb 2013 20:27:27 -0000 1.684
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.683 2013/02/24 23:30:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.684 2013/02/25 20:27:27 mgorny Exp $
+
+ 25 Feb 2013; Michał Górny <mgorny@gentoo.org> xorg-2.eclass:
+ Bump the emul-linux-x86 blocker to match the new release.
24 Feb 2013; Pacho Ramos <pacho@gentoo.org> emul-linux-x86.eclass:
Allow headers installation, bug #458784
1.62 eclass/xorg-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?r1=1.61&r2=1.62
Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- xorg-2.eclass 24 Feb 2013 21:05:08 -0000 1.61
+++ xorg-2.eclass 25 Feb 2013 20:27:27 -0000 1.62
@@ -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/eclass/xorg-2.eclass,v 1.61 2013/02/24 21:05:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.62 2013/02/25 20:27:27 mgorny Exp $
# @ECLASS: xorg-2.eclass
# @MAINTAINER:
@@ -307,7 +307,7 @@
unset COMMON_DEPEND
if [[ ${XORG_MULTILIB} == yes ]]; then
- RDEPEND+=" abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20121202 )"
+ RDEPEND+=" abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )"
fi
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog xorg-2.eclass
@ 2013-07-30 18:59 Michal Gorny (mgorny)
0 siblings, 0 replies; 10+ messages in thread
From: Michal Gorny (mgorny) @ 2013-07-30 18:59 UTC (permalink / raw
To: gentoo-commits
mgorny 13/07/30 18:59:18
Modified: ChangeLog xorg-2.eclass
Log:
Update the emul-linux blocker to support abi_x86_32 flag on emul-linux.
Revision Changes Path
1.905 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.905&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.905&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.904&r2=1.905
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.904
retrieving revision 1.905
diff -u -r1.904 -r1.905
--- ChangeLog 30 Jul 2013 02:08:54 -0000 1.904
+++ ChangeLog 30 Jul 2013 18:59:18 -0000 1.905
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.904 2013/07/30 02:08:54 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.905 2013/07/30 18:59:18 mgorny Exp $
+
+ 30 Jul 2013; Michał Górny <mgorny@gentoo.org> xorg-2.eclass:
+ Update the emul-linux blocker to support abi_x86_32 flag on emul-linux.
30 Jul 2013; Matt Turner <mattst88@gentoo.org> multilib-build.eclass:
Add MIPS support to multilib-build.eclass.
1.63 eclass/xorg-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?r1=1.62&r2=1.63
Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- xorg-2.eclass 25 Feb 2013 20:27:27 -0000 1.62
+++ xorg-2.eclass 30 Jul 2013 18:59:18 -0000 1.63
@@ -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/eclass/xorg-2.eclass,v 1.62 2013/02/25 20:27:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.63 2013/07/30 18:59:18 mgorny Exp $
# @ECLASS: xorg-2.eclass
# @MAINTAINER:
@@ -307,7 +307,7 @@
unset COMMON_DEPEND
if [[ ${XORG_MULTILIB} == yes ]]; then
- RDEPEND+=" abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 )"
+ RDEPEND+=" abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
fi
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog xorg-2.eclass
@ 2014-03-02 15:41 Michal Gorny (mgorny)
0 siblings, 0 replies; 10+ messages in thread
From: Michal Gorny (mgorny) @ 2014-03-02 15:41 UTC (permalink / raw
To: gentoo-commits
mgorny 14/03/02 15:41:20
Modified: ChangeLog xorg-2.eclass
Log:
Use git-r3 for live ebuilds.
Revision Changes Path
1.1164 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1164&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1164&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1163&r2=1.1164
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1163
retrieving revision 1.1164
diff -u -r1.1163 -r1.1164
--- ChangeLog 2 Mar 2014 11:50:48 -0000 1.1163
+++ ChangeLog 2 Mar 2014 15:41:20 -0000 1.1164
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1163 2014/03/02 11:50:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1164 2014/03/02 15:41:20 mgorny Exp $
+
+ 02 Mar 2014; Michał Górny <mgorny@gentoo.org> xorg-2.eclass:
+ Use git-r3 for live ebuilds.
02 Mar 2014; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Clarify where EGIT_CLONE_TYPE and EGIT_MIN_CLONE_TYPE is supposed to be set.
1.64 eclass/xorg-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?r1=1.63&r2=1.64
Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- xorg-2.eclass 30 Jul 2013 18:59:18 -0000 1.63
+++ xorg-2.eclass 2 Mar 2014 15:41:20 -0000 1.64
@@ -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/eclass/xorg-2.eclass,v 1.63 2013/07/30 18:59:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.64 2014/03/02 15:41:20 mgorny Exp $
# @ECLASS: xorg-2.eclass
# @MAINTAINER:
@@ -22,7 +22,7 @@
GIT_ECLASS=""
if [[ ${PV} == *9999* ]]; then
- GIT_ECLASS="git-2"
+ GIT_ECLASS="git-r3"
XORG_EAUTORECONF="yes"
fi
@@ -330,7 +330,7 @@
debug-print-function ${FUNCNAME} "$@"
if [[ -n ${GIT_ECLASS} ]]; then
- git-2_src_unpack
+ git-r3_src_unpack
else
unpack ${A}
fi
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog xorg-2.eclass
@ 2015-03-06 1:32 Chi-Thanh Christopher Nguyen (chithanh)
0 siblings, 0 replies; 10+ messages in thread
From: Chi-Thanh Christopher Nguyen (chithanh) @ 2015-03-06 1:32 UTC (permalink / raw
To: gentoo-commits
chithanh 15/03/06 01:32:36
Modified: ChangeLog xorg-2.eclass
Log:
Raise util-macros dependency to latest stable 1.18
Revision Changes Path
1.1558 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1558&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1558&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1557&r2=1.1558
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1557
retrieving revision 1.1558
diff -u -r1.1557 -r1.1558
--- ChangeLog 27 Feb 2015 23:44:41 -0000 1.1557
+++ ChangeLog 6 Mar 2015 01:32:36 -0000 1.1558
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1557 2015/02/27 23:44:41 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1558 2015/03/06 01:32:36 chithanh Exp $
+
+ 06 Mar 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ xorg-2.eclass:
+ Raise util-macros dependency to latest stable 1.18
27 Feb 2015; Mike Pagano <mpagano@gentoo.org> kernel-2.eclass:
Cleanup how we determine base linux tarball.
1.65 eclass/xorg-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?r1=1.64&r2=1.65
Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- xorg-2.eclass 2 Mar 2014 15:41:20 -0000 1.64
+++ xorg-2.eclass 6 Mar 2015 01:32:36 -0000 1.65
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.64 2014/03/02 15:41:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.65 2015/03/06 01:32:36 chithanh Exp $
# @ECLASS: xorg-2.eclass
# @MAINTAINER:
@@ -120,7 +120,7 @@
>=sys-devel/libtool-2.2.6a
sys-devel/m4"
if [[ ${PN} != util-macros ]] ; then
- EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.17"
+ EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.18"
# Required even by xorg-server
[[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
fi
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-03-06 1:32 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-24 21:05 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog xorg-2.eclass Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2015-03-06 1:32 Chi-Thanh Christopher Nguyen (chithanh)
2014-03-02 15:41 Michal Gorny (mgorny)
2013-07-30 18:59 Michal Gorny (mgorny)
2013-02-25 20:27 Michal Gorny (mgorny)
2013-01-31 14:12 Chi-Thanh Christopher Nguyen (chithanh)
2012-08-14 6:34 Tomas Chvatal (scarabeus)
2012-06-11 12:57 Tomas Chvatal (scarabeus)
2012-05-09 20:19 Matt Turner (mattst88)
2012-05-04 15:39 Chi-Thanh Christopher Nguyen (chithanh)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox