From c7785ce0079f0de1b9dfcdb7ed3bfad78bad8c4a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 29 Mar 2015 14:59:46 +0100 Subject: remove circular deps in libusbmuxd and usbmuxd --- app-pda/libusbmuxd/libusbmuxd-1.0.10.ebuild | 3 +-- app-pda/usbmuxd/usbmuxd-1.1.0.ebuild | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app-pda/libusbmuxd/libusbmuxd-1.0.10.ebuild b/app-pda/libusbmuxd/libusbmuxd-1.0.10.ebuild index 0559aeff..f3b79356 100644 --- a/app-pda/libusbmuxd/libusbmuxd-1.0.10.ebuild +++ b/app-pda/libusbmuxd/libusbmuxd-1.0.10.ebuild @@ -16,8 +16,7 @@ KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" IUSE="kernel_linux static-libs" RDEPEND=">=app-pda/libplist-1.11:= - virtual/libusb:1 - >=app-pda/usbmuxd-1.1.0" + virtual/libusb:1" DEPEND="${RDEPEND} virtual/os-headers virtual/pkgconfig" diff --git a/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild index 01c3f93e..b9d43f60 100644 --- a/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild +++ b/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/usbmuxd/usbmuxd-1.0.8_p20140530.ebuild,v 1.2 2014/08/03 12:09:08 ssuominen Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=1 @@ -17,10 +16,10 @@ SLOT="0" KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" IUSE="" -RDEPEND=">=app-pda/libimobiledevice-1.2.0 - >=app-pda/libplist-1.11 +RDEPEND=">=app-pda/libplist-1.11 virtual/libusb:1" DEPEND="${RDEPEND} + >=app-pda/libimobiledevice-1.2.0 virtual/os-headers virtual/pkgconfig" -- cgit v1.2.3 From ad68a9758d804cef0c8f81983e59ff66273dce52 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Mon, 30 Mar 2015 13:47:12 +0300 Subject: [sys-devel/gcc-config] added systemd-oriented patch --- sys-devel/gcc-config/ChangeLog | 1081 ++++++++++++++++++++ sys-devel/gcc-config/Manifest | 6 + sys-devel/gcc-config/files/gcc-config-1.4.1 | 801 +++++++++++++++ sys-devel/gcc-config/files/gcc-config-1.5 | 740 ++++++++++++++ sys-devel/gcc-config/files/gcc-config-1.5.1 | 763 ++++++++++++++ .../gcc-config/files/gcc-config-systemd.patch | 13 + sys-devel/gcc-config/files/wrapper-1.5.1.c | 372 +++++++ sys-devel/gcc-config/files/wrapper-1.5.2.c | 315 ++++++ sys-devel/gcc-config/gcc-config-1.4.1-r1.ebuild | 59 ++ sys-devel/gcc-config/gcc-config-1.5-r1.ebuild | 61 ++ sys-devel/gcc-config/gcc-config-1.5-r2.ebuild | 61 ++ sys-devel/gcc-config/gcc-config-1.5.1-r1.ebuild | 61 ++ sys-devel/gcc-config/gcc-config-1.5.1.ebuild | 61 ++ sys-devel/gcc-config/gcc-config-1.6.ebuild | 47 + sys-devel/gcc-config/gcc-config-1.7.1.ebuild | 47 + sys-devel/gcc-config/gcc-config-1.7.2.ebuild | 47 + sys-devel/gcc-config/gcc-config-1.7.3.ebuild | 48 + sys-devel/gcc-config/gcc-config-1.7.ebuild | 47 + sys-devel/gcc-config/gcc-config-1.8.ebuild | 47 + sys-devel/gcc-config/metadata.xml | 5 + 20 files changed, 4682 insertions(+) create mode 100644 sys-devel/gcc-config/ChangeLog create mode 100644 sys-devel/gcc-config/Manifest create mode 100644 sys-devel/gcc-config/files/gcc-config-1.4.1 create mode 100755 sys-devel/gcc-config/files/gcc-config-1.5 create mode 100755 sys-devel/gcc-config/files/gcc-config-1.5.1 create mode 100644 sys-devel/gcc-config/files/gcc-config-systemd.patch create mode 100644 sys-devel/gcc-config/files/wrapper-1.5.1.c create mode 100644 sys-devel/gcc-config/files/wrapper-1.5.2.c create mode 100644 sys-devel/gcc-config/gcc-config-1.4.1-r1.ebuild create mode 100644 sys-devel/gcc-config/gcc-config-1.5-r1.ebuild create mode 100644 sys-devel/gcc-config/gcc-config-1.5-r2.ebuild create mode 100644 sys-devel/gcc-config/gcc-config-1.5.1-r1.ebuild create mode 100644 sys-devel/gcc-config/gcc-config-1.5.1.ebuild create mode 100644 sys-devel/gcc-config/gcc-config-1.6.ebuild create mode 100644 sys-devel/gcc-config/gcc-config-1.7.1.ebuild create mode 100644 sys-devel/gcc-config/gcc-config-1.7.2.ebuild create mode 100644 sys-devel/gcc-config/gcc-config-1.7.3.ebuild create mode 100644 sys-devel/gcc-config/gcc-config-1.7.ebuild create mode 100644 sys-devel/gcc-config/gcc-config-1.8.ebuild create mode 100644 sys-devel/gcc-config/metadata.xml diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog new file mode 100644 index 00000000..ab40494b --- /dev/null +++ b/sys-devel/gcc-config/ChangeLog @@ -0,0 +1,1081 @@ +# ChangeLog for sys-devel/gcc-config +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.228 2014/01/18 03:08:29 vapier Exp $ + + 18 Jan 2014; Mike Frysinger gcc-config-1.7.3.ebuild, + gcc-config-1.8.ebuild: + Add arm64 love. + +*gcc-config-1.8 (19 Nov 2012) + + 19 Nov 2012; Mike Frysinger +gcc-config-1.8.ebuild: + Version bump. + + 26 Aug 2012; Raúl Porcel gcc-config-1.7.3.ebuild: + alpha/ia64/m68k/s390/sh/sparc stable wrt #429212 + + 04 Aug 2012; Jeroen Roovers gcc-config-1.7.3.ebuild: + Stable for HPPA (bug #429212). + + 04 Aug 2012; Markos Chandras gcc-config-1.7.3.ebuild: + Stable on amd64 wrt bug #429212 + + 02 Aug 2012; Anthony G. Basile gcc-config-1.7.3.ebuild: + Stable arm, bug #429212 + + 01 Aug 2012; Anthony G. Basile gcc-config-1.7.3.ebuild: + Stable ppc ppc64, bug #429212 + + 01 Aug 2012; Jeff Horelick gcc-config-1.7.3.ebuild: + marked x86 per bug 429212 + + 08 Jul 2012; Raúl Porcel gcc-config-1.6.ebuild: + alpha/ia64/m68k/s390/sh/sparc stable wrt #419399 + + 14 Jun 2012; Jeroen Roovers gcc-config-1.6.ebuild: + Stable for HPPA (bug #419399). + +*gcc-config-1.7.3 (10 Jun 2012) + + 10 Jun 2012; Mike Frysinger +gcc-config-1.7.3.ebuild: + Version bump. + + 09 Jun 2012; Markus Meier gcc-config-1.6.ebuild: + arm stable, bug #419399 + + 07 Jun 2012; Brent Baude gcc-config-1.6.ebuild: + Marking gcc-config-1.6 ppc for bug 419399 + + 05 Jun 2012; Brent Baude gcc-config-1.6.ebuild: + Marking gcc-config-1.6 ppc64 for bug 419399 + + 04 Jun 2012; Johannes Huber gcc-config-1.6.ebuild: + Stable for x86, wrt bug #419399 + + 04 Jun 2012; Agostino Sarubbo gcc-config-1.6.ebuild: + Stable for amd64, wrt bug #419399 + +*gcc-config-1.7.2 (31 May 2012) + + 31 May 2012; Mike Frysinger +gcc-config-1.7.2.ebuild: + Fix clean up in unlikely error handler. + +*gcc-config-1.7.1 (13 May 2012) + + 13 May 2012; Mike Frysinger +gcc-config-1.7.1.ebuild: + Fix installation of cc/f77 helpers #412319 by Yuta SATOH. + + 26 Apr 2012; Alexis Ballier gcc-config-1.7.ebuild: + keyword ~amd64-fbsd + +*gcc-config-1.7 (14 Apr 2012) + + 14 Apr 2012; Mike Frysinger +gcc-config-1.7.ebuild: + Version bump. + + 23 Mar 2012; Mike Frysinger gcc-config-1.6.ebuild: + Update HOMEPAGE to git repo. + +*gcc-config-1.6 (22 Mar 2012) + + 22 Mar 2012; Mike Frysinger +gcc-config-1.6.ebuild: + Version bump. + + 15 Mar 2012; Mike Frysinger gcc-config-1.5-r2.ebuild: + Mark alpha/arm/ia64/s309/sh/sparc stable #406351. + +*gcc-config-1.5.1-r1 (15 Mar 2012) + + 15 Mar 2012; Mike Frysinger files/gcc-config-1.5.1, + +gcc-config-1.5.1-r1.ebuild: + Use CTARGET from the env.d file by default to better work with custom + GCC_VER. + + 06 Mar 2012; Brent Baude gcc-config-1.5-r2.ebuild: + Marking gcc-config-1.5-r2 ppc for bug 406351 + + 05 Mar 2012; Jeff Horelick gcc-config-1.5-r2.ebuild: + marked x86 per bug 406351 + + 02 Mar 2012; Brent Baude gcc-config-1.5-r2.ebuild: + Marking gcc-config-1.5-r2 ppc64 for bug 406351 + + 02 Mar 2012; Agostino Sarubbo gcc-config-1.5-r2.ebuild: + Stable for amd64, wrt bug #406351 + + 01 Mar 2012; Jeroen Roovers gcc-config-1.5-r2.ebuild: + Stable for HPPA (bug #406351). + +*gcc-config-1.5.1 (29 Feb 2012) + + 29 Feb 2012; Mike Frysinger +files/gcc-config-1.5.1, + +gcc-config-1.5.1.ebuild: + Always sort runtime ld.so.conf paths and the install libgcc_s libraries based + on version rather than defaulting to the selected profile #297685 by Scott + McMurray. Fix gcc-config -E handling of GCC_SPECS #375091 by Bertrand + Jacquin. + + 07 Dec 2011; Mike Frysinger files/gcc-config-1.4.1, + files/gcc-config-1.5: + Fix multilib support with @GENTOO_LIBDIR@. + +*gcc-config-1.5-r2 (11 Nov 2011) + + 11 Nov 2011; Mike Frysinger files/gcc-config-1.5, + +gcc-config-1.5-r2.ebuild: + Add a fallback when tac is unavailable as suggested by Alexis Ballier + #390179. + + 11 Nov 2011; Alexis Ballier gcc-config-1.5-r1.ebuild: + unkeyword 1.5 on fbsd due to bug #390179 + + 11 Nov 2011; Ryan Hill gcc-config-1.5-r1.ebuild: + Keyword 1.5 (needed for gccgo support). + + 18 Jun 2011; Mike Frysinger files/wrapper-1.5.2.c: + Link g77/g95 to gfortran #278772 by Sébastien Fabbro. + +*gcc-config-1.4.1-r1 (28 Apr 2011) + + 28 Apr 2011; Mark Loeser -gcc-config-1.4.1.ebuild, + +gcc-config-1.4.1-r1.ebuild: + Version bump to get a change made to the gcc-config bash script + + 21 Mar 2011; Mike Frysinger files/gcc-config-1.5: + Default to /etc/portage/make.conf #338032 by Dennis Schridde. + +*gcc-config-1.5-r1 (18 Mar 2011) + + 18 Mar 2011; Mike Frysinger +gcc-config-1.5-r1.ebuild, + +files/wrapper-1.5.2.c: + Stop auto appending CFLAGS_ from the env. + + 07 Mar 2011; Mike Frysinger files/gcc-config-1.4.1, + files/gcc-config-1.5: + Change "source /etc/profile" to ". /etc/profile" for dumb shells #349522 by + Ulrich Müller. + + 06 Feb 2011; Mart Raudsepp gcc-config-1.3.16.ebuild, + gcc-config-1.4.0-r4.ebuild: + Drop to ~mips + + 18 Jan 2011; Ryan Hill files/gcc-config-1.5: + Add support for gccgo in 4.6. (bug #329551) + + 27 Dec 2009; Fabian Groffen files/gcc-config-1.4.1, + files/gcc-config-1.5: + Fix typo in gcc-config, tsch -> tcsh, caused -E to use export iso setenv. + Not bumping as this bug in gcc-config went unnoticed for years. + +*gcc-config-1.5 (20 Dec 2009) + + 20 Dec 2009; Mike Frysinger +files/gcc-config-1.5, + +gcc-config-1.5.ebuild: + Punt dead code (stdxx-incdir and GCC_SPECS checking), unify a bunch of + common code constructs, improve error displaying in cases that dont + matter, and add support for /etc/ld.so.conf.d/. + + 03 Aug 2009; Mark Loeser files/gcc-config-1.4.1: + Make --use-old work again, thanks to Brian Childs ; bug #221109 + + 20 May 2009; Raúl Porcel gcc-config-1.4.1.ebuild: + ia64 stable + + 15 May 2009; Tobias Klausmann + gcc-config-1.4.1.ebuild: + Stable on alpha, bug #269322 + + 14 May 2009; Markus Meier gcc-config-1.4.1.ebuild: + amd64/x86 stable, bug #269322 + + 14 May 2009; Joseph Jezak gcc-config-1.4.1.ebuild: + Marked ppc/ppc64 stable for bug #269322. + + 13 May 2009; Jeroen Roovers gcc-config-1.4.1.ebuild: + Stable for HPPA (bug #269322). + + 11 May 2009; Ferris McCormick gcc-config-1.4.1.ebuild: + Sparc stable, required for Bug #269322. + + 28 Jan 2009; Mike Frysinger files/gcc-config-1.4.1, + gcc-config-1.4.1.ebuild: + Update libgcj.pc symlinks #136382 #216241 and set GCC_SPECS with -E + #251271 by Diego E. Pettenò. + + 16 Mar 2008; Christian Heim Manifest: + Fixing the Manifest (emerge is complaining about missing + $FILESDIR/wrapper-1.5.0.o). + +*gcc-config-1.4.1 (16 Mar 2008) + + 16 Mar 2008; Mike Frysinger +files/gcc-config-1.4.1, + +files/wrapper-1.5.1.c, +gcc-config-1.4.1.ebuild: + Support -C/--nocolor #204176 by Bapt. Cleanup memory/string handling in the + wrapper #207926 by Evan Teran. + + 02 Jan 2008; Jeroen Roovers gcc-config-1.4.0-r4.ebuild: + Stable for HPPA (bug #203576). + + 29 Dec 2007; Brent Baude gcc-config-1.4.0-r4.ebuild: + Marking gcc-config-1.4.0-r4 ppc64 for bug 203576 + + 29 Dec 2007; Raúl Porcel gcc-config-1.4.0-r4.ebuild: + alpha/ia64/sparc stable wrt #203576 + + 28 Dec 2007; Markus Meier gcc-config-1.4.0-r4.ebuild: + x86 stable, bug #203576 + + 28 Dec 2007; nixnut gcc-config-1.4.0-r4.ebuild: + Stable on ppc wrt bug 203576 + + 28 Dec 2007; Doug Klima gcc-config-1.4.0-r4.ebuild: + amd64 stable wrt bug #203576 + + 27 Dec 2007; Mike Frysinger files/gcc-config-1.4.0: + Fix fallback CHOST detection when python is broken #203387 by Ambroz BIzjak. + +*gcc-config-1.4.0-r4 (11 Oct 2007) + + 11 Oct 2007; Mike Frysinger files/gcc-config-1.4.0, + +gcc-config-1.4.0-r4.ebuild: + Make sure we dont create CTARGET-VER entries in env.d #195054. + +*gcc-config-1.4.0-r3 (07 Oct 2007) + + 07 Oct 2007; Mike Frysinger files/gcc-config-1.4.0, + +gcc-config-1.4.0-r3.ebuild: + When querying for a current profile for a different target than the host, + make sure we query the right target #193353. + +*gcc-config-1.4.0-r2 (31 Aug 2007) + + 31 Aug 2007; Mike Frysinger files/gcc-config-1.4.0, + files/wrapper-1.5.0.c, +gcc-config-1.4.0-r2.ebuild: + Rename NATIVE symlink to .NATIVE so it doesnt show up in listings and + confuse people. + +*gcc-config-1.4.0-r1 (26 Aug 2007) + + 26 Aug 2007; Mike Frysinger files/gcc-config-1.4.0, + files/wrapper-1.5.0.c, +gcc-config-1.4.0-r1.ebuild: + Add a quick symlink for the native compiler gcc env.d so that by default, + path look ups are fast even when working under a reduced PATH #190260 by + Robert Buchholz. + + 24 Jun 2007; Piotr Jaroszyński + gcc-config-1.4.0.ebuild: + (QA) Don't use KEYWORDS="-*". bug #160519. + + 02 Jun 2007; Raúl Porcel gcc-config-1.3.16.ebuild: + alpha stable wrt #176869 + + 11 May 2007; Joshua Kinard gcc-config-1.3.16.ebuild: + Stable on mips, per #176869. + + 05 May 2007; nixnut gcc-config-1.3.16.ebuild: + Stable on ppc wrt bug 176869 + + 04 May 2007; Daniel Gryniewicz gcc-config-1.3.16.ebuild: + Marked stable on amd64 for bug #176869 + + 03 May 2007; Raúl Porcel gcc-config-1.3.16.ebuild: + x86 stable wrt bug 176882 + + 03 May 2007; Gustavo Zacarias + gcc-config-1.3.16.ebuild: + Stable on sparc wrt #176869 + + 03 May 2007; Markus Rothe gcc-config-1.3.16.ebuild: + Stable on ppc64; bug #176869 + + 03 May 2007; Jeroen Roovers Manifest: + Fix manifest. + + 03 May 2007; Mike Frysinger +files/gcc-config-1.4.0, + +files/wrapper-1.5.0.c, +gcc-config-1.4.0.ebuild: + Move to GCC_PATH #174422 and make sure LDPATH is not re-ordered on us all + the time #168884. + + 03 May 2007; Jeroen Roovers gcc-config-1.3.16.ebuild: + Stable for HPPA (bug #176869). + + 02 May 2007; Mike Frysinger files/gcc-config-1.3.16: + Add a wrapper for gcov #175523. + + 22 Apr 2007; Bryan Østergaard + gcc-config-1.3.15-r1.ebuild: + Stable on Alpha, bug 174126. + + 18 Apr 2007; Alexander Færøy + gcc-config-1.3.15-r1.ebuild: + Stable on MIPS; bug #174126 + + 15 Apr 2007; nixnut gcc-config-1.3.15-r1.ebuild: + Stable on ppc wrt bug 174126 + + 11 Apr 2007; Jeroen Roovers gcc-config-1.3.15-r1.ebuild: + Stable for HPPA (bug #174126). + + 11 Apr 2007; Markus Rothe + gcc-config-1.3.15-r1.ebuild: + Stable on ppc64; bug #174126 + + 11 Apr 2007; Peter Weller gcc-config-1.3.15-r1.ebuild: + Stable on amd64 wrt bug 174126 + + 11 Apr 2007; Gustavo Zacarias + gcc-config-1.3.15-r1.ebuild: + Stable on sparc wrt #174126 + + 11 Apr 2007; Raúl Porcel + gcc-config-1.3.15-r1.ebuild: + x86 stable wrt bug 174126 + +*gcc-config-1.3.16 (11 Apr 2007) + + 11 Apr 2007; Mike Frysinger +files/gcc-config-1.3.16, + +files/wrapper-1.4.8.c, +gcc-config-1.3.16.ebuild: + Fabian Groffen says: remove alloca() usage #173998. + +*gcc-config-1.3.15-r1 (12 Mar 2007) + + 12 Mar 2007; Mike Frysinger files/gcc-config-1.3.15, + +gcc-config-1.3.15-r1.ebuild: + Add wrappers for gcjh, gfortran, and the D language #157694 by Philipp + Kirchner. + + 27 Jan 2007; Alexander H. Færøy + gcc-config-1.3.14.ebuild: + Stable on MIPS; bug #157571 + + 31 Dec 2006; Bryan Østergaard + gcc-config-1.3.14.ebuild: + Stable on Alpha, bug 157571. + + 11 Dec 2006; Steve Dibb gcc-config-1.3.14.ebuild: + amd64 stable, bug 157571 + + 11 Dec 2006; Jeroen Roovers gcc-config-1.3.14.ebuild: + Stable for HPPA (bug #157571). + + 11 Dec 2006; Gustavo Zacarias + gcc-config-1.3.14.ebuild: + Stable on sparc wrt #157571 + + 10 Dec 2006; Andrej Kacian gcc-config-1.3.14.ebuild: + Stable on x86, bug #157571. + + 09 Dec 2006; Markus Rothe gcc-config-1.3.14.ebuild: + Stable on ppc64; bug #157571 + + 09 Dec 2006; nixnut gcc-config-1.3.14.ebuild: + Stable on ppc wrt bug 157571 + +*gcc-config-1.3.15 (09 Dec 2006) + + 09 Dec 2006; Mike Frysinger +files/gcc-config-1.3.15, + +gcc-config-1.3.15.ebuild: + Add support by Kevin F. Quinn for handling multiple files in GCC_SPECS #125805. + + 19 Oct 2006; Roy Marples gcc-config-1.3.14.ebuild: + Added ~sparc-fbsd keyword. + +*gcc-config-1.3.14 (19 Oct 2006) + + 19 Oct 2006; Mike Frysinger +files/gcc-config-1.3.14, + +gcc-config-1.3.14.ebuild: + Make libgcc updates atomic #150257 by Diego. + +*gcc-config-1.3.13-r4 (02 Oct 2006) + + 02 Oct 2006; Mike Frysinger + -gcc-config-1.3.13-r3.ebuild, +gcc-config-1.3.13-r4.ebuild: + Bump to make sure everyone is using gcc-config-1 wrappers and not eselect. + +*gcc-config-1.3.13-r3 (03 Jul 2006) + + 03 Jul 2006; Mike Frysinger files/gcc-config-1.3.13, + +gcc-config-1.3.13-r3.ebuild: + Push out accumulated fixes. + + 16 Jun 2006; Joshua Kinard gcc-config-2.0.0_rc1.ebuild: + De-keywording for now on mips. Will stay with gcc-config-1.3.x and see how + 2.x and its eselect tool mature. + +*gcc-config-2.0.0_rc1 (06 Jun 2006) + + 06 Jun 2006; Jeremy Huddleston + -gcc-config-2.0.0_beta2.ebuild, +gcc-config-2.0.0_rc1.ebuild: + Updating gcc-config-2* ebuild to rc1, so users don't need to download a + different tarball than for eselect-compiler when it gets unmasked. There is + actually no change in the wrapper other than the version number. + +*gcc-config-1.3.13-r2 (25 Apr 2006) + + 25 Apr 2006; Mike Frysinger files/gcc-config-1.3.13, + +gcc-config-1.3.13-r2.ebuild: + If active profile no longer exists, make sure -c spits out an error message. + + 29 Apr 2006; Joshua Kinard gcc-config-1.3.13-r1.ebuild: + Marked stable on mips. + + 03 Apr 2006; Mike Frysinger files/gcc-config-1.3.13: + Generate a CTARGET-cpp wrapper if need be. + + 30 Mar 2006; Diego Pettenò + gcc-config-1.3.13-r1.ebuild: + Add ~x86-fbsd keyword. + + 28 Mar 2006; Jeremy Huddleston + gcc-config-2.0.0_beta2.ebuild: + Added to ~ppc64. + + 26 Mar 2006; Bryan Østergaard + gcc-config-1.3.13-r1.ebuild: + Stable on amd64. Bug #125810. + + 17 Mar 2006; Jeroen Roovers gcc-config-1.3.13-r1.ebuild: + Stable on hppa (bug #125810). + + 17 Mar 2006; Chris White + gcc-config-1.3.13-r1.ebuild: + ppc stable for 1.3.13-r1 per bug #125810. + + 16 Mar 2006; Gustavo Zacarias + gcc-config-1.3.13-r1.ebuild: + Stable on sparc wrt #125810 + + 14 Mar 2006; Joshua Jackson + gcc-config-1.3.13-r1.ebuild: + Stable on x86; bug #125810 + + 12 Mar 2006; Markus Rothe + gcc-config-1.3.13-r1.ebuild: + Stable on ppc64; bug #125810 + +*gcc-config-1.3.13-r1 (08 Jan 2006) +*gcc-config-1.3.12-r6 (08 Jan 2006) + + 08 Jan 2006; Mike Frysinger files/gcc-config-1.3.12, + files/gcc-config-1.3.13, -gcc-config-1.3.12-r5.ebuild, + +gcc-config-1.3.12-r6.ebuild, -gcc-config-1.3.13.ebuild, + +gcc-config-1.3.13-r1.ebuild: + Ignore directores in /etc/env.d/gcc #118246 by Mark Purtill. + +*gcc-config-1.3.12-r5 (05 Jan 2006) + + 05 Jan 2006; Mike Frysinger files/gcc-config-1.3.12, + files/gcc-config-1.3.13, -gcc-config-1.3.12-r4.ebuild, + +gcc-config-1.3.12-r5.ebuild: + Fix changing of profiles when using ROOT and a different CHOST. + +*gcc-config-1.3.13 (30 Dec 2005) + + 30 Dec 2005; Mike Frysinger +files/gcc-config-1.3.13, + +gcc-config-1.3.13.ebuild: + Fix multilib copying of libraries #95622 by Diego Pettenò and restore + copying of libgcc_s/libunwind when run from inside portage by using the mv + instead of cp method of updating the libraries. + + 27 Dec 2005; Mike Frysinger files/gcc-config-1.3.12, + gcc-config-1.3.12-r4.ebuild: + Use get_libdir #114633 by Patrick McLean. + +*gcc-config-1.3.12-r4 (19 Nov 2005) + + 19 Nov 2005; Mike Frysinger files/gcc-config-1.3.12, + +gcc-config-1.3.12-r4.ebuild: + Add support for selecting profiles by version only. + +*gcc-config-1.3.12-r3 (01 Nov 2005) + + 01 Nov 2005; Mike Frysinger files/gcc-config-1.3.12, + +gcc-config-1.3.12-r3.ebuild: + Make sure we set env vars before trying to use them #111022 by Attila Stehr. + +*gcc-config-2.0.0_beta2 (02 Oct 2005) + + 02 Oct 2005; Jeremy Huddleston + -gcc-config-2.0.0_beta1.ebuild, +gcc-config-2.0.0_beta2.ebuild: + Version bump with more backwards compat support (-B, -L, and -X). + +*gcc-config-2.0.0_beta1 (01 Oct 2005) + + 01 Oct 2005; Jeremy Huddleston + +gcc-config-2.0.0_beta1.ebuild: + Added gcc-config wrapper for beta version of eselect-compiler. It still + needs to be cleaned up a bit, but it's functional, so putting it into + portage (package.mask still of course). + + 18 Sep 2005; Mike Frysinger files/gcc-config-1.3.12: + Add support for spaces in make.conf settings #105855. + + 16 Sep 2005; Aron Griffis + gcc-config-1.3.12-r2.ebuild: + Mark 1.3.12-r2 stable on alpha + + 13 Sep 2005; gcc-config-1.3.12-r2.ebuild: + Marked stable on amd64 + + 07 Sep 2005; Aaron Walker + gcc-config-1.3.12-r2.ebuild: + Stable on mips. + + 03 Sep 2005; Michael Hanselmann + gcc-config-1.3.12-r2.ebuild: + Stable on ppc. + + 03 Sep 2005; Markus Rothe + gcc-config-1.3.12-r2.ebuild: + Stable on ppc64 + + 01 Sep 2005; Gustavo Zacarias + gcc-config-1.3.12-r2.ebuild: + Stable on sparc + + 25 Aug 2005; Mike Frysinger files/gcc-config-1.3.12: + Update list output to show the active version for all targets. + + 09 Aug 2005; Jeremy Huddleston + -files/gcc-config-1.4.0, -gcc-config-1.4.0.ebuild: + Killing 1.4.0. Working on gcc-config-2.0 in gentoo/src/toolchain/gcc-config. + +*gcc-config-1.3.12-r2 (05 Aug 2005) + + 05 Aug 2005; Martin Schlemmer files/gcc-config-1.3.12, + +gcc-config-1.3.12-r2.ebuild: + Fix long option for -S (--split-profile). + +*gcc-config-1.3.12-r1 (04 Aug 2005) + + 04 Aug 2005; Mike Frysinger +files/wrapper-1.4.7.c, + +gcc-config-1.3.12-r1.ebuild: + Clean up the wrapper a bit. + +*gcc-config-1.3.12 (09 Jul 2005) + + 09 Jul 2005; Mike Frysinger +files/gcc-config-1.3.12, + +gcc-config-1.3.12.ebuild: + Add support for parsing profile names so we can use it in toolchain.eclass. + +*gcc-config-1.3.11-r4 (07 Jul 2005) + + 07 Jul 2005; Mike Frysinger files/gcc-config-1.3.11, + files/wrapper-1.4.6.c, +gcc-config-1.3.11-r4.ebuild: + Make sure the f77 wrapper is installed/run properly for g77 #97437 by John + C. Vernaleo. + + 17 Jun 2005; Chris Gianelloni + gcc-config-1.3.10-r1.ebuild, gcc-config-1.3.10-r2.ebuild, + gcc-config-1.3.11-r3.ebuild, gcc-config-1.4.0.ebuild: + Removed portage from deps, as this solves a perl/openssl circular dependency. + +*gcc-config-1.3.11-r3 (13 Jun 2005) + + 13 Jun 2005; Mike Frysinger files/gcc-config-1.3.11, + +gcc-config-1.3.11-r3.ebuild: + Make sure that -c errors out if given an invalid TARGET. + +*gcc-config-1.3.11-r2 (07 Jun 2005) + + 07 Jun 2005; Mike Frysinger files/gcc-config-1.3.11, + -gcc-config-1.3.11-r1.ebuild, +gcc-config-1.3.11-r2.ebuild: + Make sure we support funky version strings (beta823942) and custom specs + (hardened). + +*gcc-config-1.3.11-r1 (07 Jun 2005) + + 07 Jun 2005; Mike Frysinger files/gcc-config-1.3.11, + -gcc-config-1.3.11.ebuild, +gcc-config-1.3.11-r1.ebuild: + Cleanup the CHOST-GCCVER parsing so it isnt so fragile (and works with BSD + hosts). + +*gcc-config-1.3.11 (06 Jun 2005) + + 06 Jun 2005; Mike Frysinger +files/gcc-config-1.3.11, + +gcc-config-1.3.11.ebuild: + If python is broken due to libstdc++ changes or whatever, make sure + gcc-config still works somewhat sanely. + + 10 Apr 2005; Joseph Jezak gcc-config-1.3.10-r2.ebuild: + Marked ppc stable. + + 09 Apr 2005; Markus Rothe + gcc-config-1.3.10-r2.ebuild: + Stable on ppc64 + + 01 Apr 2005; Aron Griffis gcc-config-1.3.10-r2.ebuild: + stable on ia64 + +*gcc-config-1.3.10-r2 (31 Mar 2005) + + 31 Mar 2005; Jeremy Huddleston + +gcc-config-1.3.10-r2.ebuild: + Don't spit out -m64 warnings. Closes bug #87130. + + 19 Mar 2005; Mike Frysinger files/gcc-config-1.3.8, + files/gcc-config-1.3.10, files/gcc-config-1.4.0: + Make sure we copy libunwind in addition to libgcc_s (for ia64 and such). + Also dont copy internal gcc libs while portage is calling us (causes python + to segfault and crap). + + 17 Mar 2005; Jeremy Huddleston + gcc-config-1.3.10-r1.ebuild: + Stable on sparc so the stable sparc gcc doesn't give the (ignorable) warning + about the config being broken. + + 04 Mar 2005; Jeremy Huddleston + files/gcc-config-1.4.0: + Changing CTARGET_ALIASES to FAKE_TARGETS for consistency with binutils. + + 04 Mar 2005; Jeremy Huddleston + -files/fake-ctarget.sh, files/gcc-config-1.4.0, gcc-config-1.4.0.ebuild: + Cleaned up 1.4.0 a bit. Got rid of the stupid fake-ctarget.sh stuff and + added smarter logic for that into the gcc-config script. Still in + package.mask as it hits a sandbox bug. + +*gcc-config-1.4.0 (19 Feb 2005) + + 19 Feb 2005; Jeremy Huddleston + +files/fake-ctarget.sh, -files/gcc-config-1.3.9, +files/gcc-config-1.4.0, + -files/wrapper-1.4.4.c, +files/wrapper-1.4.6.c, + gcc-config-1.3.10-r1.ebuild, -gcc-config-1.3.9.ebuild, + +gcc-config-1.4.0.ebuild: + 1.3.10-r1 stable on amd64. Removing 1.3.9. Adding 1.4.0 which adds support + for creating ctarget aliases based on the GCC_CTARGET_ALIASES variable in + the /etc/env.d/gcc/ config file. This is setup automatically on multilib + profiles with recent gcc emerges. + + 01 Feb 2005; Jeremy Huddleston + gcc-config-1.3.10-r1.ebuild: + Done testing. Releasing into ~arch. + +*gcc-config-1.3.10-r1 (31 Jan 2005) + + 31 Jan 2005; Jeremy Huddleston + files/gcc-config-1.3.10, +gcc-config-1.3.10-r1.ebuild, + -gcc-config-1.3.10.ebuild: + Make gcc-config support gcc version strings containing '-'. This allows for + wider multislot support. + +*gcc-config-1.3.10 (30 Jan 2005) + + 30 Jan 2005; Jeremy Huddleston + +files/gcc-config-1.3.10, +files/wrapper-1.4.5.c, + +gcc-config-1.3.10.ebuild: + Multilib fixes. Copies libgcc_s.so* to the correct location for all abis. + Allows command line args to override ${ABI}. This should resolve bugs #78306 + and #78652. + + 23 Jan 2005; Mike Frysinger + gcc-config-1.3.8-r4.ebuild, gcc-config-1.3.9.ebuild: + Make sure old gcc-configs dont exist #79062. + + 20 Jan 2005; Jeremy Huddleston + gcc-config-1.3.9.ebuild: + Stable on amd64 ahead of everyone else because its multilib goodies are + required for 2005.0. + +*gcc-config-1.3.8-r4 (05 Jan 2005) + + 05 Jan 2005; Mike Frysinger files/gcc-config-1.3.8, + -gcc-config-1.3.8-r3.ebuild, +gcc-config-1.3.8-r4.ebuild: + Make sure that when we switch compilers, we dont accidently invalidate all + of our ccache data #70548. + + 03 Jan 2005; Ciaran McCreesh : + Change encoding to UTF-8 for GLEP 31 compliance + +*gcc-config-1.3.9 (27 Dec 2004) + + 27 Dec 2004; Jeremy Huddleston + files/gcc-config-1.3.9, +files/wrapper-1.4.4.c, +gcc-config-1.3.9.ebuild: + Rolling in support for CFLAGS_${ABI}. Rolling g{cc,++}{32,64} support into + the wrapper. + +*gcc-config-1.3.8-r3 (24 Dec 2004) +*gcc-config-1.3.8-r2 (24 Dec 2004) +*gcc-config-1.3.8-r1 (24 Dec 2004) + + 24 Dec 2004; Mike Frysinger files/gcc-config-1.3.8, + +gcc-config-1.3.8-r1.ebuild, -gcc-config-1.3.8.ebuild: + Seems people still have outdated gcc versions installed which break with + GCC_SPECS="". Add a warning if their gcc is broken so they know they have to + re-emerge gcc. + +*gcc-config-1.3.8 (23 Dec 2004) + + 23 Dec 2004; Mike Frysinger : + Make sure GCC_SPECS doesn't hang around when switching between profiles. + Copy libgcc_s.so to /lib (since some systems link files in /bin against it). + Make sure the wrapper can locate cross-compilers via /etc/env.d files when + the active environment is empty. + +*gcc-config-1.3.7-r6 (08 Dec 2004) + + 08 Dec 2004; Mike Frysinger files/gcc-config-1.3.7, + files/wrapper-1.4.2.c, -gcc-config-1.3.7-r5.ebuild, + +gcc-config-1.3.7-r6.ebuild: + Portability patch #73617 by Sunil. + +*gcc-config-1.3.7-r5 (05 Dec 2004) + + 05 Dec 2004; Mike Frysinger files/gcc-config-1.3.7, + -gcc-config-1.3.7-r4.ebuild, +gcc-config-1.3.7-r5.ebuild: + Err, we want to handle GCC_SPECS, not GCC_CONFIG. Also make sure duplicate + paths arent duplicated in LDPATH now that gcc is exporting multiple spec + files per ebuild. + +*gcc-config-1.3.7-r4 (03 Dec 2004) + + 03 Dec 2004; Mike Frysinger files/gcc-config-1.3.7, + -gcc-config-1.3.7-r3.ebuild, +gcc-config-1.3.7-r4.ebuild: + Make sure GCC_CONFIG is taken only from the selected profile. + +*gcc-config-1.3.7-r3 (02 Dec 2004) + + 02 Dec 2004; Mike Frysinger files/gcc-config-1.3.7, + -gcc-config-1.3.7-r2.ebuild, +gcc-config-1.3.7-r3.ebuild: + Version bump to add a lot of cross-compile fixes. Also perform sanity + checking on GCC_SPECS #68799, dont create wrappers in the ebuild #72745, and + dont install /lib/cpp unless the system supports C++. + +*gcc-config-1.3.7-r2 (28 Nov 2004) + + 28 Nov 2004; Travis Tilley files/gcc-config-1.3.6, + files/gcc-config-1.3.7, -gcc-config-1.3.6-r3.ebuild, + +gcc-config-1.3.6-r4.ebuild, -gcc-config-1.3.7-r1.ebuild, + +gcc-config-1.3.7-r2.ebuild: + Fixed Bug 72557, where gcc-config would get very confused with non-gcc-lib + ldpaths + + 26 Oct 2004; Martin Schlemmer +files/wrapper-1.4.3.c: + Add GCCBITS support to wrapper. + +*gcc-config-1.3.7-r1 (25 Oct 2004) + + 25 Oct 2004; Mike Frysinger files/gcc-config-1.3.7: + Make sure umask doesn't screw up the install #68699. Run gcc-config from + $S instead of expecting $PATH to contain something functional #68700. + Move the 32bit/64bit wrapper logic out of toolchain.eclass and into + gcc-config via GCCBITS. + +*gcc-config-1.3.7 (13 Oct 2004) + + 13 Oct 2004; Mike Frysinger +files/gcc-config-1.3.7, + +gcc-config-1.3.7.ebuild: + Better invalid arg handling, list profiles even if you dont have a current + one, support $ROOT, dont export CC/CXX, create g77 wrappers alongside f77, + and general touchups. + + 10 Oct 2004; Tom Gall gcc-config-1.3.6-r3.ebuild: + stable on ppc64 + +*gcc-config-1.3.6-r3 (05 Oct 2004) + + 05 Oct 2004; Travis Tilley files/gcc-config-1.3.6, + -gcc-config-1.3.6-r2.ebuild, +gcc-config-1.3.6-r3.ebuild: + fixed the handling of GCC_SPECS-specific gcc configs + + 02 Oct 2004; Bryan Østergaard + gcc-config-1.3.6-r2.ebuild: + Stable on alpha. + +*gcc-config-1.3.6-r2 (02 Oct 2004) + + 02 Oct 2004; Travis Tilley files/gcc-config-1.3.6, + files/gcc-config-1.4, files/gcc-config-1.4.1, -gcc-config-1.3.6-r1.ebuild, + +gcc-config-1.3.6-r2.ebuild: + added the fix for bug 63973 + + 28 Sep 2004; Sven Wegener files/wrapper-1.4.c, + files/wrapper.c: + Gentoo Technologies, Inc. -> Gentoo Foundation + + 25 Sep 2004; Joshua Kinard gcc-config-1.3.6-r1.ebuild: + Marked stable on mips. + + 31 Aug 2004; Gustavo Zacarias + gcc-config-1.3.6-r1.ebuild: + Stable on sparc + + 26 Aug 2004; Travis Tilley gcc-config-1.3.6-r1.ebuild: + stable on amd64 + + 25 Aug 2004; gcc-config-1.3.6-r1.ebuild: + marked gcc-config-1.3.6-r1 stable on x86 and arm + +*gcc-config-1.3.6-r1 (24 Jul 2004) + + 24 Jul 2004; Martin Schlemmer files/gcc-config-1.3.6, + +gcc-config-1.3.6-r1.ebuild: + Some cleanup that remove use of which from ferret , + bug #55262. + + 02 Jul 2004; Jeremy Huddleston + gcc-config-1.3.3-r1.ebuild, gcc-config-1.3.3-r2.ebuild, + gcc-config-1.3.4.ebuild, gcc-config-1.3.5-r1.ebuild, + gcc-config-1.3.5.ebuild, gcc-config-1.3.6.ebuild: + virtual/glibc -> virtual/libc + + 19 Jun 2004; Martin Schlemmer gcc-config-1.3.5.ebuild: + Mark stable for all. + +*gcc-config-1.3.6 (19 Jun 2004) + + 19 Jun 2004; Martin Schlemmer +files/gcc-config-1.3.6, + +gcc-config-1.3.6.ebuild: + Make sure we cleanup stale wrappers, bug #36388. + + 11 Jun 2004; Bryan Østergaard + gcc-config-1.3.5-r1.ebuild: + Stable on alpha. + + 02 Jun 2004; Travis Tilley gcc-config-1.3.5-r1.ebuild: + stable on amd64 + + 10 May 2004; Michael McCabe gcc-config-1.3.5-r1.ebuild: + Stable on s390 + +*gcc-config-1.3.5-r1 (06 May 2004) + + 06 May 2004; Mike Frysinger files/gcc-config-1.3.5, + files/gcc-config-1.3.5-multi-ldpath, gcc-config-1.3.5.ebuild, + +gcc-config-1.3.5-r1.ebuild: + Clean up the help output, add support for -v|--version and -h|--help options, + and then add the version to the gcc-config after installing. + Unify the multi-ldpath crap since there are no real differences between + the two to fix #29950 by Brad House. + Add environment printing fix #48492 by splite. + +*gcc-config-1.3.5 (08 Feb 2004) + + 08 Feb 2004; Martin Schlemmer gcc-config-1.3.5.ebuild, + files/gcc-config-1.3.5, files/wrapper-1.4.2.c: + Update wrapper to also treat symlinks as valid targets - this fixes a problem + where $CHOST-gcc called the symlink, and not the proper binary. Also fix a few + issues where we used data->tmp as they can cause possible corruption when used + in recursive calls and child functions. Closes bug #39162. + +*gcc-config-1.3.4 (18 Nov 2003) + + 18 Nov 2003; Martin Schlemmer gcc-config-1.3.4.ebuild, + files/gcc-config-1.3.4, files/gcc-config-1.3.4-multi-ldpath: + I did not use REAL_CHOST in all cases, ending up with /usr/bin/-gcc, etc + files, as CHOST was not set. + +*gcc-config-1.3.3-r2 (18 Oct 2003) + + 18 Oct 2003; Brad House gcc-config-1.3.3-r2.ebuild, + files/gcc-config-1.3.3-multi-ldpath: + necessary gcc-config changes made for amd64 and 3.3.1-r5. Marked -* ~amd64 + + 11 May 2003; Martin Schlemmer gcc-config-1.3.3-r1 : + Mark stable for all, as if fixes a few bugs. + +*gcc-config-1.3.3-r1 (28 Apr 2003) + + 28 Apr 2003; Martin Schlemmer gcc-config-1.3.3-r1, + gcc-config-1.3.3 : + Update gcc-config-1.3.3 to use the absolute path to portageq, else it + breaks things. Thanks to Spider for noticing this. + + 12 Apr 2003; Martin Schlemmer files/wrapper-1.4.1.c : + Update wrapper as I suggested in bug #18933 to be able to handle cross + compiler frontends ... + +*gcc-config-1.3.3 (12 Apr 2003) + + 12 Apr 2003; Martin Schlemmer gcc-config-1.3.3.ebuild, + files/gcc-config-1.3.3, files/wrapper-1.4.1.c : + New version: + - Update the wrapper to scan /etc/env.d/05gcc for PATH, and then append this + to caller name if successful. This should improve speed much if PATH is + not setup properly, as we do not have to run gcc-config ... This is a + much better solution for bug #18766. + - Add short options to gcc-config, closing bug #13005. + - Add the ability to choose the profile by a number, as listed by running + 'gcc-config --list-profiles', closing bug #13005. + +*gcc-config-1.3.2 (08 Apr 2003) + + 08 Apr 2003; Martin Schlemmer gcc-config-1.3.2.ebuild, + files/gcc-config-1.3.2, files/gcc-config-1.4.1 : + Add speed optimization patch from Aron Griffis . + Basically we only get the CHOST from portage if needed ... closes bug #18766. + Use wrapper-1.4.c ... + +*gcc-config-1.3.1-r1 (06 Apr 2003) + + 06 Apr 2003; Zach Welch gcc-config-1.3.1-r1.ebuild, + gcc-config-1.3.1.ebuild, files/gcc-config-1.3.1, files/gcc-config-1.4.1 : + change return to exit in gcc-config script, and minor fix for distcc + and cross-compiling compatibility. + Note: The latest gcc-config-1.4 is almost ready for production, but + these changes are still too experimental to commit an ebuild. Even + so, I am also updating the gcc-config script to reflect the latest + status. Still no ebuild for now. + + 23 Feb 2003; Martin Schlemmer gcc-config-1.4, + wrapper-1.4.c : + - Add gcc-config-1.4 with '--install-toolchain' support written by + Zach Welch . I am not 100% sure on the status + on this, so not adding a ebuild for now. + - Add wrapper-1.4.c that is borken up in functions. This is also + thanks to Zach Welch . I also tweaked it to + modify PATH by appending gcc's bin path to it ... this should + speed up calls gcc does to its tools. I also fixed a few possible + memory leaks. + + 19 Feb 2003; Guy Martin gcc-config-1.3.1.ebuild : + Changed ~hppa to hppa. + +*gcc-config-1.3.1 (19 Jan 2003) + + 28 Mar 2003; Christian Birchinger + gcc-config-1.3.1.ebuild: + Added stable sparc keyword + + 24 Feb 2003; Nicholas Wourms gcc-config-1.3.1.ebuild : + Changed mips keyword to stable. + + 21 Feb 2003; Aron Griffis gcc-config-1.3.1.ebuild : + Mark stable on alpha + + 18 Feb 2003; Zach Welch gcc-config-1.3.1.ebuild : + Add stable for arm + + 18 Feb 2003; Seemant gcc-config-1.3.1.ebuild : + moved to stable for x86 + + 19 Feb 2003; Martin Schlemmer gcc-config-1.3.1 : + + Some tweaks to try minimize subshells. + + 09 Feb 2003; Guy Martin gcc-config-1.2.7.ebuild : + + Added hppa keyword to gcc-config-1.2.7.ebuild and ~hppa keyword on + latests versions up to gcc-config-1.3.1.ebuild. + + 14 Feb 2003; Mark Guertin gcc-config-1.3.1.ebuild : + added ppc to keywords + + 19 Jan 2003; Martin Schlemmer gcc-config-1.3.1.ebuild : + + Use the 'which' command to find commands if present to give a bit of a + speedup. Display a warning about sourcing /etc/profile if you change the + default profile to stop confusion. + + Fix a segfault in wrapper.c if $PATH is not set. Many thanks to + Eric Andresen for reporting this. + + 19 Jan 2003; Martin Schlemmer wrapper.c : + + Fix to check if '/gcc-bin/' in full name of called gcc, once again thanks + to feedback from Eric Andresen . + +*gcc-config-1.3.0 (16 Jan 2003) + + 16 Jan 2003; Martin Schlemmer gcc-config-1.3.0.ebuild : + + Set argv[0] to the correct binary, else gcc do not find internal + headers, etc (bug #8132). Fixed files/wrapper.c for this. + +*gcc-config-1.2.9 (15 Jan 2003) + + 15 Jan 2003; Martin Schlemmer gcc-config-1.2.9.ebuild : + + Fix wrapper calling cc-config. + +*gcc-config-1.2.8 (15 Jan 2003) + + 15 Jan 2003; Martin Schlemmer gcc-config-1.2.8.ebuild : + + Add C wrapper to call the real binaries. + + 02 Jan 2003; Martin Schlemmer gcc-config-1.2.7.ebuild : + + Update usage screen to be more compact. Also should be more consistant + with other unix tools. Bug #13005. + +*gcc-config-1.2.7 (25 Dec 2002) + + 06 Jan 2003; Jan Seidel gcc-config-1.2.7.ebuild : + Added mips to keywords. + + 25 Dec 2002; Martin Schlemmer gcc-config-1.2.7.ebuild : + + Add colorgcc support, partly a fix for bug #12689. + +*gcc-config-1.2.6 (23 Dec 2002) + + 24 Dec 2002; Martin Schlemmer gcc-config-1.2.6.ebuild : + + In some cases we have an old /usr/bin/cpp binary that was not unmerged from + non multi arch/version scheme gcc's. If so, backup it, and replace with a + wrapper script. + +*gcc-config-1.2.5 (23 Dec 2002) + + 23 Dec 2002; Martin Schlemmer gcc-config-1.2.5.ebuild : + + Add --print-environ switch. Add /usr/bin/cpp wrapper. Fix the wrapper + to setup PATH if it cannot find cpp, or if 'which cpp' give /usr/bin/cpp. + + 17 Dec 2002; Martin Schlemmer gcc-config-1.2.4 : + + Do not add a LDPATH if the directory do not exist. + +*gcc-config-1.2.4 (16 Dec 2002) + + 16 Dec 2002; Martin Schlemmer : + + More fixes for wrappers. + +*gcc-config-1.2.3 (16 Dec 2002) + + 16 Dec 2002; Martin Schlemmer : + + Regenerate /lib/cpp and /usr/bin/cc if they do not exist, or + are symlinks .. Run gcc-config in pkg_postinst(). + +*gcc-config-1.2.2 (16 Dec 2002) + + 16 Dec 2002; Martin Schlemmer : + + Update to handle wrappers used for /lib/cpp and /usr/bin/cc in + new gcc ebuilds. + + 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords + +*gcc-config-1.2.1 (27 Nov 2002) + + 27 Nov 2002; Martin Schlemmer : + + Update to only biatch about not being root if the user + tries to change the system profile, thanks rphillips! + +*gcc-config-1.2 (10 Nov 2002) + + 10 Nov 2002; Martin Schlemmer : + + Include all LDPATH's for this CHOST in /etc/ld.so.conf. + Add --use-portage-chost option so that it will only change + gcc profile if CHOST is same as that of make.conf. + +*gcc-config-1.1 (10 Nov 2002) + + 10 Nov 2002; Martin Schlemmer : + + New version with lots of options, and help. + +*gcc-config-1.0 (28 Oct 2002) + + 28 Oct 2002; Martin Schlemmer : + + Initial version. diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest new file mode 100644 index 00000000..19618c3e --- /dev/null +++ b/sys-devel/gcc-config/Manifest @@ -0,0 +1,6 @@ +DIST gcc-config-1.6.tar.xz 14232 SHA256 ca6a94d685a60e9ae5b8ff32c3173929848455a123233709ca791e72b640bf77 SHA512 d44256f67ed398c997cd8ce7f0b6e9bf5e602ee214deef3f7d53affd27693230526645627f00126e8b3492e5b1c7360d771b6138fb7cbc8145467c3a7ba0839d WHIRLPOOL 1a612ee1f652b0b73b4110e956c1559a56083fb4d4813f63ab374c6bba071954a13710555ffa93eec3dee94257d8891baa86989a41c0b72f3aef0edfe43f2f02 +DIST gcc-config-1.7.1.tar.xz 14708 SHA256 5d69148957bc48db2bf107558724d8c40701f8d27d1cfc7636f02353e9c2f79a SHA512 ed4f8c188679969c3428409813c1e78ca9fbf86f81f9a3e42489eecffc5857352b7d1fc90433679890b7c89da458ff1e2607e7a6f3578c6f65d1beaf71194d00 WHIRLPOOL 5f96a64dad21ae755270000adc1933dc5d2ccd28f5e49ecd96c36da266b2d64cbf3772045e529ffe6fc15381de26757c7ef742093262593a05608d52f8a97a78 +DIST gcc-config-1.7.2.tar.xz 15004 SHA256 2d235dfc1ff749b46ae8342dc3d30d5628f22eecd1ea665d16f90e82da88e899 SHA512 3bc2964fa9ede507a778787434e3aa64ef691616063d7d55020878eab9a8bf08ed5a6530dd36e15348927db9ce2b7fe22fa2aeb0039549a6e69ca895c087169b WHIRLPOOL 2692bd8289ae224a3011fbef94e45e7b903138cfa11dad4e27eca7a239f67a682def5563745bdebdfe05359d909d3f49142b23bc13141d4fa8528085c3a19299 +DIST gcc-config-1.7.3.tar.xz 15088 SHA256 2c6cca69a028f157dc54e19ea10efc240e0d26824cd223b22c294c003ce9325e SHA512 88b585787b5ad79017b27e68dbca6b5de96784582ee657d18562b1994bc1c27a6609b3dfcbf30f39a02b0b2886a289a1ddc955281fc60fe974436d13aa685908 WHIRLPOOL a9a45b489e34756da66e4597ba9f4fa061b5431a82310317237293a0c519c72906d14d3c72b76483c1c674bf779ac606cf85f22a5e4a4065dd92b1b91215461a +DIST gcc-config-1.7.tar.xz 14584 SHA256 b704cb3b98c7a8f478dcc932ae7e4ac4f4f8a847bebe35f97dc45fa7a29268ee SHA512 4ab78c662feab59bc55e40b9dc63b967c1551b6d084638e2a16866488510e7c34e0b30a0bedaeae9dd806c77f79d1e31ccb834c6112794e7fbb557756f59c43d WHIRLPOOL 50415916834dc9d097e78afbc09a32a023e3542dd6ebcf60cd6c12d0e8fc484a6d63f821c9d3acf958fdaf5ce209976521bf22d3adcd5d20fa522f1f2fd38bdb +DIST gcc-config-1.8.tar.xz 15020 SHA256 2453e2a07521b12267ca62b9b860eb2d2bc606cad0f29bf42a1c9543673f5a1b SHA512 3b84af2d961a0527834759e047330dbab7bac0ff3d6aae103f14fca2d44bd612bd4a1005649e8b4198036231ed8a8319fb13326b4d2c40474826cf53f7bc0826 WHIRLPOOL 4899bc1da43a158cc486022f68661e5318db7e4e83afdb5d892fc7ce5098a4bdb059dbab3c50e632901e577cd8760b2386da3ee24f5e944db12d3e246d9c26b6 diff --git a/sys-devel/gcc-config/files/gcc-config-1.4.1 b/sys-devel/gcc-config/files/gcc-config-1.4.1 new file mode 100644 index 00000000..4d9d2524 --- /dev/null +++ b/sys-devel/gcc-config/files/gcc-config-1.4.1 @@ -0,0 +1,801 @@ +#!/bin/bash +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.1,v 1.12 2011/12/07 05:42:19 vapier Exp $ + +trap ":" INT QUIT TSTP + +argv0=${0##*/} +source /etc/init.d/functions.sh || { + echo "${argv0}: Could not source /etc/init.d/functions.sh!" + exit 1 +} +esyslog() { :; } +umask 022 + +# *BSD are plain stupid ... copy a GNU extension but don't just copy it, +# change it so it works differently. Wish Darwin did selective evolution +# on software developers. +SED=$(type -P gsed) +SED=${SED:-$(type -P sed)} + +GENTOO_LIBDIR="@GENTOO_LIBDIR@" +[[ ${GENTOO_LIBDIR} == @*@ ]] && GENTOO_LIBDIR="lib" + +usage() { +cat << "USAGE_END" +Usage: gcc-config [options] [CC Profile] +Change the current cc/gcc profile, or give info about profiles. + +Options: + -C, --nocolor Disable color output + -O, --use-old Use the old profile if one was selected. + -f, --force Make sure all config files are regenerated. + -P, --use-portage-chost Only set to given profile if its CHOST is the + same as that set for portage in /etc/make.conf + (or one of other portage config files...). + -c, --get-current-profile Print current used gcc profile. + -l, --list-profiles Print a list of available profiles. + -S, --split-profile Split profiles into their components + -E, --print-environ Print environment that can be used to setup the + current gcc profile, or a specified one. + -B, --get-bin-path Print path where binaries of the given/current + profile are located. + -L, --get-lib-path Print path where libraries of the given/current + profile are located. + -X, --get-stdcxx-incdir Print path where g++ include files of the + given/current profile are located. + +Profile names are of the form: - +For example: i686-pc-linux-gnu-3.2.1 +USAGE_END + exit $1 +} +[[ $# -lt 1 ]] && usage 1 + +try_real_hard_to_find_CHOST() { + # + # First we read make.conf + # + + local varname=${1:-CHOST} + local conf=${ROOT}/etc/make.conf + local ret=$(source "${conf}" 2>/dev/null ; echo ${!varname}) + if [[ -z ${ret} ]] ; then + # newer portage supports spaces between the var and = + # CHOST = "this-is-retarded" + ret=$(eval $( + sed -n \ + -e 's:[[:space:]]::g' \ + -e "/^${varname}=/p" \ + "${conf}" + ) ; echo ${!varname} + ) + fi + + if [[ -n ${ret} ]] ; then + echo ${ret} + return 0 + fi + + # + # Then we try /etc/env.d/gcc/config-${CTARGET} + # + if [[ -s ${ROOT}/etc/env.d/gcc/config-${CTARGET} ]] ; then + ret=$(split_gcc_ver $(eval $(<"${ROOT}"/etc/env.d/gcc/config-${CTARGET}) ; echo ${CURRENT})) + echo ${ret% *} + fi +} + +get_real_chost() { + [[ -n ${REAL_CHOST} ]] && return 0 + + # shortcut for switching compilers in a cross chroot + if [[ -n ${CHOST} && ${ROOT} != "/" ]] ; then + REAL_CHOST=${CHOST} + return 0 + fi + + # make sure portage isnt broken + if python -V &>/dev/null ; then + export REAL_CHOST=$(env -i portageq envvar CHOST 2>/dev/null) + else + ewarn "Python seems to be broken, attempting to locate CHOST ourselves ..." + export REAL_CHOST=$(try_real_hard_to_find_CHOST) + fi + + if [[ -z ${REAL_CHOST} ]] ; then + eerror "${argv0}: Could not get portage CHOST!" + eerror "${argv0}: You should verify that CHOST is set in one of these places:" + eerror "${argv0}: - ${ROOT}/etc/make.conf" + eerror "${argv0}: - active environment" + exit 1 + fi +} + +is_cross_compiler() { + get_real_chost + [[ ${CC_COMP/${REAL_CHOST}} == ${CC_COMP} ]] +} + +# bool files_exists(search_path, files) +# Return shell true if the specified files exist. +# Files with relative paths are searched for in search_path. +# Both lists are : delimited. +files_exist() { + local p f ret old_IFS + local paths=$1 files=$2 + + old_IFS=${IFS} + export IFS=":" + + ret=0 + for f in ${files} ; do + if [[ ${f} == /* ]] ; then + [[ ! -f ${f} ]] && ret=1 && break + else + # make sure the file exists in at least + # one of the specified paths + ret=1 + for p in ${paths} ; do + [[ -f ${p}/${f} ]] && ret=0 && break + done + [[ ${ret} == 1 ]] && break + fi + done + + export IFS=${old_IFS} + if [[ ${ret} == 1 ]] ; then + ewarn "Could not locate '${f}' in '${paths}'" + fi + return ${ret} +} + +switch_profile() { + local MY_LDPATH= + local GCC_PROFILES= + local OLD_CC_COMP= + local GCC_PATH= + + if [[ $(id -u) != "0" ]] ; then + eerror "${argv0}: Must be root." + exit 1 + fi + + if is_cross_compiler ; then + ebegin "Switching cross-compiler to ${CC_COMP}" + else + ebegin "Switching native-compiler to ${CC_COMP}" + fi + + if ! is_cross_compiler ; then + # Order our profiles to have the default first ... + # We do this so that we can have them ordered with default + # first in /etc/ld.so.conf, as the logical is that all + # compilers for default CHOST will be used to compile stuff, + # and thus we want all their lib paths in /etc/ld.so.conf ... + get_real_chost + GCC_PROFILES=$(LC_ALL="C" ls -r ${GCC_ENV_D}/${REAL_CHOST}-*) + GCC_PROFILES="${GCC_ENV_D}/${CC_COMP} ${GCC_PROFILES}" + + # Extract all LDPATH's for our CHOST + MY_LDPATH="" + for x in ${GCC_PROFILES} ; do + if [[ -f ${x} ]] ; then + LDPATH=$(source "${x}"; echo ${LDPATH}) + + # Handle LDPATH's that have multiple directories + local old_IFS=${IFS} + export IFS=":" + local sub_ldpath= + for sub_ldpath in ${LDPATH} ; do + if [[ -d ${sub_ldpath} ]] ; then + if [[ ${MY_LDPATH/:${sub_ldpath}} == ${MY_LDPATH} ]] ; then + MY_LDPATH="${MY_LDPATH}:${sub_ldpath}" + fi + fi + done + export IFS=${old_IFS} + fi + done + MY_LDPATH="${MY_LDPATH:1}" # trim leading : + fi + + # Translate old PATH/ROOTPATH to GCC_PATH + cp -p "${GCC_ENV_D}/${CC_COMP}" "${GCC_ENV_D}/${CC_COMP}.gcc-config-ref" || return 1 + GCC_PATH=$( + unset GCC_PATH PATH ROOTPATH + source "${GCC_ENV_D}/${CC_COMP}" + echo ${GCC_PATH:-${PATH:-${ROOTPATH}}} + ) + ${SED} -i \ + -e '/^PATH=/d' \ + -e '/^ROOTPATH=/d' \ + -e '/^GCC_PATH=/d' \ + "${GCC_ENV_D}/${CC_COMP}" || return 1 + echo "GCC_PATH=\"${GCC_PATH}\"" >> "${GCC_ENV_D}/${CC_COMP}" || return 1 + touch -r "${GCC_ENV_D}/${CC_COMP}.gcc-config-ref" "${GCC_ENV_D}/${CC_COMP}" || return 1 + rm -f "${GCC_ENV_D}/${CC_COMP}.gcc-config-ref" || return 1 + + # Setup things properly again for this profile + unset GCC_SPECS LDPATH + source "${GCC_ENV_D}/${CC_COMP}" + OLD_CC_COMP=$(get_current_profile) + + # What kind of env.d entry are we going to generate ? + if is_cross_compiler ; then + echo "PATH=\"${GCC_PATH}\"" > "${ENV_D}/05gcc-${CTARGET}" + echo "ROOTPATH=\"${GCC_PATH}\"" >> "${ENV_D}/05gcc-${CTARGET}" + echo "CURRENT=${CC_COMP}" > "${GCC_ENV_D}/config-${CTARGET}" + else + # Pass all by default + awk '!/^(STDCXX_INCDIR|LDPATH|CC|CXX|CTARGET|GCCBITS|GCC_SPECS|GCC_PATH)=/ {print $0}' \ + "${GCC_ENV_D}/${CC_COMP}" > "${ENV_D}/05gcc-${CTARGET}" + echo "LDPATH=\"${MY_LDPATH}\"" >> "${ENV_D}/05gcc-${CTARGET}" + echo "PATH=\"${GCC_PATH}\"" >> "${ENV_D}/05gcc-${CTARGET}" + echo "ROOTPATH=\"${GCC_PATH}\"" >> "${ENV_D}/05gcc-${CTARGET}" + if [[ -n ${GCC_SPECS} ]] ; then + if files_exist ${MY_LDPATH} ${GCC_SPECS} ; then + echo "GCC_SPECS=\"${GCC_SPECS}\"" >> "${ENV_D}/05gcc-${CTARGET}" + else + echo + ewarn "Your GCC spec configurations are broken." + ewarn "Please re-emerge gcc." + echo + fi + else + # People need to rebuild their gcc or setting GCC_SPECS to + # "" will cause issues again :( + if [[ ${ROOT} != "/" ]] ; then + echo "GCC_SPECS=\"\"" >> "${ENV_D}/05gcc-${CTARGET}" + else + if ! GCC_SPECS="" /usr/bin/gcc -v &>/dev/null ; then + echo + ewarn "Your gcc has a bug with GCC_SPECS." + ewarn "Please re-emerge gcc." + ewarn "http://bugs.gentoo.org/68395" + echo + else + echo "GCC_SPECS=\"\"" >> "${ENV_D}/05gcc-${CTARGET}" + fi + fi + fi + + echo "CURRENT=${CC_COMP}" > "${GCC_ENV_D}/config-${CTARGET}" + + # Help out the gcc wrapper + rm -f "${GCC_ENV_D}/NATIVE" "${GCC_ENV_D}/.NATIVE" + ln -sf ${CC_COMP} "${GCC_ENV_D}/.NATIVE" + + # Punt old files + rm -f "${ENV_D}/05gcc" + rm -f "${ENV_D}/05gcc-${CTARGET}"-* + rm -f "${GCC_ENV_D}/config" + rm -f "${GCC_ENV_D}/config-${CTARGET}"-* + fi + + # Find the bin wrapper + local wrapper + for wrapper in ${GENTOO_LIBDIR} lib lib64 lib32 lib ; do + wrapper="${ROOT}usr/${wrapper}/misc/gcc-config" + [[ -e ${wrapper} ]] && break + done + + # Update the wrappers for this profile + for x in {,${CTARGET}-}{cpp,cc,gcc,c++,g++,f77,g77,gcj,gcjh,gcov,gdc,gdmd,gfortran} ; do + # Obviously don't want to touch native stuff for cross-compilers + [[ ${x} != ${CTARGET}-* ]] && is_cross_compiler && continue + + # Make sure we have no stale wrappers + rm -f "${ROOT}/usr/bin/${x}" + [[ ${x:${#x}-3} == "gcc" || ${x:${#x}-3} == "g++" ]] \ + && rm -f "${ROOT}/usr/bin/${x}"{32,64} + + # Only install a wrapper if the binary exists ... + # We want to figure out the 'reference file' for each + # wrapper (the binary we're 'wrapping') so that we can + # sync mtimes together. This makes things like ccache + # happy. See Bug #70548 for more info. + local ref + case ${x} in + cc) ref=${ROOT}/${GCC_PATH}/gcc;; + f77) ref=${ROOT}/${GCC_PATH}/g77;; + *) ref=${ROOT}/${GCC_PATH}/${x};; + esac + if [[ -x ${ref} ]] ; then + cp -f "${wrapper}" "${ROOT}/usr/bin/${x}" + touch -r "${ref}" "${ROOT}/usr/bin/${x}" + + # Install 32bit and 64bit wrappers if need be + # This should probably get folded back into the wrapper ... + if [[ ${x:${#x}-3} == "gcc" ]] || [[ ${x:${#x}-3} == "g++" ]] ; then + for bits in ${GCCBITS} ; do + cp -f "${wrapper}" "${ROOT}/usr/bin/${x}${bits}" + done + fi + fi + done + # legacy cruft, make sure we dont leave it laying around #143205 + rm -f "${ROOT}/usr/bin/${CTARGET}-cc" + # Only install cpp if switching to a native one + if ! is_cross_compiler && [[ ${CTARGET} != *-solaris* ]] ; then + rm -f "${ROOT}/lib/cpp" + cp -f "${wrapper}" "${ROOT}/lib/cpp" + fi + + # Relocate random crap + if ! is_cross_compiler ; then + if [[ -e ${ROOT}/usr/${GENTOO_LIBDIR}/pkgconfig/libgcj-${CC_COMP_VERSION}.pc ]] ; then + local mver=${CC_COMP_VERSION:0:3} + for x in "" "-${mver}" ; do + x="${ROOT}/usr/lib/pkgconfig/libgcj${x}.pc" + rm -f "${x}" + ln -s libgcj-${CC_COMP_VERSION}.pc "${x}" + done + fi + fi + + # We need to make sure that libgcc_s.so / libunwind.so make it into /lib. + # On many systems (x86/amd64/etc...), this will probably never matter, + # but on other systems (arm/mips/etc...), this is quite critical. + # http://bugs.gentoo.org/60190 + # + # The funky move magic is required for proper updating of in-use files. + if ! is_cross_compiler ; then + # Need to cut out extra paths in multilib case and pray the first path + # is the "root" multilib path ... maybe some day change this to use + # `gcc -print-file-name` ... + LDPATH=${LDPATH%%:*} + for multilib in $("${ROOT}/${GCC_PATH}"/gcc -print-multi-lib); do + multiarg=${multilib#*;} + multiarg=${multiarg/@/-} + multilibdir=${multilib%;*} + libdir="lib/"$("${ROOT}/${GCC_PATH}"/gcc ${multiarg} -print-multi-os-directory) + if mkdir -p "${ROOT}/${libdir}"/.gcc.config.new ; then + for gcclib in gcc_s unwind ; do + if [[ -n $(ls "${ROOT}/${LDPATH}/${multilibdir}"/lib${gcclib}.so.* 2>/dev/null) ]]; then + cp -pP "${ROOT}/${LDPATH}/${multilibdir}"/lib${gcclib}.so.* "${ROOT}/${libdir}"/.gcc.config.new/ + # no need to sanity remove this as the `mv` should take + # care of it. we also need this step to be completly atomic + # for systems that have even `mv` linked against libgcc_s.so. + # http://bugs.gentoo.org/150257 + #rm -f "${ROOT}/${libdir}"/lib${gcclib}.so* + mv -f "${ROOT}/${libdir}"/.gcc.config.new/* "${ROOT}/${libdir}"/ + fi + done + rmdir "${ROOT}/${libdir}"/.gcc.config.new + fi + done + unset multilib + unset multilibdir + unset multiarg + unset libdir + fi + + if [[ ${ROOT} == "/" ]] && [[ ${OLD_CC_COMP} != ${CC_COMP} || ${FORCE} == "yes" ]] ; then + # in case python is broken ... + if ! env-update ; then + echo "" + ewarn "env-update failed to work properly; making sure ld.so.conf paths" + ewarn "are setup properly. Please rerun gcc-config with the -f option." + echo "" + grep -h ^LDPATH= "${ROOT}"/etc/env.d/05gcc-${CTARGET} \ + | sed -e 's:^LDPATH=::' -e 's:"::g' -e 's|:|\n|g' \ + >> /etc/ld.so.conf + ldconfig + fi + fi + + eend 0 + + if [[ ${ROOT} == "/" ]] && [[ ${OLD_CC_COMP} != ${CC_COMP} ]] ; then + echo + ewarn "If you intend to use the gcc from the new profile in an already" + ewarn "running shell, please remember to do:" + echo + ewarn " . /etc/profile" + echo + fi + + return 0 +} + +get_current_profile() { + local conf="${GCC_ENV_D}/config" + if [[ ! -f ${conf} ]] ; then + conf="${GCC_ENV_D}/config-${CTARGET}" + elif [[ -n ${CC_COMP} ]] && is_cross_compiler ; then + conf="${conf}-${CC_COMP}" + fi + + if [[ ! -f ${conf} ]] ; then + eerror "${argv0}: No gcc profile is active!" + return 1 + fi + + CURRENT=$(source "${conf}"; echo ${CURRENT}) + + if [[ -z ${CURRENT} ]] ; then + eerror "${argv0}: No gcc profile is active!" + return 1 + elif [[ ! -f ${GCC_ENV_D}/${CURRENT} ]] ; then + eerror "${argv0}: Active gcc profile is invalid!" + return 1 + fi + + echo "${CURRENT}" + + return 0 +} + +list_profiles() { + local i=0 + local filter= + + if [[ ${ROOT} != "/" ]] ; then + echo "Using gcc-config info in ${ROOT}" + fi + + if [[ ! -f ${GCC_ENV_D}/config-${CTARGET} ]] ; then + if ! is_cross_compiler && [[ -e ${GCC_ENV_D}/config ]] ; then + [[ -w ${GCC_ENV_D}/config ]] && mv ${GCC_ENV_D}/config ${GCC_ENV_D}/config-${CTARGET} + else + eerror "${argv0}: No gcc profile is active; please select one!" + filter=${CTARGET} + fi + fi + + eval $(grep -s ^CURRENT= "${GCC_ENV_D}"/config-${CTARGET}) + CURRENT_NATIVE=${CURRENT} + local target= + for x in "${GCC_ENV_D}"/* ; do + if [[ -f ${x} ]] && [[ ${x/\/config} == ${x} ]] ; then + CTARGET=$(unset CTARGET; source "${x}"; echo ${CTARGET}) + + ((++i)) + + [[ -n ${filter} ]] && [[ ${filter} != ${CTARGET:-${REAL_CHOST}} ]] && continue + + if [[ ${target} != ${CTARGET} ]] ; then + [[ -n ${target} ]] && echo + target=${CTARGET} + CTARGET="" + fi + + x=${x##*/} + if [[ ${x} == ${CURRENT_NATIVE} ]] ; then + x="${x} ${GOOD}*${NORMAL}" + elif [[ -e ${GCC_ENV_D}/config-${target} ]] ; then + source "${GCC_ENV_D}/config-${target}" + [[ ${x} == ${CURRENT} ]] && x="${x} ${HILITE}*${NORMAL}" + fi + echo " [${i}] ${x}" + fi + done +} + +print_environ() { + local GCC_PATH= + local ENV_CMD= + local SET_ELEMENT= + + GCC_PATH=$(source "${GCC_ENV_D}/${CC_COMP}"; echo ${GCC_PATH:-${PATH}}) + + case ${SHELL} in + */csh|*/tcsh) + ENV_CMD="setenv" + SET_ELEMENT=" " + ;; + *) + ENV_CMD="export" + SET_ELEMENT="=" + ;; + esac + + ( + PATH=${GCC_PATH}:${PATH} + for var in PATH GCC_SPECS ; do + echo "${ENV_CMD} ${var}${SET_ELEMENT}\"${!var}\"" + done + ) +} + +get_bin_path() { + if [[ -e ${GCC_ENV_D}/${CC_COMP} ]] ; then + ( + unset PATH GCC_PATH + source "${GCC_ENV_D}/${CC_COMP}" + echo "${GCC_PATH:-${PATH}}" + ) + else + echo "no-config" + echo "${GCC_ENV_D}/${CC_COMP} doesnt exist" 1>&2 + fi + + return 0 +} + +get_lib_path() { + if [[ -e ${GCC_ENV_D}/${CC_COMP} ]] ; then + ( + unset LDPATH + source "${GCC_ENV_D}/${CC_COMP}" + echo "${LDPATH}" + ) + else + echo "no-config" + echo "${GCC_ENV_D}/${CC_COMP} doesnt exist" 1>&2 + fi + + return 0 +} + +get_stdcxx_incdir() { + # XXX: we should prob scrub this ... + if [[ -e ${GCC_ENV_D}/${CC_COMP} ]] ; then + ( + unset LDPATH STDCXX_INCDIR + source "${GCC_ENV_D}/${CC_COMP}" + echo "${LDPATH}/include/${STDCXX_INCDIR}" + ) + else + echo "no-config" + echo "${GCC_ENV_D}/${CC_COMP} doesnt exist" 1>&2 + fi + + return 0 +} + +split_gcc_ver() { + # Split up the gcc profile into components: + # TARGET-VER[-specs] -> TARGET VER [specs] + # arm-linux-3.3.6 -> arm-linux 3.3.6 + # x86_64-linux-4.0.1-pre1234 -> x86_64-linux 4.0.1-pre1234 + # sh-linux-3.4.4-hardened -> sh-linux 3.4.4 hardened + # + # So below we will start at the end and run a small state machine ... + # specs [3] + # accept everything + # specs -> version transition [3->2] + # when we find a version component + # version [2] + # accept only version components (see the regex) + # version -> target transition [2->1] + # when we hit a non version component + # target [1] + # accept everything we have left + # + echo "$@" | awk -F- ' + function pushit(onme, pushee) { + return (onme == "" ? pushee : pushee"-"onme); + } + { + state=3 + targ="" + ver="" + spec="" + for (i=NF; i > 0; --i) { + if (state >= 2) { + if ($i ~ /^(alpha|beta|pre|rc|p)?[[:digit:].]+$/) { + ver=pushit(ver, $i) + state=2 + } else if (state == 3) + spec=pushit(spec, $i) + else + state=1 + } + if (state == 1) + targ = pushit(targ, $i) + } + + if (targ == "") { + if (ver == "") { + ver=spec + spec="" + } + targ=ver + ver="" + } + print targ " " ver (spec != "" ? " " spec : "") + }' +} +chop_gcc_ver_spec() { + local splitTED=$(split_gcc_ver $@) # target ver spec + splitTED=${splitTED#* } # ver spec + echo ${splitTED/ /-} # ver-spec +} + +SET_X=false +NEED_ACTION="yes" +DOIT="switch_profile" +CHECK_CHOST="no" +FORCE="no" + +CC_COMP= +[[ -z ${ROOT} ]] && ROOT="/" +[[ ${ROOT:0-1} != "/" ]] && ROOT="${ROOT}/" +ENV_D="${ROOT}etc/env.d" +GCC_ENV_D="${ENV_D}/gcc" + +for x in "$@" ; do + case "${x}" in + # Only use specified compiler if one is not already selected. + -O|--use-old) + CTARGET=${CTARGET:-$(try_real_hard_to_find_CHOST)} + if get_current_profile &>/dev/null ; then + CC_COMP=$(get_current_profile) + else + eerror "No profile selected, unable to utilize --use-old" + exit 1 + fi + ;; + -f|--force) + FORCE="yes" + ;; + -P|--use-portage-chost) + CHECK_CHOST="yes" + ;; + -c|--get-current-profile) + if [[ ${NEED_ACTION} == "yes" ]] ; then + NEED_ACTION="no" + DOIT="get_current_profile" + fi + ;; + -l|--list-profiles) + if [[ ${NEED_ACTION} == "yes" ]] ; then + NEED_ACTION="no" + DOIT="list_profiles" + fi + ;; + -S|--split-profile) + if [[ ( $1 != "-S" && $1 != "--split-profile" ) || $# -eq 1 ]] ; then + usage 1 + fi + shift # push -S out + for x in "$@" ; do + split_gcc_ver ${x} + done + exit 0 + ;; + -E|--print-environ) + if [[ ${NEED_ACTION} == "yes" ]] ; then + NEED_ACTION="no" + DOIT="print_environ" + fi + ;; + -B|--get-bin-path) + if [[ ${NEED_ACTION} == "yes" ]] ; then + NEED_ACTION="no" + DOIT="get_bin_path" + fi + ;; + -L|--get-lib-path) + if [[ ${NEED_ACTION} == "yes" ]] ; then + NEED_ACTION="no" + DOIT="get_lib_path" + fi + ;; + -X|--get-stdcxx-incdir) + if [[ ${NEED_ACTION} == "yes" ]] ; then + NEED_ACTION="no" + DOIT="get_stdcxx_incdir" + fi + ;; + -x|--debug) + SET_X=true + ;; + -C|--nocolor) + # nothing to do; functions.sh parsed this for us + ;; + -h|--help) + usage 0 + ;; + -V|--version) + rcsfile="$RCSfile: gcc-config-1.4.1,v $" + rcsfile=${rcsfile#: } + rcsfile=${rcsfile%,v*} + cvsrev="$Revision: 1.12 $" + cvsrev=${cvsrev#: } + cvsdate="$Date: 2011/12/07 05:42:19 $" + cvsdate=${cvsdate#: } + echo "${rcsfile} (r${cvsrev% *} @ ${cvsdate% *})" + exit 0 + ;; + -*) + eerror "${argv0}: Invalid switch! Run ${argv0} without parameters for help." + exit 1 + ;; + *) + ${SET_X} && set -x + if [[ -z ${CC_COMP} ]] ; then + if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then + # User gave us a # representing the profile + i=1 + for y in "${GCC_ENV_D}"/* ; do + [[ -f ${y} ]] || continue + [[ ${y/\/config} != ${y} ]] && continue + + if [[ -f ${y} ]] && [[ ${x} == ${i} ]] ; then + CC_COMP=${y##*/} + break + fi + ((++i)) + done + else + # User gave us a full HOST-gccver + x=${x##*/} + if [[ ${DOIT} == "get_current_profile" && -z $(ls "${GCC_ENV_D}"/${x}-* 2>/dev/null) ]] || \ + [[ ${DOIT} != "get_current_profile" && ! -f ${GCC_ENV_D}/${x} ]] + then + # Maybe they just gave us a gccver ... + get_real_chost + if [[ -f ${GCC_ENV_D}/${REAL_CHOST}-${x} ]] ; then + x=${REAL_CHOST}-${x} + else + eerror "${argv0}: Could not locate '$x' in '${GCC_ENV_D}/' !" + exit 1 + fi + fi + CC_COMP=${x} + fi + else + eerror "${argv0}: Too many arguments! Run ${argv0} without parameters for help." + exit 1 + fi + ;; + esac +done + +${SET_X} && set -x + +get_real_chost +[[ ${DOIT} == "get_current_profile" ]] \ + && CTARGET=${CTARGET:-${CC_COMP:-${REAL_CHOST}}} \ + || CTARGET=${CTARGET:-${REAL_CHOST}} + +if [[ ${DOIT} == "switch_profile" ]] && [[ -z ${CC_COMP} ]] ; then + usage 1 +fi + +if [[ -z ${CC_COMP} ]] ; then + CC_COMP=$(get_current_profile) + if [[ $? -ne 0 ]] ; then + echo "${CC_COMP}" + list_profiles + exit 1 + fi +fi + +if [[ ${DOIT} != "get_current_profile" ]] ; then + GCC_LIB=$( + LDPATH=$(source "${GCC_ENV_D}/${CC_COMP}"; echo ${LDPATH}) + echo ${LDPATH} | awk -F/ '{ print "/"$2"/"$3"/"$4"/" }' + ) + + CC_COMP_VERSION=$(chop_gcc_ver_spec ${CC_COMP}) + CC_COMP_TARGET=${CC_COMP%-${CC_COMP_VERSION}*} + + if [[ ! -d ${ROOT}/${GCC_LIB}/${CC_COMP_TARGET}/${CC_COMP_VERSION} ]]; then + CC_COMP_VERSION=${CC_COMP_VERSION%-*} + fi + + if [[ ! -d ${ROOT}/${GCC_LIB}/${CC_COMP_TARGET}/${CC_COMP_VERSION} ]] || \ + [[ ! -f ${GCC_ENV_D}/${CC_COMP} ]] + then + eerror "${argv0}: Profile does not exist or invalid setting for ${GCC_ENV_D}/${CC_COMP}" 1>&2 + #exit 1 + fi +fi + +if [[ ${CHECK_CHOST} == "yes" ]] ; then + # Chosen CHOST are not the same as the real CHOST according to + # make.conf, and --use-portage-chost option was given, so do nothing + get_real_chost + CC_COMP_VERSION=$(chop_gcc_ver_spec ${CC_COMP}) + CC_COMP_TARGET=${CC_COMP:0:${#CC_COMP}-${#CC_COMP_VERSION}-1} + [[ ${CC_COMP_TARGET} != ${REAL_CHOST} ]] && exit 0 +fi + +eval ${DOIT} + +# vim:ts=4 diff --git a/sys-devel/gcc-config/files/gcc-config-1.5 b/sys-devel/gcc-config/files/gcc-config-1.5 new file mode 100755 index 00000000..64eb6473 --- /dev/null +++ b/sys-devel/gcc-config/files/gcc-config-1.5 @@ -0,0 +1,740 @@ +#!/bin/bash +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.5,v 1.7 2011/12/07 05:42:19 vapier Exp $ + +# Format of /etc/env.d/gcc/: +# config-TARGET: CURRENT=version for TARGET +# TARGET-VER: has a TARGET and VER variable + +: ${ROOT:=/} +[[ ${ROOT} != */ ]] && ROOT="${ROOT}/" +[[ ${ROOT} != /* ]] && ROOT="${PWD}${ROOT}" + +cd / + +trap ":" INT QUIT TSTP + +argv0=${0##*/} +source /etc/init.d/functions.sh || { + echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2 + exit 1 +} +esyslog() { :; } +umask 022 + +die_eerror() { + eerror "${argv0}: $*" + exit 1 +} + +# *BSD are plain stupid ... copy a GNU extension but don't just copy it, +# change it so it works differently. Wish Darwin did selective evolution +# on software developers. +SED=$(type -P gsed) +: ${SED:=$(type -P sed)} + +# Further pain: `tac` is not available everywhere #390179 +if ! type -P tac >/dev/null ; then + tac() { ${SED} -e '1!G;h;$!d' "$@" ; } +fi + +GENTOO_LIBDIR="@GENTOO_LIBDIR@" +[[ ${GENTOO_LIBDIR} == @*@ ]] && GENTOO_LIBDIR="lib" + +usage() { +cat << "USAGE_END" +Usage: gcc-config [options] [CC Profile] +Change the current cc/gcc profile, or give info about profiles. + +Options: + -C, --nocolor Disable color output + -O, --use-old Use the old profile if one was selected. + -f, --force Make sure all config files are regenerated. + -P, --use-portage-chost Only set to given profile if its CHOST is the + same as that set in /etc/portage/make.conf + (or one of other portage config files...). + -c, --get-current-profile Print current used gcc profile. + -l, --list-profiles Print a list of available profiles. + -S, --split-profile Split profiles into their components + -E, --print-environ Print environment that can be used to setup the + current gcc profile, or a specified one. + -B, --get-bin-path Print path where binaries of the given/current + profile are located. + -L, --get-lib-path Print path where libraries of the given/current + profile are located. + +Profile names are of the form: - +For example: i686-pc-linux-gnu-3.2.1 +USAGE_END + exit ${1:-1} +} +[[ $# -lt 1 ]] && usage 1 + +# Usage: source_var [default value] +source_var() { + unset $1 + local val=$(source "$2"; echo ${!1}) + : ${val:=$3} + eval $1=\"${val}\" +} +show_var() { + source_var "$@" + echo "${!1}" +} + +try_real_hard_to_find_CHOST() { + # + # First we read make.conf + # + + local varname=${1:-CHOST} + local conf=${ROOT}/etc/portage/make.conf + if [[ ! -e ${conf} && -e ${ROOT}/etc/make.conf ]] ; then + conf=${ROOT}/etc/make.conf + fi + local ret=$(source "${conf}" 2>/dev/null ; echo ${!varname}) + if [[ -z ${ret} ]] ; then + # newer portage supports spaces between the var and = + # CHOST = "this-is-retarded" + ret=$(eval $( + sed -n \ + -e 's:[[:space:]]::g' \ + -e "/^${varname}=/p" \ + "${conf}" + ) ; echo ${!varname} + ) + fi + + if [[ -n ${ret} ]] ; then + echo ${ret} + return 0 + fi + + # + # Then we try /etc/env.d/gcc/config-${CTARGET} + # + if [[ -s ${ROOT}/etc/env.d/gcc/config-${CTARGET} ]] ; then + ret=$(split_gcc_ver $(show_var CURRENT "${ROOT}"/etc/env.d/gcc/config-${CTARGET})) + echo ${ret% *} + fi +} + +get_real_chost() { + [[ -n ${REAL_CHOST} ]] && return 0 + + # shortcut for switching compilers in a cross chroot + if [[ -n ${CHOST} && ${ROOT} != "/" ]] ; then + REAL_CHOST=${CHOST} + return 0 + fi + + # make sure portage isnt broken + if python -V &>/dev/null ; then + export REAL_CHOST=$(env -i portageq envvar CHOST 2>/dev/null) + else + ewarn "Python seems to be broken, attempting to locate CHOST ourselves ..." + export REAL_CHOST=$(try_real_hard_to_find_CHOST) + fi + + if [[ -z ${REAL_CHOST} ]] ; then + eerror "${argv0}: Could not get portage CHOST!" + eerror "${argv0}: You should verify that CHOST is set in one of these places:" + eerror "${argv0}: - ${ROOT}/etc/portage/make.conf" + eerror "${argv0}: - active environment" + exit 1 + fi +} + +is_cross_compiler() { + get_real_chost + [[ ${CC_COMP/${REAL_CHOST}} == ${CC_COMP} ]] +} + +convert_profile_paths() { + # Older gcc's used PATH= and ROOTPATH= in the env.d files. + # Newer one's only use GCC_PATH=. Convert old to new here. + cp -p "${GCC_ENV_D}/${CC_COMP}" "${GCC_ENV_D}/${CC_COMP}.gcc-config-ref" || return 1 + GCC_PATH=$( + unset GCC_PATH PATH ROOTPATH + source "${GCC_ENV_D}/${CC_COMP}" + echo ${GCC_PATH:-${PATH:-${ROOTPATH}}} + ) + ${SED} -i \ + -e '/^PATH=/d' \ + -e '/^ROOTPATH=/d' \ + -e '/^GCC_PATH=/d' \ + "${GCC_ENV_D}/${CC_COMP}" || return 1 + echo "GCC_PATH=\"${GCC_PATH}\"" >> "${GCC_ENV_D}/${CC_COMP}" || return 1 + touch -r "${GCC_ENV_D}/${CC_COMP}.gcc-config-ref" "${GCC_ENV_D}/${CC_COMP}" || return 1 + rm -f "${GCC_ENV_D}/${CC_COMP}.gcc-config-ref" || return 1 + return 0 +} + +update_wrappers() { + local CTARGET=$1 + + # Find the bin wrapper + local wrapper + for wrapper in ${GENTOO_LIBDIR} lib lib64 lib32 lib ; do + wrapper="${ROOT}usr/${wrapper}/misc/gcc-config" + [[ -e ${wrapper} ]] && break + done + + # Update the wrappers for this profile. We maintain this list + # by hand as the tools that are available can come & go if the + # user re-emerges gcc with dif USE flags. We need to clean out + # the old wrappers if the functionality no longer exists. + # XXX: Future work: save the list of wrappers we generated in + # the generated env.d file so we can scrub things better. + # After that, we can use a dynamic list based on what tools are + # actually available in ${GCC_PATH}/. + for x in {,${CTARGET}-}{cpp,cc,gcc,c++,g++,f77,g77,gcj,gcjh,gcov,gdc,gdmd,gfortran,gccgo} ; do + # Obviously don't want to touch native stuff for cross-compilers + [[ ${x} != ${CTARGET}-* ]] && is_cross_compiler && continue + + # Make sure we have no stale wrappers + rm -f "${ROOT}/usr/bin/${x}" + [[ ${x:${#x}-3} == "gcc" || ${x:${#x}-3} == "g++" ]] \ + && rm -f "${ROOT}/usr/bin/${x}"{32,64} + + # Only install a wrapper if the binary exists ... + # We want to figure out the 'reference file' for each + # wrapper (the binary we're 'wrapping') so that we can + # sync mtimes together. This makes things like ccache + # happy. See Bug #70548 for more info. + local ref + case ${x} in + cc) ref=gcc;; + f77) ref=g77;; + *) ref=${x};; + esac + ref="${ROOT}/${GCC_PATH}/${ref}" + if [[ -x ${ref} ]] ; then + cp -f "${wrapper}" "${ROOT}/usr/bin/${x}" + touch -r "${ref}" "${ROOT}/usr/bin/${x}" + fi + done + # legacy cruft, make sure we dont leave it laying around #143205 + rm -f "${ROOT}/usr/bin/${CTARGET}-cc" + + # install the canonical cpp wrapper + [[ ${CTARGET} == *-solaris* ]] && return 0 + if ! is_cross_compiler ; then + cp -f "${wrapper}" "${ROOT}/lib/cpp" + touch -r "${ROOT}/usr/bin/${CTARGET}-cpp" "${ROOT}/lib/cpp" + fi +} + +mv_if_diff() { + if cmp -s "$1" "$2" ; then + rm -f "$1" + return 0 + else + mv -f "$1" "$2" + return 1 + fi +} + +switch_profile() { + local MY_LDPATH= + local GCC_PROFILES= + local OLD_CC_COMP= + local GCC_PATH= + + [[ $(id -u) != "0" ]] && die_eerror "Must be root" + + if is_cross_compiler ; then + ebegin "Switching cross-compiler to ${CC_COMP}" + else + ebegin "Switching native-compiler to ${CC_COMP}" + fi + + if egrep -q '^(PATH|ROOTPATH)=' "${GCC_ENV_D}/${CC_COMP}" ; then + convert_profile_paths "${GCC_ENV_D}/${CC_COMP}" || return 1 + fi + source_var GCC_PATH "${GCC_ENV_D}/${CC_COMP}" + + # Setup things properly again for this profile + unset GCC_SPECS LDPATH + source "${GCC_ENV_D}/${CC_COMP}" + # Ignore active profile errors here since we're switching away + OLD_CC_COMP=$(get_current_profile 2>/dev/null) + + # GCC_SPECS have long been stable, and people messing with + # them know better than to install bad paths, so don't bother + # with sanity checks. + local envd="${ENV_D}/05gcc-${CTARGET}" + cat <<-EOF > "${envd}.tmp" + PATH="${GCC_PATH}" + ROOTPATH="${GCC_PATH}" + GCC_SPECS="${GCC_SPECS}" + EOF + echo "CURRENT=${CC_COMP}" > "${GCC_ENV_D}/config-${CTARGET}" + if ! is_cross_compiler ; then + # Order our profiles to have the default first ... + # We do this so that we can have them ordered with default + # first in /etc/ld.so.conf, as the logical is that all + # compilers for default CHOST will be used to compile stuff, + # and thus we want all their lib paths in /etc/ld.so.conf ... + get_real_chost + MY_LDPATH=$(${SED} -n \ + -e '/^LDPATH=/{s|LDPATH=||;s|"||g;s|:|\n|g;p}' \ + "${GCC_ENV_D}"/${REAL_CHOST}-* \ + "${GCC_ENV_D}"/${CC_COMP} | tac + ) + + # Pass all by default + awk '!/^(STDCXX_INCDIR|LDPATH|CC|CXX|CTARGET|GCCBITS|GCC_SPECS|GCC_PATH)=/ {print $0}' \ + "${GCC_ENV_D}/${CC_COMP}" >> "${envd}.tmp" + if [[ -d ${ROOT}/etc/ld.so.conf.d ]] ; then + echo "${MY_LDPATH}" > "${ROOT}"/etc/ld.so.conf.d/05gcc-${CTARGET}.conf + else + echo "LDPATH=\"${MY_LDPATH}\"" >> "${envd}.tmp" + fi + + # Punt old files; maybe globs too much, but oh well + rm -f \ + "${GCC_ENV_D}/NATIVE" "${GCC_ENV_D}/.NATIVE" \ + "${ENV_D}/05gcc" "${GCC_ENV_D}/config" \ + "${ENV_D}/05gcc-${CTARGET}"-* "${GCC_ENV_D}/config-${CTARGET}"-* + + # Help out the gcc wrapper + ln -sf ${CC_COMP} "${GCC_ENV_D}/.NATIVE" + + + # Relocate random crap + if [[ -e ${ROOT}/usr/${GENTOO_LIBDIR}/pkgconfig/libgcj-${CC_COMP_VERSION}.pc ]] ; then + local mver=${CC_COMP_VERSION:0:3} + for x in "" "-${mver}" ; do + x="${ROOT}/usr/lib/pkgconfig/libgcj${x}.pc" + rm -f "${x}" + ln -s libgcj-${CC_COMP_VERSION}.pc "${x}" + done + fi + + # We need to make sure that libgcc_s.so / libunwind.so make it into /lib. + # On many systems (x86/amd64/etc...), this will probably never matter, + # but on other systems (arm/mips/etc...), this is quite critical. + # http://bugs.gentoo.org/60190 + # + # The funky move magic is required for proper updating of in-use files. + # + # Need to cut out extra paths in multilib case and pray the first path + # is the "root" multilib path ... maybe some day change this to use + # `gcc -print-file-name` ... + LDPATH=${LDPATH%%:*} + for multilib in $("${ROOT}/${GCC_PATH}"/gcc -print-multi-lib); do + multiarg=${multilib#*;} + multiarg=${multiarg/@/-} + multilibdir=${multilib%;*} + libdir="lib/"$("${ROOT}/${GCC_PATH}"/gcc ${multiarg} -print-multi-os-directory) + if mkdir -p "${ROOT}/${libdir}"/.gcc.config.new ; then + for gcclib in gcc_s unwind ; do + if [[ -n $(ls "${ROOT}/${LDPATH}/${multilibdir}"/lib${gcclib}.so.* 2>/dev/null) ]]; then + cp -pP "${ROOT}/${LDPATH}/${multilibdir}"/lib${gcclib}.so.* "${ROOT}/${libdir}"/.gcc.config.new/ + # no need to sanity remove this as the `mv` should take + # care of it. we also need this step to be completly atomic + # for systems that have even `mv` linked against libgcc_s.so. + # http://bugs.gentoo.org/150257 + #rm -f "${ROOT}/${libdir}"/lib${gcclib}.so* + mv -f "${ROOT}/${libdir}"/.gcc.config.new/* "${ROOT}/${libdir}"/ + fi + done + rmdir "${ROOT}/${libdir}"/.gcc.config.new + fi + done + unset multilib + unset multilibdir + unset multiarg + unset libdir + fi + mv_if_diff "${envd}.tmp" "${envd}" + local envd_changed=$? + + update_wrappers ${CTARGET} + + if [[ ${ROOT} == "/" ]] && \ + [[ ${OLD_CC_COMP} != ${CC_COMP} || ${FORCE} == "yes" ]] && \ + [[ ${envd_changed} -eq 1 ]] + then + # in case python is broken ... + if ! env-update ; then + echo "" + ewarn "env-update failed to work properly; making sure ld.so.conf paths" + ewarn "are setup properly. Please rerun gcc-config with the -f option." + echo "" + if [[ ! -d /etc/ld.so.conf.d ]] ; then + show_var LDPATH "${ROOT}"/etc/env.d/05gcc-${CTARGET} \ + | sed -e 's|:|\n|g' >> /etc/ld.so.conf + fi + ldconfig + fi + else + envd_changed=0 + fi + + eend 0 + + if [[ ${envd_changed} -ne 0 ]] ; then + echo + ewarn "If you intend to use the gcc from the new profile in an already" + ewarn "running shell, please remember to do:" + echo + ewarn " . /etc/profile" + echo + fi + + return 0 +} + +get_current_profile() { + local conf="${GCC_ENV_D}/config-${CTARGET}" + if [[ ! -f ${conf} ]] ; then + conf="${GCC_ENV_D}/config" # old name + elif [[ -n ${CC_COMP} ]] && is_cross_compiler ; then + conf="${conf}-${CC_COMP}" + fi + + if [[ ! -f ${conf} ]] ; then + eerror "${argv0}: No gcc profile is active!" + return 1 + fi + + source_var CURRENT "${conf}" + + if [[ -z ${CURRENT} ]] ; then + eerror "${argv0}: No gcc profile is active!" + return 1 + elif [[ ! -f ${GCC_ENV_D}/${CURRENT} ]] ; then + eerror "${argv0}: Active gcc profile is invalid!" + return 1 + fi + + echo "${CURRENT}" + + return 0 +} + +list_profiles() { + local i=0 + local filter= + + if [[ ${ROOT} != "/" ]] ; then + echo "Using gcc-config info in ${ROOT}" + fi + + if [[ ! -f ${GCC_ENV_D}/config-${CTARGET} ]] ; then + if ! is_cross_compiler && [[ -e ${GCC_ENV_D}/config ]] ; then + [[ -w ${GCC_ENV_D}/config ]] && mv ${GCC_ENV_D}/config ${GCC_ENV_D}/config-${CTARGET} + else + # get_current_profile already warns + #eerror "${argv0}: No gcc profile is active; please select one!" + filter=${CTARGET} + fi + fi + + source_var CURRENT "${GCC_ENV_D}"/config-${CTARGET} + CURRENT_NATIVE=${CURRENT} + local target= + for x in "${GCC_ENV_D}"/* ; do + [[ -f ${x} ]] || continue + [[ ${x} == */config* ]] && continue + + source_var CTARGET "${x}" + + ((++i)) + + [[ -n ${filter} ]] && [[ ${filter} != ${CTARGET} ]] && continue + + if [[ ${target} != ${CTARGET} ]] ; then + [[ ${i} -gt 1 ]] && echo + target=${CTARGET} + CTARGET="" + fi + + x=${x##*/} + if [[ ${x} == ${CURRENT_NATIVE} ]] ; then + x="${x} ${GOOD}*${NORMAL}" + elif [[ -e ${GCC_ENV_D}/config-${target} ]] ; then + source "${GCC_ENV_D}/config-${target}" + [[ ${x} == ${CURRENT} ]] && x="${x} ${HILITE}*${NORMAL}" + fi + echo " [${i}] ${x}" + done +} + +print_environ() { + local GCC_PATH= + local ENV_CMD= + local SET_ELEMENT= + + source_var GCC_PATH "${GCC_ENV_D}/${CC_COMP}" "${PATH}" + + case ${SHELL} in + */csh|*/tcsh) + ENV_CMD="setenv" + SET_ELEMENT=" " + ;; + *) + ENV_CMD="export" + SET_ELEMENT="=" + ;; + esac + + ( + PATH=${GCC_PATH}:${PATH} + for var in PATH GCC_SPECS ; do + echo "${ENV_CMD} ${var}${SET_ELEMENT}\"${!var}\"" + done + ) +} + +get_bin_path() { show_var GCC_PATH "${GCC_ENV_D}/${CC_COMP}" ; } +get_lib_path() { show_var LDPATH "${GCC_ENV_D}/${CC_COMP}" ; } + +split_gcc_ver() { + # Split up the gcc profile into components: + # TARGET-VER[-specs] -> TARGET VER [specs] + # arm-linux-3.3.6 -> arm-linux 3.3.6 + # x86_64-linux-4.0.1-pre1234 -> x86_64-linux 4.0.1-pre1234 + # sh-linux-3.4.4-hardened -> sh-linux 3.4.4 hardened + # + # So below we will start at the end and run a small state machine ... + # specs [3] + # accept everything + # specs -> version transition [3->2] + # when we find a version component + # version [2] + # accept only version components (see the regex) + # version -> target transition [2->1] + # when we hit a non version component + # target [1] + # accept everything we have left + # + echo "$@" | awk -F- ' + function pushit(onme, pushee) { + return (onme == "" ? pushee : pushee"-"onme); + } + { + state=3 + targ="" + ver="" + spec="" + for (i=NF; i > 0; --i) { + if (state >= 2) { + if ($i ~ /^(alpha|beta|pre|rc|p)?[[:digit:].]+$/) { + ver=pushit(ver, $i) + state=2 + } else if (state == 3) + spec=pushit(spec, $i) + else + state=1 + } + if (state == 1) + targ = pushit(targ, $i) + } + + if (targ == "") { + if (ver == "") { + ver=spec + spec="" + } + targ=ver + ver="" + } + print targ " " ver (spec != "" ? " " spec : "") + }' +} +chop_gcc_ver_spec() { + local splitTED=$(split_gcc_ver $@) # target ver spec + splitTED=${splitTED#* } # ver spec + echo ${splitTED/ /-} # ver-spec +} + +SET_X=false +NEED_ACTION="yes" +DOIT="switch_profile" +CHECK_CHOST="no" +FORCE="no" + +CC_COMP= +ENV_D="${ROOT}etc/env.d" +GCC_ENV_D="${ENV_D}/gcc" + +for x in "$@" ; do + case "${x}" in + # Only use specified compiler if one is not already selected. + -O|--use-old) + : ${CTARGET:=$(try_real_hard_to_find_CHOST)} + if get_current_profile &>/dev/null ; then + CC_COMP=$(get_current_profile) + else + die_eerror "No profile selected, unable to utilize --use-old" + fi + ;; + -f|--force) + FORCE="yes" + ;; + -P|--use-portage-chost) + CHECK_CHOST="yes" + ;; + -c|--get-current-profile) + if [[ ${NEED_ACTION} == "yes" ]] ; then + NEED_ACTION="no" + DOIT="get_current_profile" + fi + ;; + -l|--list-profiles) + if [[ ${NEED_ACTION} == "yes" ]] ; then + NEED_ACTION="no" + DOIT="list_profiles" + fi + ;; + -S|--split-profile) + if [[ ( $1 != "-S" && $1 != "--split-profile" ) || $# -eq 1 ]] ; then + usage 1 + fi + shift # push -S out + for x in "$@" ; do + split_gcc_ver ${x} + done + exit 0 + ;; + -E|--print-environ) + if [[ ${NEED_ACTION} == "yes" ]] ; then + NEED_ACTION="no" + DOIT="print_environ" + fi + ;; + -B|--get-bin-path) + if [[ ${NEED_ACTION} == "yes" ]] ; then + NEED_ACTION="no" + DOIT="get_bin_path" + fi + ;; + -L|--get-lib-path) + if [[ ${NEED_ACTION} == "yes" ]] ; then + NEED_ACTION="no" + DOIT="get_lib_path" + fi + ;; + -x|--debug) + SET_X=true + ;; + -C|--nocolor) + # nothing to do; functions.sh parsed this for us + ;; + -h|--help) + usage 0 + ;; + -V|--version) + unset RCSfile Revision Date + rcsfile="$RCSfile: gcc-config-1.5,v $" + rcsfile=${rcsfile#: } + rcsfile=${rcsfile%,v*} + cvsrev="$Revision: 1.7 $" + cvsrev=${cvsrev#: } + cvsdate="$Date: 2011/12/07 05:42:19 $" + cvsdate=${cvsdate#: } + echo "${rcsfile} (r${cvsrev% *} @ ${cvsdate% *})" + exit 0 + ;; + -*) + die_eerror "Invalid switch! Run ${argv0} without parameters for help." + ;; + *) + ${SET_X} && set -x + if [[ -z ${CC_COMP} ]] ; then + if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then + # User gave us a # representing the profile + i=1 + for y in "${GCC_ENV_D}"/* ; do + [[ -f ${y} ]] || continue + [[ ${y} == */config* ]] && continue + + if [[ -f ${y} ]] && [[ ${x} == ${i} ]] ; then + CC_COMP=${y##*/} + break + fi + ((++i)) + done + if [[ -z ${CC_COMP} ]] ; then + die_eerror "Could not locate profile #$x !" + fi + else + # User gave us a full HOST-gccver + x=${x##*/} + if [[ ${DOIT} == "get_current_profile" && -z $(ls "${GCC_ENV_D}"/${x}-* 2>/dev/null) ]] || \ + [[ ${DOIT} != "get_current_profile" && ! -f ${GCC_ENV_D}/${x} ]] + then + # Maybe they just gave us a gccver ... + get_real_chost + if [[ -f ${GCC_ENV_D}/${REAL_CHOST}-${x} ]] ; then + x=${REAL_CHOST}-${x} + else + die_eerror "Could not locate '$x' in '${GCC_ENV_D}/' !" + fi + fi + CC_COMP=${x} + fi + else + die_eerror "Too many arguments! Run ${argv0} without parameters for help." + fi + ;; + esac +done + +${SET_X} && set -x + +if [[ ${DOIT} == "switch_profile" ]] && [[ -z ${CC_COMP} ]] ; then + usage 1 +fi + +get_real_chost +[[ ${DOIT} == "get_current_profile" ]] \ + && : ${CTARGET:=${CC_COMP:-${REAL_CHOST}}} \ + || : ${CTARGET:=${REAL_CHOST}} + +if [[ -z ${CC_COMP} ]] ; then + CC_COMP=$(get_current_profile) + if [[ $? -ne 0 ]] ; then + echo "${CC_COMP}" + list_profiles + exit 1 + fi +fi + +if [[ ${DOIT} != "get_current_profile" ]] ; then + GCC_LIB=$( + show_var LDPATH "${GCC_ENV_D}/${CC_COMP}" | \ + awk -F/ '{ print "/"$2"/"$3"/"$4"/" }' + ) + + CC_COMP_VERSION=$(chop_gcc_ver_spec ${CC_COMP}) + CC_COMP_TARGET=${CC_COMP%-${CC_COMP_VERSION}*} + + if [[ ! -d ${ROOT}/${GCC_LIB}/${CC_COMP_TARGET}/${CC_COMP_VERSION} ]]; then + CC_COMP_VERSION=${CC_COMP_VERSION%-*} + fi + + if [[ ! -d ${ROOT}/${GCC_LIB}/${CC_COMP_TARGET}/${CC_COMP_VERSION} ]] || \ + [[ ! -f ${GCC_ENV_D}/${CC_COMP} ]] + then + eerror "${argv0}: Profile does not exist or invalid setting for ${GCC_ENV_D}/${CC_COMP}" 1>&2 + #exit 1 + fi +fi + +if [[ ${CHECK_CHOST} == "yes" ]] ; then + # Chosen CHOST are not the same as the real CHOST according to + # make.conf, and --use-portage-chost option was given, so do nothing + get_real_chost + CC_COMP_VERSION=$(chop_gcc_ver_spec ${CC_COMP}) + CC_COMP_TARGET=${CC_COMP:0:${#CC_COMP}-${#CC_COMP_VERSION}-1} + [[ ${CC_COMP_TARGET} != ${REAL_CHOST} ]] && exit 0 +fi + +${DOIT} + +# vim:ts=4 diff --git a/sys-devel/gcc-config/files/gcc-config-1.5.1 b/sys-devel/gcc-config/files/gcc-config-1.5.1 new file mode 100755 index 00000000..e295ce3c --- /dev/null +++ b/sys-devel/gcc-config/files/gcc-config-1.5.1 @@ -0,0 +1,763 @@ +#!/bin/bash +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.5.1,v 1.2 2012/03/15 01:16:44 vapier Exp $ + +# Format of /etc/env.d/gcc/: +# config-TARGET: CURRENT=version for TARGET +# TARGET-VER: has a TARGET and VER variable + +: ${ROOT:=/} +[[ ${ROOT} != */ ]] && ROOT="${ROOT}/" +[[ ${ROOT} != /* ]] && ROOT="${PWD}${ROOT}" + +cd / + +trap ":" INT QUIT TSTP + +argv0=${0##*/} +source /etc/init.d/functions.sh || { + echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2 + exit 1 +} +esyslog() { :; } +umask 022 + +die_eerror() { + eerror "${argv0}: $*" + exit 1 +} + +# *BSD are plain stupid ... copy a GNU extension but don't just copy it, +# change it so it works differently. Wish Darwin did selective evolution +# on software developers. +SED=$(type -P gsed) +: ${SED:=$(type -P sed)} + +# Further pain: `tac` is not available everywhere #390179 +if ! type -P tac >/dev/null ; then + tac() { ${SED} -e '1!G;h;$!d' "$@" ; } +fi + +GENTOO_LIBDIR="@GENTOO_LIBDIR@" +[[ ${GENTOO_LIBDIR} == @*@ ]] && GENTOO_LIBDIR="lib" + +usage() { +cat << "USAGE_END" +Usage: gcc-config [options] [CC Profile] +Change the current cc/gcc profile, or give info about profiles. + +Options: + -C, --nocolor Disable color output + -O, --use-old Use the old profile if one was selected. + -f, --force Make sure all config files are regenerated. + -P, --use-portage-chost Only set to given profile if its CHOST is the + same as that set in /etc/portage/make.conf + (or one of other portage config files...). + -c, --get-current-profile Print current used gcc profile. + -l, --list-profiles Print a list of available profiles. + -S, --split-profile Split profiles into their components + -E, --print-environ Print environment that can be used to setup the + current gcc profile, or a specified one. + -B, --get-bin-path Print path where binaries of the given/current + profile are located. + -L, --get-lib-path Print path where libraries of the given/current + profile are located. + +Profile names are of the form: - +For example: i686-pc-linux-gnu-3.2.1 +USAGE_END + exit ${1:-1} +} +[[ $# -lt 1 ]] && usage 1 + +# Usage: source_var [default value] +source_var() { + unset $1 + local val=$(source "$2"; echo "${!1}") + : ${val:=$3} + eval $1=\"${val}\" +} +show_var() { + source_var "$@" + echo "${!1}" +} + +try_real_hard_to_find_CHOST() { + # + # First we read make.conf + # + + local varname=${1:-CHOST} + local conf=${ROOT}/etc/portage/make.conf + if [[ ! -e ${conf} && -e ${ROOT}/etc/make.conf ]] ; then + conf=${ROOT}/etc/make.conf + fi + local ret=$(source "${conf}" 2>/dev/null ; echo ${!varname}) + if [[ -z ${ret} ]] ; then + # newer portage supports spaces between the var and = + # CHOST = "this-is-retarded" + ret=$(eval $( + sed -n \ + -e 's:[[:space:]]::g' \ + -e "/^${varname}=/p" \ + "${conf}" + ) ; echo ${!varname} + ) + fi + + if [[ -n ${ret} ]] ; then + echo ${ret} + return 0 + fi + + # + # Then we try /etc/env.d/gcc/config-${CTARGET} + # + if [[ -s ${ROOT}/etc/env.d/gcc/config-${CTARGET} ]] ; then + ret=$(split_gcc_ver $(show_var CURRENT "${ROOT}"/etc/env.d/gcc/config-${CTARGET})) + echo ${ret% *} + fi +} + +get_real_chost() { + [[ -n ${REAL_CHOST} ]] && return 0 + + # shortcut for switching compilers in a cross chroot + if [[ -n ${CHOST} && ${ROOT} != "/" ]] ; then + REAL_CHOST=${CHOST} + return 0 + fi + + # make sure portage isnt broken + if python -V &>/dev/null ; then + export REAL_CHOST=$(env -i portageq envvar CHOST 2>/dev/null) + else + ewarn "Python seems to be broken, attempting to locate CHOST ourselves ..." + export REAL_CHOST=$(try_real_hard_to_find_CHOST) + fi + + if [[ -z ${REAL_CHOST} ]] ; then + eerror "${argv0}: Could not get portage CHOST!" + eerror "${argv0}: You should verify that CHOST is set in one of these places:" + eerror "${argv0}: - ${ROOT}/etc/portage/make.conf" + eerror "${argv0}: - active environment" + exit 1 + fi +} + +is_cross_compiler() { + get_real_chost + [[ ${CC_COMP/${REAL_CHOST}} == ${CC_COMP} ]] +} + +convert_profile_paths() { + # Older gcc's used PATH= and ROOTPATH= in the env.d files. + # Newer one's only use GCC_PATH=. Convert old to new here. + cp -p "${GCC_ENV_D}/${CC_COMP}" "${GCC_ENV_D}/${CC_COMP}.gcc-config-ref" || return 1 + GCC_PATH=$( + unset GCC_PATH PATH ROOTPATH + source "${GCC_ENV_D}/${CC_COMP}" + echo ${GCC_PATH:-${PATH:-${ROOTPATH}}} + ) + ${SED} -i \ + -e '/^PATH=/d' \ + -e '/^ROOTPATH=/d' \ + -e '/^GCC_PATH=/d' \ + "${GCC_ENV_D}/${CC_COMP}" || return 1 + echo "GCC_PATH=\"${GCC_PATH}\"" >> "${GCC_ENV_D}/${CC_COMP}" || return 1 + touch -r "${GCC_ENV_D}/${CC_COMP}.gcc-config-ref" "${GCC_ENV_D}/${CC_COMP}" || return 1 + rm -f "${GCC_ENV_D}/${CC_COMP}.gcc-config-ref" || return 1 + return 0 +} + +update_wrappers() { + local CTARGET=$1 + + # Find the bin wrapper + local wrapper + for wrapper in ${GENTOO_LIBDIR} lib lib64 lib32 lib ; do + wrapper="${ROOT}usr/${wrapper}/misc/gcc-config" + [[ -e ${wrapper} ]] && break + done + + # Update the wrappers for this profile. We maintain this list + # by hand as the tools that are available can come & go if the + # user re-emerges gcc with dif USE flags. We need to clean out + # the old wrappers if the functionality no longer exists. + # XXX: Future work: save the list of wrappers we generated in + # the generated env.d file so we can scrub things better. + # After that, we can use a dynamic list based on what tools are + # actually available in ${GCC_PATH}/. + for x in {,${CTARGET}-}{cpp,cc,gcc,c++,g++,f77,g77,gcj,gcjh,gcov,gdc,gdmd,gfortran,gccgo} ; do + # Obviously don't want to touch native stuff for cross-compilers + [[ ${x} != ${CTARGET}-* ]] && is_cross_compiler && continue + + # Make sure we have no stale wrappers + rm -f "${ROOT}/usr/bin/${x}" + [[ ${x:${#x}-3} == "gcc" || ${x:${#x}-3} == "g++" ]] \ + && rm -f "${ROOT}/usr/bin/${x}"{32,64} + + # Only install a wrapper if the binary exists ... + # We want to figure out the 'reference file' for each + # wrapper (the binary we're 'wrapping') so that we can + # sync mtimes together. This makes things like ccache + # happy. See Bug #70548 for more info. + local ref + case ${x} in + cc) ref=gcc;; + f77) ref=g77;; + *) ref=${x};; + esac + ref="${ROOT}/${GCC_PATH}/${ref}" + if [[ -x ${ref} ]] ; then + cp -f "${wrapper}" "${ROOT}/usr/bin/${x}" + touch -r "${ref}" "${ROOT}/usr/bin/${x}" + fi + done + # legacy cruft, make sure we dont leave it laying around #143205 + rm -f "${ROOT}/usr/bin/${CTARGET}-cc" + + # install the canonical cpp wrapper + [[ ${CTARGET} == *-solaris* ]] && return 0 + if ! is_cross_compiler ; then + cp -f "${wrapper}" "${ROOT}/lib/cpp" + touch -r "${ROOT}/usr/bin/${CTARGET}-cpp" "${ROOT}/lib/cpp" + fi +} + +mv_if_diff() { + if cmp -s "$1" "$2" ; then + rm -f "$1" + return 0 + else + mv -f "$1" "$2" + return 1 + fi +} + +switch_profile() { + local GCC_PROFILES= + local OLD_CC_COMP= + local GCC_PATH= + + [[ $(id -u) != "0" ]] && die_eerror "Must be root" + + if is_cross_compiler ; then + ebegin "Switching cross-compiler to ${CC_COMP}" + else + ebegin "Switching native-compiler to ${CC_COMP}" + fi + + if egrep -q '^(PATH|ROOTPATH)=' "${GCC_ENV_D}/${CC_COMP}" ; then + convert_profile_paths "${GCC_ENV_D}/${CC_COMP}" || return 1 + fi + source_var GCC_PATH "${GCC_ENV_D}/${CC_COMP}" + + # Setup things properly again for this profile + unset GCC_SPECS LDPATH + source "${GCC_ENV_D}/${CC_COMP}" + # Ignore active profile errors here since we're switching away + OLD_CC_COMP=$(get_current_profile 2>/dev/null) + + # GCC_SPECS have long been stable, and people messing with + # them know better than to install bad paths, so don't bother + # with sanity checks. + local envd="${ENV_D}/05gcc-${CTARGET}" + cat <<-EOF > "${envd}.tmp" + PATH="${GCC_PATH}" + ROOTPATH="${GCC_PATH}" + GCC_SPECS="${GCC_SPECS}" + EOF + echo "CURRENT=${CC_COMP}" > "${GCC_ENV_D}/config-${CTARGET}" + if ! is_cross_compiler ; then + # Regardless of the profile selected, keep the runtime lookup + # paths stable. Otherwise, all the apps that were built with + # a new compiler will start trying to use older versions of + # the libs, and life gets sad. We work off the assumption + # that every shared library gcc ships is ABI compatible (as + # is the point of SONAMEs). We don't have to worry about + # static libraries here as gcc itself will take care of + # linking against its own internal paths first. #297685 + local MY_LDPATH + get_real_chost + MY_LDPATH=$(${SED} -n \ + -e '/^LDPATH=/{s|LDPATH=||;s|"||g;s|:|\n|g;p}' \ + "${GCC_ENV_D}"/${REAL_CHOST}-* | tac + ) + + # Pass all by default + awk '!/^(STDCXX_INCDIR|LDPATH|CC|CXX|CTARGET|GCCBITS|GCC_SPECS|GCC_PATH)=/ {print $0}' \ + "${GCC_ENV_D}/${CC_COMP}" >> "${envd}.tmp" + if [[ -d ${ROOT}/etc/ld.so.conf.d ]] ; then + echo "${MY_LDPATH}" > "${ROOT}"/etc/ld.so.conf.d/05gcc-${CTARGET}.conf + else + echo "LDPATH=\"${MY_LDPATH}\"" >> "${envd}.tmp" + fi + + # Punt old files; maybe globs too much, but oh well + rm -f \ + "${GCC_ENV_D}/NATIVE" "${GCC_ENV_D}/.NATIVE" \ + "${ENV_D}/05gcc" "${GCC_ENV_D}/config" \ + "${ENV_D}/05gcc-${CTARGET}"-* "${GCC_ENV_D}/config-${CTARGET}"-* + + # Help out the gcc wrapper + ln -sf ${CC_COMP} "${GCC_ENV_D}/.NATIVE" + + # Relocate random crap + if [[ -e ${ROOT}/usr/${GENTOO_LIBDIR}/pkgconfig/libgcj-${CC_COMP_VERSION}.pc ]] ; then + local mver=${CC_COMP_VERSION:0:3} + for x in "" "-${mver}" ; do + x="${ROOT}/usr/lib/pkgconfig/libgcj${x}.pc" + rm -f "${x}" + ln -s libgcj-${CC_COMP_VERSION}.pc "${x}" + done + fi + + # We need to make sure that libgcc_s.so / libunwind.so make it into /lib. + # On many systems (x86/amd64/etc...), this will probably never matter, + # but on other systems (arm/mips/etc...), this is quite critical. + # http://bugs.gentoo.org/60190 + # + # The funky move magic is required for proper updating of in-use files. + # + # XXX: This fails when configuring the native target in a cross-compiled + # ROOT. Only way around that is to store the multilib configuration + # in the gcc profile when we compiled it and then read that instead + # of executing the gcc. Some day. + # + # We use the same ordering logic as mentioned in the MY_LDPATH setup. + # We get the libs from the latest version available. + local LATEST_GCC_PATH gcc LATEST_GCC_LDPATH + + LATEST_GCC_PATH=$(gawk -F= ' + $1 == "GCC_PATH" { + p = gensub("\"","","g",$2) + } + END { print p } + ' "${GCC_ENV_D}"/${REAL_CHOST}-* + ) + gcc="${ROOT}${LATEST_GCC_PATH}/gcc" + + local multilib + for multilib in $("${gcc}" -print-multi-lib); do + local multiarg=${multilib#*;} + multiarg=${multiarg/@/-} + local multilibdir=${multilib%;*} + local libdir="${ROOT}lib/"$("${gcc}" ${multiarg} -print-multi-os-directory) + + mkdir -p "${libdir}"/.gcc.config.new || continue # !?!?! + + local gcclib + for gcclib in gcc_s unwind ; do + # This assumes that we always have the .so symlink, + # but for now, that should be safe ... + gcclib=$("${gcc}" -print-file-name="lib${gcclib}.so") + if [[ ${gcclib} == */* ]] ; then + cp -pP "${ROOT}${gcclib}".* "${libdir}"/.gcc.config.new/ + # no need to sanity remove this as the `mv` should take + # care of it. we also need this step to be completly atomic + # for systems that have even `mv` linked against libgcc_s.so. + # http://bugs.gentoo.org/150257 + #rm -f "${libdir}"/lib${gcclib}.so* + mv -f "${libdir}"/.gcc.config.new/* "${libdir}"/ + fi + done + rmdir "${libdir}"/.gcc.config.new + done + fi + mv_if_diff "${envd}.tmp" "${envd}" + local envd_changed=$? + + update_wrappers ${CTARGET} + + if [[ ${ROOT} == "/" ]] && \ + [[ ${OLD_CC_COMP} != ${CC_COMP} || ${FORCE} == "yes" ]] && \ + [[ ${envd_changed} -eq 1 ]] + then + # in case python is broken ... + if ! env-update ; then + echo "" + ewarn "env-update failed to work properly; making sure ld.so.conf paths" + ewarn "are setup properly. Please rerun gcc-config with the -f option." + echo "" + if [[ ! -d /etc/ld.so.conf.d ]] ; then + show_var LDPATH "${ROOT}"/etc/env.d/05gcc-${CTARGET} \ + | sed -e 's|:|\n|g' >> /etc/ld.so.conf + fi + ldconfig + fi + else + envd_changed=0 + fi + + eend 0 + + if [[ ${envd_changed} -ne 0 ]] ; then + echo + ewarn "If you intend to use the gcc from the new profile in an already" + ewarn "running shell, please remember to do:" + echo + ewarn " . /etc/profile" + echo + fi + + return 0 +} + +get_current_profile() { + local conf="${GCC_ENV_D}/config-${CTARGET}" + if [[ ! -f ${conf} ]] ; then + conf="${GCC_ENV_D}/config" # old name + elif [[ -n ${CC_COMP} ]] && is_cross_compiler ; then + conf="${conf}-${CC_COMP}" + fi + + if [[ ! -f ${conf} ]] ; then + eerror "${argv0}: No gcc profile is active!" + return 1 + fi + + source_var CURRENT "${conf}" + + if [[ -z ${CURRENT} ]] ; then + eerror "${argv0}: No gcc profile is active!" + return 1 + elif [[ ! -f ${GCC_ENV_D}/${CURRENT} ]] ; then + eerror "${argv0}: Active gcc profile is invalid!" + return 1 + fi + + echo "${CURRENT}" + + return 0 +} + +list_profiles() { + local i=0 + local filter= + + if [[ ${ROOT} != "/" ]] ; then + echo "Using gcc-config info in ${ROOT}" + fi + + if [[ ! -f ${GCC_ENV_D}/config-${CTARGET} ]] ; then + if ! is_cross_compiler && [[ -e ${GCC_ENV_D}/config ]] ; then + [[ -w ${GCC_ENV_D}/config ]] && mv ${GCC_ENV_D}/config ${GCC_ENV_D}/config-${CTARGET} + else + # get_current_profile already warns + #eerror "${argv0}: No gcc profile is active; please select one!" + filter=${CTARGET} + fi + fi + + source_var CURRENT "${GCC_ENV_D}"/config-${CTARGET} + CURRENT_NATIVE=${CURRENT} + local target= + for x in "${GCC_ENV_D}"/* ; do + [[ -f ${x} ]] || continue + [[ ${x} == */config* ]] && continue + + source_var CTARGET "${x}" + + ((++i)) + + [[ -n ${filter} ]] && [[ ${filter} != ${CTARGET} ]] && continue + + if [[ ${target} != ${CTARGET} ]] ; then + [[ ${i} -gt 1 ]] && echo + target=${CTARGET} + CTARGET="" + fi + + x=${x##*/} + if [[ ${x} == ${CURRENT_NATIVE} ]] ; then + x="${x} ${GOOD}*${NORMAL}" + elif [[ -e ${GCC_ENV_D}/config-${target} ]] ; then + source "${GCC_ENV_D}/config-${target}" + [[ ${x} == ${CURRENT} ]] && x="${x} ${HILITE}*${NORMAL}" + fi + echo " [${i}] ${x}" + done +} + +print_environ() { + local ENV_CMD SET_ELEMENT + case ${SHELL} in + */csh|*/tcsh) + ENV_CMD="setenv" + SET_ELEMENT=" " + ;; + *) + ENV_CMD="export" + SET_ELEMENT="=" + ;; + esac + + local var + for var in GCC_SPECS GCC_PATH ; do + local ${var} + source_var ${var} "${GCC_ENV_D}/${CC_COMP}" + done + + ( + [[ -n ${GCC_PATH} ]] && PATH=${GCC_PATH}:${PATH} + for var in PATH GCC_SPECS ; do + echo "${ENV_CMD} ${var}${SET_ELEMENT}\"${!var}\"" + done + ) +} + +get_bin_path() { show_var GCC_PATH "${GCC_ENV_D}/${CC_COMP}" ; } +get_lib_path() { show_var LDPATH "${GCC_ENV_D}/${CC_COMP}" ; } + +split_gcc_ver() { + # Split up the gcc profile into components: + # TARGET-VER[-specs] -> TARGET VER [specs] + # arm-linux-3.3.6 -> arm-linux 3.3.6 + # x86_64-linux-4.0.1-pre1234 -> x86_64-linux 4.0.1-pre1234 + # sh-linux-3.4.4-hardened -> sh-linux 3.4.4 hardened + # + # So below we will start at the end and run a small state machine ... + # specs [3] + # accept everything + # specs -> version transition [3->2] + # when we find a version component + # version [2] + # accept only version components (see the regex) + # version -> target transition [2->1] + # when we hit a non version component + # target [1] + # accept everything we have left + # + echo "$@" | awk -F- ' + function pushit(onme, pushee) { + return (onme == "" ? pushee : pushee"-"onme); + } + { + state=3 + targ="" + ver="" + spec="" + for (i=NF; i > 0; --i) { + if (state >= 2) { + if ($i ~ /^(alpha|beta|pre|rc|p)?[[:digit:].]+$/) { + ver=pushit(ver, $i) + state=2 + } else if (state == 3) + spec=pushit(spec, $i) + else + state=1 + } + if (state == 1) + targ = pushit(targ, $i) + } + + if (targ == "") { + if (ver == "") { + ver=spec + spec="" + } + targ=ver + ver="" + } + print targ " " ver (spec != "" ? " " spec : "") + }' +} +chop_gcc_ver_spec() { + local splitTED=$(split_gcc_ver "$@") # target ver spec + splitTED=${splitTED#* } # ver spec + echo ${splitTED/ /-} # ver-spec +} + +SET_X=false +NEED_ACTION="yes" +DOIT="switch_profile" +CHECK_CHOST="no" +FORCE="no" + +CC_COMP= +ENV_D="${ROOT}etc/env.d" +GCC_ENV_D="${ENV_D}/gcc" + +for x in "$@" ; do + case "${x}" in + # Only use specified compiler if one is not already selected. + -O|--use-old) + : ${CTARGET:=$(try_real_hard_to_find_CHOST)} + if get_current_profile &>/dev/null ; then + CC_COMP=$(get_current_profile) + else + die_eerror "No profile selected, unable to utilize --use-old" + fi + ;; + -f|--force) + FORCE="yes" + ;; + -P|--use-portage-chost) + CHECK_CHOST="yes" + ;; + -c|--get-current-profile) + if [[ ${NEED_ACTION} == "yes" ]] ; then + NEED_ACTION="no" + DOIT="get_current_profile" + fi + ;; + -l|--list-profiles) + if [[ ${NEED_ACTION} == "yes" ]] ; then + NEED_ACTION="no" + DOIT="list_profiles" + fi + ;; + -S|--split-profile) + if [[ ( $1 != "-S" && $1 != "--split-profile" ) || $# -eq 1 ]] ; then + usage 1 + fi + shift # push -S out + for x in "$@" ; do + split_gcc_ver ${x} + done + exit 0 + ;; + -E|--print-environ) + if [[ ${NEED_ACTION} == "yes" ]] ; then + NEED_ACTION="no" + DOIT="print_environ" + fi + ;; + -B|--get-bin-path) + if [[ ${NEED_ACTION} == "yes" ]] ; then + NEED_ACTION="no" + DOIT="get_bin_path" + fi + ;; + -L|--get-lib-path) + if [[ ${NEED_ACTION} == "yes" ]] ; then + NEED_ACTION="no" + DOIT="get_lib_path" + fi + ;; + -x|--debug) + SET_X=true + ;; + -C|--nocolor) + # nothing to do; functions.sh parsed this for us + ;; + -h|--help) + usage 0 + ;; + -V|--version) + unset RCSfile Revision Date + rcsfile="$RCSfile: gcc-config-1.5.1,v $" + rcsfile=${rcsfile#: } + rcsfile=${rcsfile%,v*} + cvsrev="$Revision: 1.2 $" + cvsrev=${cvsrev#: } + cvsdate="$Date: 2012/03/15 01:16:44 $" + cvsdate=${cvsdate#: } + echo "${rcsfile} (r${cvsrev% *} @ ${cvsdate% *})" + exit 0 + ;; + -*) + die_eerror "Invalid switch! Run ${argv0} without parameters for help." + ;; + *) + ${SET_X} && set -x + if [[ -z ${CC_COMP} ]] ; then + if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then + # User gave us a # representing the profile + i=1 + for y in "${GCC_ENV_D}"/* ; do + [[ -f ${y} ]] || continue + [[ ${y} == */config* ]] && continue + + if [[ -f ${y} ]] && [[ ${x} == ${i} ]] ; then + CC_COMP=${y##*/} + break + fi + ((++i)) + done + if [[ -z ${CC_COMP} ]] ; then + die_eerror "Could not locate profile #$x !" + fi + else + # User gave us a full HOST-gccver + x=${x##*/} + if [[ ${DOIT} == "get_current_profile" && -z $(ls "${GCC_ENV_D}"/${x}-* 2>/dev/null) ]] || \ + [[ ${DOIT} != "get_current_profile" && ! -f ${GCC_ENV_D}/${x} ]] + then + # Maybe they just gave us a gccver ... + get_real_chost + if [[ -f ${GCC_ENV_D}/${REAL_CHOST}-${x} ]] ; then + x=${REAL_CHOST}-${x} + else + die_eerror "Could not locate '$x' in '${GCC_ENV_D}/' !" + fi + fi + CC_COMP=${x} + fi + else + die_eerror "Too many arguments! Run ${argv0} without parameters for help." + fi + ;; + esac +done + +${SET_X} && set -x + +if [[ ${DOIT} == "switch_profile" ]] && [[ -z ${CC_COMP} ]] ; then + usage 1 +fi + +get_real_chost +[[ ${DOIT} == "get_current_profile" ]] \ + && : ${CTARGET:=${CC_COMP:-${REAL_CHOST}}} \ + || : ${CTARGET:=${REAL_CHOST}} + +if [[ -z ${CC_COMP} ]] ; then + CC_COMP=$(get_current_profile) + if [[ $? -ne 0 ]] ; then + echo "${CC_COMP}" + list_profiles + exit 1 + fi +fi + +if [[ ${DOIT} != "get_current_profile" ]] ; then + GCC_LIB=$(get_lib_path | awk -F/ '{ print "/"$2"/"$3"/"$4"/" }') + + # For people who insist on using funky version strings ("4.6.x" + # rather than "4.6.2"), allow them to manually specify it. + source_var GCC_VER "${GCC_ENV_D}/${CC_COMP}" + + CC_COMP_VERSION=${GCC_VER:-$(chop_gcc_ver_spec ${CC_COMP})} + CC_COMP_TARGET=$(show_var CTARGET "${GCC_ENV_D}/${CC_COMP}") + if [[ -z ${CC_COMP_TARGET} ]] ; then + # Native configs don't have CTARGET in there. + CC_COMP_TARGET=${CC_COMP%-${CC_COMP_VERSION}*} + fi + + if [[ ! -d ${ROOT}/${GCC_LIB}/${CC_COMP_TARGET}/${CC_COMP_VERSION} ]]; then + CC_COMP_VERSION=${CC_COMP_VERSION%-*} + fi + + if [[ ! -d ${ROOT}/${GCC_LIB}/${CC_COMP_TARGET}/${CC_COMP_VERSION} ]] || \ + [[ ! -f ${GCC_ENV_D}/${CC_COMP} ]] + then + eerror "${argv0}: Profile does not exist or invalid setting for ${GCC_ENV_D}/${CC_COMP}" 1>&2 + #exit 1 + fi +fi + +if [[ ${CHECK_CHOST} == "yes" ]] ; then + # Chosen CHOST are not the same as the real CHOST according to + # make.conf, and --use-portage-chost option was given, so do nothing + get_real_chost + CC_COMP_VERSION=$(chop_gcc_ver_spec ${CC_COMP}) + CC_COMP_TARGET=${CC_COMP:0:${#CC_COMP}-${#CC_COMP_VERSION}-1} + [[ ${CC_COMP_TARGET} != ${REAL_CHOST} ]] && exit 0 +fi + +${DOIT} + +# vim:ts=4 diff --git a/sys-devel/gcc-config/files/gcc-config-systemd.patch b/sys-devel/gcc-config/files/gcc-config-systemd.patch new file mode 100644 index 00000000..dbb7c280 --- /dev/null +++ b/sys-devel/gcc-config/files/gcc-config-systemd.patch @@ -0,0 +1,13 @@ +--- gcc-config-1.7.3.old/gcc-config 2015-03-30 13:34:12.258805571 +0300 ++++ gcc-config-1.7.3/gcc-config 2015-03-30 13:36:14.432808842 +0300 +@@ -15,8 +15,8 @@ + trap ":" INT QUIT TSTP + + argv0=${0##*/} +-source /etc/init.d/functions.sh || { +- echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2 ++source /lib/gentoo/functions.sh || { ++ echo "${argv0}: Could not source /lib/gentoo/functions.sh!" 1>&2 + exit 1 + } + esyslog() { :; } diff --git a/sys-devel/gcc-config/files/wrapper-1.5.1.c b/sys-devel/gcc-config/files/wrapper-1.5.1.c new file mode 100644 index 00000000..055594b5 --- /dev/null +++ b/sys-devel/gcc-config/files/wrapper-1.5.1.c @@ -0,0 +1,372 @@ +/* + * Copyright 1999-2008 Gentoo Foundation + * Distributed under the terms of the GNU General Public License v2 + * $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/wrapper-1.5.1.c,v 1.2 2009/01/02 00:43:32 vapier Exp $ + * Author: Martin Schlemmer + * az's lackey: Mike Frysinger + */ + +#ifdef DEBUG +# define USE_DEBUG 1 +#else +# define USE_DEBUG 0 +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define GCC_CONFIG "/usr/bin/gcc-config" +#define ENVD_BASE "/etc/env.d/05gcc" + +#define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0])) + +/* basename(3) is allowed to modify memory */ +#undef basename +#define basename(path) \ +({ \ + char *__path = path; \ + char *__ret = strrchr(__path, '/'); \ + __ret ? __ret + 1 : __path; \ +}) + +struct wrapper_data { + char *name, *fullname, *bin, *path; +}; + +static const struct { + char *alias; + char *target; +} wrapper_aliases[] = { + { "cc", "gcc" }, + { "f77", "g77" }, +}; + +#define wrapper_warn(fmt, ...) fprintf(stderr, "%s" fmt "\n", "gcc-config: ", ## __VA_ARGS__) +#define wrapper_err(fmt, ...) ({ wrapper_warn("%s" fmt, "error: ", ## __VA_ARGS__); exit(1); }) +#define wrapper_errp(fmt, ...) wrapper_err(fmt ": %s", ## __VA_ARGS__, strerror(errno)) +#define wrapper_dbg(fmt, ...) ({ if (USE_DEBUG) wrapper_warn(fmt, ## __VA_ARGS__); }) + +#define xmemwrap(func, proto, use) \ +static void *x ## func proto \ +{ \ + void *ret = func use; \ + if (!ret) \ + wrapper_err(#func "%s", ": out of memory"); \ + return ret; \ +} +xmemwrap(malloc, (size_t size), (size)) +xmemwrap(calloc, (size_t nemb, size_t size), (nemb, size)) +xmemwrap(strdup, (const char *s), (s)) + +/* check_for_target checks in path for the file we are seeking + * it returns 1 if found (with data->bin setup), 0 if not and + * negative on error + */ +static int check_for_target(char *path, struct wrapper_data *data) +{ + struct stat sbuf; + char str[PATH_MAX + 1]; + size_t path_len = strlen(path); + size_t len = path_len + strlen(data->name) + 2; + + if (sizeof(str) < len) + wrapper_warn("path too long: %s", path); + + strcpy(str, path); + str[path_len] = '/'; + str[path_len+1] = '\0'; + strcat(str, data->name); + + /* Stat possible file to check that + * 1) it exist and is a regular file, and + * 2) it is not the wrapper itself, and + * 3) it is in a /gcc-bin/ directory tree + */ + if (strcmp(str, data->fullname) != 0 && + strstr(str, "/gcc-bin/") != NULL && + stat(str, &sbuf) == 0 && + (S_ISREG(sbuf.st_mode) || S_ISLNK(sbuf.st_mode))) + { + wrapper_dbg("%s: found in %s", data->name, path); + data->bin = xstrdup(str); + return 1; + } + + wrapper_dbg("%s: did not find in %s", data->name, path); + return 0; +} + +static int find_target_in_path(struct wrapper_data *data) +{ + char *token = NULL, *state; + char *str; + + if (data->path == NULL) + return 0; + + /* Make a copy since strtok_r will modify path */ + str = xstrdup(data->path); + + /* Find the first file with suitable name in PATH. The idea here is + * that we do not want to bind ourselfs to something static like the + * default profile, or some odd environment variable, but want to be + * able to build something with a non default gcc by just tweaking + * the PATH ... */ + token = strtok_r(str, ":", &state); + while (token != NULL) { + if (check_for_target(token, data)) + return 1; + token = strtok_r(NULL, ":", &state); + } + + wrapper_dbg("%s: did not find in PATH", data->name); + return 0; +} + +/* find_target_in_envd parses /etc/env.d/05gcc, and tries to + * extract PATH, which is set to the current profile's bin + * directory ... + */ +static int find_target_in_envd(struct wrapper_data *data, int cross_compile) +{ + FILE *envfile = NULL; + char *token = NULL, *state; + char str[PATH_MAX + 1]; + char *strp = str; + char envd_file[PATH_MAX + 1]; + + if (!cross_compile) { + /* for the sake of speed, we'll keep a symlink around for + * the native compiler. #190260 + */ + snprintf(envd_file, sizeof(envd_file)-1, "/etc/env.d/gcc/.NATIVE"); + } else { + char *ctarget, *end = strrchr(data->name, '-'); + if (end == NULL) + return 0; + ctarget = xstrdup(data->name); + ctarget[end - data->name] = '\0'; + snprintf(envd_file, PATH_MAX, "%s-%s", ENVD_BASE, ctarget); + free(ctarget); + } + + envfile = fopen(envd_file, "r"); + if (envfile == NULL) + return 0; + + while (fgets(strp, PATH_MAX, envfile) != NULL) { + /* Keep reading ENVD_FILE until we get a line that + * starts with 'GCC_PATH=' ... keep 'PATH=' around + * for older gcc versions. + */ + if (strncmp(strp, "GCC_PATH=", strlen("GCC_PATH=")) && + strncmp(strp, "PATH=", strlen("PATH="))) + continue; + + token = strtok_r(strp, "=", &state); + if ((token != NULL) && token[0]) + /* The second token should be the value of PATH .. */ + token = strtok_r(NULL, "=", &state); + else + goto bail; + + if ((token != NULL) && token[0]) { + strp = token; + /* A bash variable may be unquoted, quoted with " or + * quoted with ', so extract the value without those .. + */ + token = strtok(strp, "\n\"\'"); + + while (token != NULL) { + if (check_for_target(token, data)) { + fclose(envfile); + return 1; + } + + token = strtok(NULL, "\n\"\'"); + } + } + + strp = str; + } + + bail: + fclose(envfile); + return (cross_compile ? 0 : find_target_in_envd(data, 1)); +} + +static void find_wrapper_target(struct wrapper_data *data) +{ + if (find_target_in_path(data)) + return; + + if (find_target_in_envd(data, 0)) + return; + + /* Only our wrapper is in PATH, so get the CC path using + * gcc-config and execute the real binary in there ... + */ + FILE *inpipe = popen(GCC_CONFIG " --get-bin-path", "r"); + if (inpipe == NULL) + wrapper_errp("could not open pipe"); + + char str[PATH_MAX + 1]; + if (fgets(str, PATH_MAX, inpipe) == 0) + wrapper_errp("could not get compiler binary path"); + + /* chomp! */ + size_t plen = strlen(str); + if (str[plen-1] == '\n') + str[plen-1] = '\0'; + + data->bin = xmalloc(plen + 1 + strlen(data->name) + 1); + sprintf(data->bin, "%s/%s", str, data->name); + + pclose(inpipe); +} + +/* This function modifies PATH to have gcc's bin path appended */ +static void modify_path(struct wrapper_data *data) +{ + char *newpath = NULL, *token = NULL, *state; + char dname_data[PATH_MAX + 1], str[PATH_MAX + 1]; + char *str2 = dname_data, *dname = dname_data; + size_t len = 0; + + if (data->bin == NULL) + return; + + if (data->path == NULL) + return; + + snprintf(str2, PATH_MAX + 1, "%s", data->bin); + + if ((dname = dirname(str2)) == NULL) + return; + + /* Make a copy since strtok_r will modify path */ + snprintf(str, PATH_MAX + 1, "%s", data->path); + + token = strtok_r(str, ":", &state); + + /* Check if we already appended our bin location to PATH */ + if ((token != NULL) && token[0]) + if (!strcmp(token, dname)) + return; + + len = strlen(dname) + strlen(data->path) + 2 + strlen("PATH") + 1; + + newpath = xmalloc(len); + memset(newpath, 0, len); + + snprintf(newpath, len, "PATH=%s:%s", dname, data->path); + putenv(newpath); +} + +static char *abi_flags[] = { + "-m32", "-m64", "-mabi", +}; +static char **build_new_argv(char **argv, const char *newflags_str) +{ +#define MAX_NEWFLAGS 32 + char *newflags[MAX_NEWFLAGS]; + char **retargv; + unsigned int argc, i; + char *state, *flags_tokenized; + + retargv = argv; + + /* make sure user hasn't specified any ABI flags already ... + * if they have, lets just get out of here ... this of course + * is by no means complete, it's merely a hack that works most + * of the time ... + */ + for (argc = 0; argv[argc]; ++argc) + for (i = 0; i < ARRAY_SIZE(abi_flags); ++i) + if (!strncmp(argv[argc], abi_flags[i], strlen(abi_flags[i]))) + return retargv; + + /* Tokenize the flag list and put it into newflags array */ + flags_tokenized = xstrdup(newflags_str); + i = 0; + newflags[i] = strtok_r(flags_tokenized, " \t\n", &state); + while (newflags[i] != NULL && i < MAX_NEWFLAGS-1) + newflags[++i] = strtok_r(NULL, " \t\n", &state); + + /* allocate memory for our spiffy new argv */ + retargv = xcalloc(argc + i + 1, sizeof(char*)); + /* start building retargv */ + retargv[0] = argv[0]; + /* insert the ABI flags first so cmdline always overrides ABI flags */ + memcpy(retargv+1, newflags, i * sizeof(char*)); + /* copy over the old argv */ + if (argc > 1) + memcpy(retargv+1+i, argv+1, (argc-1) * sizeof(char*)); + + return retargv; +} + +int main(int argc, char *argv[]) +{ + struct wrapper_data data; + + memset(&data, 0, sizeof(data)); + + if (getenv("PATH")) + data.path = xstrdup(getenv("PATH")); + + /* What should we find ? */ + data.name = basename(argv[0]); + + /* Allow for common compiler names like cc->gcc */ + size_t i; + for (i = 0; i < ARRAY_SIZE(wrapper_aliases); ++i) + if (!strcmp(data.name, wrapper_aliases[i].alias)) + data.name = wrapper_aliases[i].target; + + /* What is the full name of our wrapper? */ + data.fullname = xmalloc(strlen(data.name) + sizeof("/usr/bin/") + 1); + sprintf(data.fullname, "/usr/bin/%s", data.name); + + find_wrapper_target(&data); + + modify_path(&data); + + free(data.path); + data.path = NULL; + + /* Set argv[0] to the correct binary, else gcc can't find internal headers + * http://bugs.gentoo.org/8132 + */ + argv[0] = data.bin; + + /* If $ABI is in env, add appropriate env flags */ + char **newargv = argv; + if (getenv("ABI")) { + char envvar[50]; + + /* We use CFLAGS_${ABI} for gcc, g++, g77, etc as the flags that would + * be in there are the same no matter which compiler we are using. + */ + snprintf(envvar, sizeof(envvar), "CFLAGS_%s", getenv("ABI")); + envvar[sizeof(envvar)-1] = '\0'; + + if (getenv(envvar)) + newargv = build_new_argv(argv, getenv(envvar)); + } + + /* Ok, lets do it one more time ... */ + execv(data.bin, newargv); + + /* shouldn't have made it here if things worked ... */ + wrapper_err("could not run/locate '%s'", data.name); + + return 123; +} diff --git a/sys-devel/gcc-config/files/wrapper-1.5.2.c b/sys-devel/gcc-config/files/wrapper-1.5.2.c new file mode 100644 index 00000000..ca1e84fb --- /dev/null +++ b/sys-devel/gcc-config/files/wrapper-1.5.2.c @@ -0,0 +1,315 @@ +/* + * Copyright 1999-2011 Gentoo Foundation + * Distributed under the terms of the GNU General Public License v2 + * $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/wrapper-1.5.2.c,v 1.2 2011/06/18 18:46:23 vapier Exp $ + * Author: Martin Schlemmer + * az's lackey: Mike Frysinger + */ + +#ifdef DEBUG +# define USE_DEBUG 1 +#else +# define USE_DEBUG 0 +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define GCC_CONFIG "/usr/bin/gcc-config" +#define ENVD_BASE "/etc/env.d/05gcc" + +#define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0])) + +/* basename(3) is allowed to modify memory */ +#undef basename +#define basename(path) \ +({ \ + char *__path = path; \ + char *__ret = strrchr(__path, '/'); \ + __ret ? __ret + 1 : __path; \ +}) + +struct wrapper_data { + const char *name; + char *fullname, *bin, *path; +}; + +static const struct { + const char *alias; + const char *target; +} wrapper_aliases[] = { + { "cc", "gcc" }, + { "f77", "gfortran" }, + { "f95", "gfortran" }, +}; + +#define wrapper_warn(fmt, ...) fprintf(stderr, "%s" fmt "\n", "gcc-config: ", ## __VA_ARGS__) +#define wrapper_err(fmt, ...) ({ wrapper_warn("%s" fmt, "error: ", ## __VA_ARGS__); exit(1); }) +#define wrapper_errp(fmt, ...) wrapper_err(fmt ": %s", ## __VA_ARGS__, strerror(errno)) +#define wrapper_dbg(fmt, ...) ({ if (USE_DEBUG) wrapper_warn(fmt, ## __VA_ARGS__); }) + +#define xmemwrap(func, proto, use) \ +static void *x ## func proto \ +{ \ + void *ret = func use; \ + if (!ret) \ + wrapper_err(#func "%s", ": out of memory"); \ + return ret; \ +} +xmemwrap(malloc, (size_t size), (size)) +xmemwrap(strdup, (const char *s), (s)) + +/* check_for_target checks in path for the file we are seeking + * it returns 1 if found (with data->bin setup), 0 if not and + * negative on error + */ +static int check_for_target(char *path, struct wrapper_data *data) +{ + struct stat sbuf; + char str[PATH_MAX + 1]; + size_t path_len = strlen(path); + size_t len = path_len + strlen(data->name) + 2; + + if (sizeof(str) < len) + wrapper_warn("path too long: %s", path); + + strcpy(str, path); + str[path_len] = '/'; + str[path_len+1] = '\0'; + strcat(str, data->name); + + /* Stat possible file to check that + * 1) it exist and is a regular file, and + * 2) it is not the wrapper itself, and + * 3) it is in a /gcc-bin/ directory tree + */ + if (strcmp(str, data->fullname) != 0 && + strstr(str, "/gcc-bin/") != NULL && + stat(str, &sbuf) == 0 && + (S_ISREG(sbuf.st_mode) || S_ISLNK(sbuf.st_mode))) + { + wrapper_dbg("%s: found in %s", data->name, path); + data->bin = xstrdup(str); + return 1; + } + + wrapper_dbg("%s: did not find in %s", data->name, path); + return 0; +} + +static int find_target_in_path(struct wrapper_data *data) +{ + char *token = NULL, *state = NULL; + char *str; + + if (data->path == NULL) + return 0; + + /* Make a copy since strtok_r will modify path */ + str = xstrdup(data->path); + + /* Find the first file with suitable name in PATH. The idea here is + * that we do not want to bind ourselfs to something static like the + * default profile, or some odd environment variable, but want to be + * able to build something with a non default gcc by just tweaking + * the PATH ... */ + token = strtok_r(str, ":", &state); + while (token != NULL) { + if (check_for_target(token, data)) + return 1; + token = strtok_r(NULL, ":", &state); + } + + wrapper_dbg("%s: did not find in PATH", data->name); + return 0; +} + +/* find_target_in_envd parses /etc/env.d/05gcc, and tries to + * extract PATH, which is set to the current profile's bin + * directory ... + */ +static int find_target_in_envd(struct wrapper_data *data, int cross_compile) +{ + FILE *envfile = NULL; + char *token = NULL, *state; + char str[PATH_MAX + 1]; + char *strp = str; + char envd_file[PATH_MAX + 1]; + + if (!cross_compile) { + /* for the sake of speed, we'll keep a symlink around for + * the native compiler. #190260 + */ + snprintf(envd_file, sizeof(envd_file)-1, "/etc/env.d/gcc/.NATIVE"); + } else { + char *ctarget, *end = strrchr(data->name, '-'); + if (end == NULL) + return 0; + ctarget = xstrdup(data->name); + ctarget[end - data->name] = '\0'; + snprintf(envd_file, PATH_MAX, "%s-%s", ENVD_BASE, ctarget); + free(ctarget); + } + + envfile = fopen(envd_file, "r"); + if (envfile == NULL) + return 0; + + while (fgets(strp, PATH_MAX, envfile) != NULL) { + /* Keep reading ENVD_FILE until we get a line that + * starts with 'GCC_PATH=' ... keep 'PATH=' around + * for older gcc versions. + */ + if (strncmp(strp, "GCC_PATH=", strlen("GCC_PATH=")) && + strncmp(strp, "PATH=", strlen("PATH="))) + continue; + + token = strtok_r(strp, "=", &state); + if ((token != NULL) && token[0]) + /* The second token should be the value of PATH .. */ + token = strtok_r(NULL, "=", &state); + else + goto bail; + + if ((token != NULL) && token[0]) { + strp = token; + /* A bash variable may be unquoted, quoted with " or + * quoted with ', so extract the value without those .. + */ + token = strtok(strp, "\n\"\'"); + + while (token != NULL) { + if (check_for_target(token, data)) { + fclose(envfile); + return 1; + } + + token = strtok(NULL, "\n\"\'"); + } + } + + strp = str; + } + + bail: + fclose(envfile); + return (cross_compile ? 0 : find_target_in_envd(data, 1)); +} + +static void find_wrapper_target(struct wrapper_data *data) +{ + if (find_target_in_path(data)) + return; + + if (find_target_in_envd(data, 0)) + return; + + /* Only our wrapper is in PATH, so get the CC path using + * gcc-config and execute the real binary in there ... + */ + FILE *inpipe = popen(GCC_CONFIG " --get-bin-path", "r"); + if (inpipe == NULL) + wrapper_errp("could not open pipe"); + + char str[PATH_MAX + 1]; + if (fgets(str, PATH_MAX, inpipe) == 0) + wrapper_errp("could not get compiler binary path"); + + /* chomp! */ + size_t plen = strlen(str); + if (str[plen-1] == '\n') + str[plen-1] = '\0'; + + data->bin = xmalloc(plen + 1 + strlen(data->name) + 1); + sprintf(data->bin, "%s/%s", str, data->name); + + pclose(inpipe); +} + +/* This function modifies PATH to have gcc's bin path appended */ +static void modify_path(struct wrapper_data *data) +{ + char *newpath = NULL, *token = NULL, *state; + char dname_data[PATH_MAX + 1], str[PATH_MAX + 1]; + char *str2 = dname_data, *dname = dname_data; + size_t len = 0; + + if (data->bin == NULL) + return; + + if (data->path == NULL) + return; + + snprintf(str2, PATH_MAX + 1, "%s", data->bin); + + if ((dname = dirname(str2)) == NULL) + return; + + /* Make a copy since strtok_r will modify path */ + snprintf(str, PATH_MAX + 1, "%s", data->path); + + token = strtok_r(str, ":", &state); + + /* Check if we already appended our bin location to PATH */ + if ((token != NULL) && token[0]) + if (!strcmp(token, dname)) + return; + + len = strlen(dname) + strlen(data->path) + 2 + strlen("PATH") + 1; + + newpath = xmalloc(len); + memset(newpath, 0, len); + + snprintf(newpath, len, "PATH=%s:%s", dname, data->path); + putenv(newpath); +} + +int main(int argc, char *argv[]) +{ + struct wrapper_data data; + + memset(&data, 0, sizeof(data)); + + if (getenv("PATH")) + data.path = xstrdup(getenv("PATH")); + + /* What should we find ? */ + data.name = basename(argv[0]); + + /* Allow for common compiler names like cc->gcc */ + size_t i; + for (i = 0; i < ARRAY_SIZE(wrapper_aliases); ++i) + if (!strcmp(data.name, wrapper_aliases[i].alias)) + data.name = wrapper_aliases[i].target; + + /* What is the full name of our wrapper? */ + data.fullname = xmalloc(strlen(data.name) + sizeof("/usr/bin/") + 1); + sprintf(data.fullname, "/usr/bin/%s", data.name); + + find_wrapper_target(&data); + + modify_path(&data); + + free(data.path); + data.path = NULL; + + /* Set argv[0] to the correct binary, else gcc can't find internal headers + * http://bugs.gentoo.org/8132 + */ + argv[0] = data.bin; + + /* Ok, lets do it one more time ... */ + execv(data.bin, argv); + + /* shouldn't have made it here if things worked ... */ + wrapper_err("could not run/locate '%s'", data.name); + + return 123; +} diff --git a/sys-devel/gcc-config/gcc-config-1.4.1-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.4.1-r1.ebuild new file mode 100644 index 00000000..6d2ddbe8 --- /dev/null +++ b/sys-devel/gcc-config/gcc-config-1.4.1-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.4.1-r1.ebuild,v 1.1 2011/04/28 23:27:02 halcy0n Exp $ + +inherit flag-o-matic toolchain-funcs multilib + +# Version of .c wrapper to use +W_VER="1.5.1" + +DESCRIPTION="Utility to change the gcc compiler being used" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +IUSE="" + +RDEPEND="!app-admin/eselect-compiler" + +S=${WORKDIR} + +src_unpack() { + cp "${FILESDIR}"/wrapper-${W_VER}.c "${S}"/wrapper.c || die +} + +src_compile() { + strip-flags + emake CC="$(tc-getCC)" wrapper || die "compile wrapper" +} + +src_install() { + newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die "install gcc-config" + sed -i \ + -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" \ + "${D}"/usr/bin/${PN} + + exeinto /usr/$(get_libdir)/misc + newexe wrapper gcc-config || die "install wrapper" +} + +pkg_postinst() { + # Scrub eselect-compiler remains + if [[ -e ${ROOT}/etc/env.d/05compiler ]] ; then + rm -f "${ROOT}"/etc/env.d/05compiler + fi + + # Make sure old versions dont exist #79062 + rm -f "${ROOT}"/usr/sbin/gcc-config + + # Do we have a valid multi ver setup ? + if gcc-config --get-current-profile &>/dev/null ; then + # We not longer use the /usr/include/g++-v3 hacks, as + # it is not needed ... + [[ -L ${ROOT}/usr/include/g++ ]] && rm -f "${ROOT}"/usr/include/g++ + [[ -L ${ROOT}/usr/include/g++-v3 ]] && rm -f "${ROOT}"/usr/include/g++-v3 + gcc-config $(/usr/bin/gcc-config --get-current-profile) + fi +} diff --git a/sys-devel/gcc-config/gcc-config-1.5-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.5-r1.ebuild new file mode 100644 index 00000000..78e5571f --- /dev/null +++ b/sys-devel/gcc-config/gcc-config-1.5-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.5-r1.ebuild,v 1.3 2011/11/11 12:15:40 aballier Exp $ + +inherit flag-o-matic toolchain-funcs multilib + +# Version of .c wrapper to use +W_VER="1.5.2" + +DESCRIPTION="Utility to change the gcc compiler being used" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -sparc-fbsd -x86-fbsd" +IUSE="" + +RDEPEND="!app-admin/eselect-compiler" + +S=${WORKDIR} + +src_unpack() { + cp "${FILESDIR}"/wrapper-${W_VER}.c "${S}"/wrapper.c || die +} + +src_compile() { + strip-flags + emake CC="$(tc-getCC)" wrapper || die "compile wrapper" +} + +src_install() { + newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die "install gcc-config" + sed -i \ + -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" \ + "${D}"/usr/bin/${PN} + + exeinto /usr/$(get_libdir)/misc + newexe wrapper gcc-config || die "install wrapper" +} + +pkg_postinst() { + # Scrub eselect-compiler remains + if [[ -e ${ROOT}/etc/env.d/05compiler ]] ; then + rm -f "${ROOT}"/etc/env.d/05compiler + fi + + # Make sure old versions dont exist #79062 + rm -f "${ROOT}"/usr/sbin/gcc-config + + # We not longer use the /usr/include/g++-v3 hacks, as + # it is not needed ... + [[ -L ${ROOT}/usr/include/g++ ]] && rm -f "${ROOT}"/usr/include/g++ + [[ -L ${ROOT}/usr/include/g++-v3 ]] && rm -f "${ROOT}"/usr/include/g++-v3 + + # Do we have a valid multi ver setup ? + local x + for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do + gcc-config ${x} + done +} diff --git a/sys-devel/gcc-config/gcc-config-1.5-r2.ebuild b/sys-devel/gcc-config/gcc-config-1.5-r2.ebuild new file mode 100644 index 00000000..06204ce3 --- /dev/null +++ b/sys-devel/gcc-config/gcc-config-1.5-r2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.5-r2.ebuild,v 1.7 2012/03/15 15:45:05 vapier Exp $ + +inherit flag-o-matic toolchain-funcs multilib + +# Version of .c wrapper to use +W_VER="1.5.2" + +DESCRIPTION="Utility to change the gcc compiler being used" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND="!app-admin/eselect-compiler" + +S=${WORKDIR} + +src_unpack() { + cp "${FILESDIR}"/wrapper-${W_VER}.c "${S}"/wrapper.c || die +} + +src_compile() { + strip-flags + emake CC="$(tc-getCC)" wrapper || die "compile wrapper" +} + +src_install() { + newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die "install gcc-config" + sed -i \ + -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" \ + "${D}"/usr/bin/${PN} + + exeinto /usr/$(get_libdir)/misc + newexe wrapper gcc-config || die "install wrapper" +} + +pkg_postinst() { + # Scrub eselect-compiler remains + if [[ -e ${ROOT}/etc/env.d/05compiler ]] ; then + rm -f "${ROOT}"/etc/env.d/05compiler + fi + + # Make sure old versions dont exist #79062 + rm -f "${ROOT}"/usr/sbin/gcc-config + + # We not longer use the /usr/include/g++-v3 hacks, as + # it is not needed ... + [[ -L ${ROOT}/usr/include/g++ ]] && rm -f "${ROOT}"/usr/include/g++ + [[ -L ${ROOT}/usr/include/g++-v3 ]] && rm -f "${ROOT}"/usr/include/g++-v3 + + # Do we have a valid multi ver setup ? + local x + for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do + gcc-config ${x} + done +} diff --git a/sys-devel/gcc-config/gcc-config-1.5.1-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.5.1-r1.ebuild new file mode 100644 index 00000000..05d202db --- /dev/null +++ b/sys-devel/gcc-config/gcc-config-1.5.1-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.5.1-r1.ebuild,v 1.1 2012/03/15 01:16:44 vapier Exp $ + +inherit flag-o-matic toolchain-funcs multilib + +# Version of .c wrapper to use +W_VER="1.5.2" + +DESCRIPTION="Utility to change the gcc compiler being used" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND="!app-admin/eselect-compiler" + +S=${WORKDIR} + +src_unpack() { + cp "${FILESDIR}"/wrapper-${W_VER}.c "${S}"/wrapper.c || die +} + +src_compile() { + strip-flags + emake CC="$(tc-getCC)" wrapper || die "compile wrapper" +} + +src_install() { + newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die "install gcc-config" + sed -i \ + -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" \ + "${D}"/usr/bin/${PN} + + exeinto /usr/$(get_libdir)/misc + newexe wrapper gcc-config || die "install wrapper" +} + +pkg_postinst() { + # Scrub eselect-compiler remains + if [[ -e ${ROOT}/etc/env.d/05compiler ]] ; then + rm -f "${ROOT}"/etc/env.d/05compiler + fi + + # Make sure old versions dont exist #79062 + rm -f "${ROOT}"/usr/sbin/gcc-config + + # We not longer use the /usr/include/g++-v3 hacks, as + # it is not needed ... + [[ -L ${ROOT}/usr/include/g++ ]] && rm -f "${ROOT}"/usr/include/g++ + [[ -L ${ROOT}/usr/include/g++-v3 ]] && rm -f "${ROOT}"/usr/include/g++-v3 + + # Do we have a valid multi ver setup ? + local x + for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do + gcc-config ${x} + done +} diff --git a/sys-devel/gcc-config/gcc-config-1.5.1.ebuild b/sys-devel/gcc-config/gcc-config-1.5.1.ebuild new file mode 100644 index 00000000..4b044254 --- /dev/null +++ b/sys-devel/gcc-config/gcc-config-1.5.1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.5.1.ebuild,v 1.1 2012/02/29 20:16:56 vapier Exp $ + +inherit flag-o-matic toolchain-funcs multilib + +# Version of .c wrapper to use +W_VER="1.5.2" + +DESCRIPTION="Utility to change the gcc compiler being used" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="" + +RDEPEND="!app-admin/eselect-compiler" + +S=${WORKDIR} + +src_unpack() { + cp "${FILESDIR}"/wrapper-${W_VER}.c "${S}"/wrapper.c || die +} + +src_compile() { + strip-flags + emake CC="$(tc-getCC)" wrapper || die "compile wrapper" +} + +src_install() { + newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die "install gcc-config" + sed -i \ + -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" \ + "${D}"/usr/bin/${PN} + + exeinto /usr/$(get_libdir)/misc + newexe wrapper gcc-config || die "install wrapper" +} + +pkg_postinst() { + # Scrub eselect-compiler remains + if [[ -e ${ROOT}/etc/env.d/05compiler ]] ; then + rm -f "${ROOT}"/etc/env.d/05compiler + fi + + # Make sure old versions dont exist #79062 + rm -f "${ROOT}"/usr/sbin/gcc-config + + # We not longer use the /usr/include/g++-v3 hacks, as + # it is not needed ... + [[ -L ${ROOT}/usr/include/g++ ]] && rm -f "${ROOT}"/usr/include/g++ + [[ -L ${ROOT}/usr/include/g++-v3 ]] && rm -f "${ROOT}"/usr/include/g++-v3 + + # Do we have a valid multi ver setup ? + local x + for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do + gcc-config ${x} + done +} diff --git a/sys-devel/gcc-config/gcc-config-1.6.ebuild b/sys-devel/gcc-config/gcc-config-1.6.ebuild new file mode 100644 index 00000000..02af6f60 --- /dev/null +++ b/sys-devel/gcc-config/gcc-config-1.6.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.6.ebuild,v 1.9 2012/07/08 15:39:00 armin76 Exp $ + +inherit unpacker toolchain-funcs multilib + +DESCRIPTION="utility to manage compilers" +HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git" +SRC_URI="mirror://gentoo/${P}.tar.xz + http://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="" + +src_compile() { + emake CC="$(tc-getCC)" || die +} + +src_install() { + emake \ + DESTDIR="${D}" \ + PV="${PV}" \ + SUBLIBDIR="$(get_libdir)" \ + install || die +} + +pkg_postinst() { + # Scrub eselect-compiler remains + rm -f "${ROOT}"/etc/env.d/05compiler & + + # Make sure old versions dont exist #79062 + rm -f "${ROOT}"/usr/sbin/gcc-config & + + # We not longer use the /usr/include/g++-v3 hacks, as + # it is not needed ... + rm -f "${ROOT}"/usr/include/g++{,-v3} & + + # Do we have a valid multi ver setup ? + local x + for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do + gcc-config ${x} + done + + wait +} diff --git a/sys-devel/gcc-config/gcc-config-1.7.1.ebuild b/sys-devel/gcc-config/gcc-config-1.7.1.ebuild new file mode 100644 index 00000000..7205d5e6 --- /dev/null +++ b/sys-devel/gcc-config/gcc-config-1.7.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.7.1.ebuild,v 1.1 2012/05/13 20:14:06 vapier Exp $ + +inherit unpacker toolchain-funcs multilib + +DESCRIPTION="utility to manage compilers" +HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git" +SRC_URI="mirror://gentoo/${P}.tar.xz + http://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="" + +src_compile() { + emake CC="$(tc-getCC)" || die +} + +src_install() { + emake \ + DESTDIR="${D}" \ + PV="${PV}" \ + SUBLIBDIR="$(get_libdir)" \ + install || die +} + +pkg_postinst() { + # Scrub eselect-compiler remains + rm -f "${ROOT}"/etc/env.d/05compiler & + + # Make sure old versions dont exist #79062 + rm -f "${ROOT}"/usr/sbin/gcc-config & + + # We not longer use the /usr/include/g++-v3 hacks, as + # it is not needed ... + rm -f "${ROOT}"/usr/include/g++{,-v3} & + + # Do we have a valid multi ver setup ? + local x + for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do + gcc-config ${x} + done + + wait +} diff --git a/sys-devel/gcc-config/gcc-config-1.7.2.ebuild b/sys-devel/gcc-config/gcc-config-1.7.2.ebuild new file mode 100644 index 00000000..bed819c2 --- /dev/null +++ b/sys-devel/gcc-config/gcc-config-1.7.2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.7.2.ebuild,v 1.1 2012/05/31 04:32:38 vapier Exp $ + +inherit unpacker toolchain-funcs multilib + +DESCRIPTION="utility to manage compilers" +HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git" +SRC_URI="mirror://gentoo/${P}.tar.xz + http://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="" + +src_compile() { + emake CC="$(tc-getCC)" || die +} + +src_install() { + emake \ + DESTDIR="${D}" \ + PV="${PV}" \ + SUBLIBDIR="$(get_libdir)" \ + install || die +} + +pkg_postinst() { + # Scrub eselect-compiler remains + rm -f "${ROOT}"/etc/env.d/05compiler & + + # Make sure old versions dont exist #79062 + rm -f "${ROOT}"/usr/sbin/gcc-config & + + # We not longer use the /usr/include/g++-v3 hacks, as + # it is not needed ... + rm -f "${ROOT}"/usr/include/g++{,-v3} & + + # Do we have a valid multi ver setup ? + local x + for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do + gcc-config ${x} + done + + wait +} diff --git a/sys-devel/gcc-config/gcc-config-1.7.3.ebuild b/sys-devel/gcc-config/gcc-config-1.7.3.ebuild new file mode 100644 index 00000000..35deb293 --- /dev/null +++ b/sys-devel/gcc-config/gcc-config-1.7.3.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.7.3.ebuild,v 1.8 2014/01/18 03:08:29 vapier Exp $ + +inherit unpacker toolchain-funcs multilib eutils + +DESCRIPTION="utility to manage compilers" +HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git" +SRC_URI="mirror://gentoo/${P}.tar.xz + http://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="" + +src_compile() { + epatch ${FILESDIR}/${PN}-systemd.patch + emake CC="$(tc-getCC)" || die +} + +src_install() { + emake \ + DESTDIR="${D}" \ + PV="${PV}" \ + SUBLIBDIR="$(get_libdir)" \ + install || die +} + +pkg_postinst() { + # Scrub eselect-compiler remains + rm -f "${ROOT}"/etc/env.d/05compiler & + + # Make sure old versions dont exist #79062 + rm -f "${ROOT}"/usr/sbin/gcc-config & + + # We not longer use the /usr/include/g++-v3 hacks, as + # it is not needed ... + rm -f "${ROOT}"/usr/include/g++{,-v3} & + + # Do we have a valid multi ver setup ? + local x + for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do + gcc-config ${x} + done + + wait +} diff --git a/sys-devel/gcc-config/gcc-config-1.7.ebuild b/sys-devel/gcc-config/gcc-config-1.7.ebuild new file mode 100644 index 00000000..5a525d0c --- /dev/null +++ b/sys-devel/gcc-config/gcc-config-1.7.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.7.ebuild,v 1.2 2012/04/26 12:30:41 aballier Exp $ + +inherit unpacker toolchain-funcs multilib + +DESCRIPTION="utility to manage compilers" +HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git" +SRC_URI="mirror://gentoo/${P}.tar.xz + http://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="" + +src_compile() { + emake CC="$(tc-getCC)" || die +} + +src_install() { + emake \ + DESTDIR="${D}" \ + PV="${PV}" \ + SUBLIBDIR="$(get_libdir)" \ + install || die +} + +pkg_postinst() { + # Scrub eselect-compiler remains + rm -f "${ROOT}"/etc/env.d/05compiler & + + # Make sure old versions dont exist #79062 + rm -f "${ROOT}"/usr/sbin/gcc-config & + + # We not longer use the /usr/include/g++-v3 hacks, as + # it is not needed ... + rm -f "${ROOT}"/usr/include/g++{,-v3} & + + # Do we have a valid multi ver setup ? + local x + for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do + gcc-config ${x} + done + + wait +} diff --git a/sys-devel/gcc-config/gcc-config-1.8.ebuild b/sys-devel/gcc-config/gcc-config-1.8.ebuild new file mode 100644 index 00000000..84ed5032 --- /dev/null +++ b/sys-devel/gcc-config/gcc-config-1.8.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.8.ebuild,v 1.2 2014/01/18 03:08:29 vapier Exp $ + +inherit unpacker toolchain-funcs multilib + +DESCRIPTION="utility to manage compilers" +HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git" +SRC_URI="mirror://gentoo/${P}.tar.xz + http://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="" + +src_compile() { + emake CC="$(tc-getCC)" || die +} + +src_install() { + emake \ + DESTDIR="${D}" \ + PV="${PV}" \ + SUBLIBDIR="$(get_libdir)" \ + install || die +} + +pkg_postinst() { + # Scrub eselect-compiler remains + rm -f "${ROOT}"/etc/env.d/05compiler & + + # Make sure old versions dont exist #79062 + rm -f "${ROOT}"/usr/sbin/gcc-config & + + # We not longer use the /usr/include/g++-v3 hacks, as + # it is not needed ... + rm -f "${ROOT}"/usr/include/g++{,-v3} & + + # Do we have a valid multi ver setup ? + local x + for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do + gcc-config ${x} + done + + wait +} diff --git a/sys-devel/gcc-config/metadata.xml b/sys-devel/gcc-config/metadata.xml new file mode 100644 index 00000000..fb4199eb --- /dev/null +++ b/sys-devel/gcc-config/metadata.xml @@ -0,0 +1,5 @@ + + + +toolchain + -- cgit v1.2.3 From ae84cd5a880c78b91246cd982df544338d92ab2a Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Fri, 3 Apr 2015 17:47:53 +0300 Subject: [app-emulation/playonlinux] new version --- app-emulation/playonlinux/Manifest | 10 +- app-emulation/playonlinux/playonlinux-4.2.6.ebuild | 133 +++++++++++++++++++++ 2 files changed, 135 insertions(+), 8 deletions(-) create mode 100644 app-emulation/playonlinux/playonlinux-4.2.6.ebuild diff --git a/app-emulation/playonlinux/Manifest b/app-emulation/playonlinux/Manifest index e40c46f4..5698820c 100644 --- a/app-emulation/playonlinux/Manifest +++ b/app-emulation/playonlinux/Manifest @@ -6,11 +6,5 @@ DIST PlayOnLinux_4.1.5.tar.gz 3994564 SHA256 8a01cbb39bf6bae6d763bcf561bd8231eb4 DIST PlayOnLinux_4.1.6.tar.gz 3994906 SHA256 e245d7b2f8255df21c3866cab45d2445b5759da6066e9c29b6b92cb4b0d2997c SHA512 a8a150d80b0c4eeb56809286b9f71360aaebca9a7ce7ad5d81fb4cd47e8c889dcdfaaa4d9b3fd0448541248e53b7c9103c49f2cf71346cd9ad2b3a054fac1983 WHIRLPOOL aa7977224ad3a55da79f4a0054c716b8916c5b76ab005341519021ea6d498857fc5a501f9a54309ee84ef7f47acc63a6de0801e415e61dcc870da7c3a2cf1bfe DIST PlayOnLinux_4.1.8.tar.gz 4001263 SHA256 da7c5a92f19e3d72f393979a37b8c7ac7104765081c092ffeb855190742b2ec3 SHA512 027ff8adfc7bc9392c4353fbbf36f3b7adb2e0d64f550abca00d3f77d5b8fa387fce4965aa48f147b0492ba07a79f2271a5ab4b05f501752f9d8b94e3016ce43 WHIRLPOOL 1abe6b84da2455f06706f41bcd4e6c3f6f504a26e8eb8891d876fcb118825e51ee0fcf4043c63248869c78875e79f8732f38bd7a7c581d1d3ca7465dc7f0d56b DIST PlayOnLinux_4.2.1.tar.gz 4308243 SHA256 c6e6622afc502cbd89f0d274055282c6a4d696273f167a76acba76a04e9cb0bb SHA512 ece0987275862530665eaeaa37b20ea3a14e367c19399c6024c55130dd7bc29200c5459ab72b42d2f410355793bf2166348aecb691f8179191ccac57217f9ba7 WHIRLPOOL 834f375aa1b8daf2e738368c48bd75d9a78931f6379c5184632061a8f50a1d89c91d69f317b51856489621ca14701ce38a32a3631737cb2b33453e001d2ea9e8 -EBUILD playonlinux-4.1.0.ebuild 3250 SHA256 7f08256fa84270ac721f5480c77cf645db95b70dac6872f73dd991815f53e5f9 SHA512 5ab56ff5a2aaf980d3a78d603c0bf6bbf5659cf13feb4a6e56ee51e88a44a53a39cc37c732e03bf08a6f7d2212ef7ae270351ccaa3f285efee091f894ded2a9c WHIRLPOOL 141266ff3f00ffd4b508cd29107a1a30dce67ebf24d240624a46b85322a42e08b6e2e8f7165568fb3645b3f7eb9ee558a2a6ad33434706e61deb39b8cda6b9f8 -EBUILD playonlinux-4.1.1.ebuild 3250 SHA256 7f08256fa84270ac721f5480c77cf645db95b70dac6872f73dd991815f53e5f9 SHA512 5ab56ff5a2aaf980d3a78d603c0bf6bbf5659cf13feb4a6e56ee51e88a44a53a39cc37c732e03bf08a6f7d2212ef7ae270351ccaa3f285efee091f894ded2a9c WHIRLPOOL 141266ff3f00ffd4b508cd29107a1a30dce67ebf24d240624a46b85322a42e08b6e2e8f7165568fb3645b3f7eb9ee558a2a6ad33434706e61deb39b8cda6b9f8 -EBUILD playonlinux-4.1.3.ebuild 3165 SHA256 26c7cd150609af528a8d920a21c588c705528d48b405c47e5184b8d4204ffab7 SHA512 6bcceb8a486fa7039e85078e8a4918720bb409edbe270d068b3c0f0d9dba748a0c428d01f34e96721a8b83c915bd3c17648ddb939b43d9b389179b834816ecae WHIRLPOOL 15832b55cfab3d64a9adff219937a1f7360f5bd3ebd58aa8730a42dcf398112980e7a1f4f95bc8a14ca97cb3acb0c2a9585ddd26da66aae49a8921621f3fc9dd -EBUILD playonlinux-4.1.4.ebuild 3165 SHA256 26c7cd150609af528a8d920a21c588c705528d48b405c47e5184b8d4204ffab7 SHA512 6bcceb8a486fa7039e85078e8a4918720bb409edbe270d068b3c0f0d9dba748a0c428d01f34e96721a8b83c915bd3c17648ddb939b43d9b389179b834816ecae WHIRLPOOL 15832b55cfab3d64a9adff219937a1f7360f5bd3ebd58aa8730a42dcf398112980e7a1f4f95bc8a14ca97cb3acb0c2a9585ddd26da66aae49a8921621f3fc9dd -EBUILD playonlinux-4.1.5.ebuild 3165 SHA256 26c7cd150609af528a8d920a21c588c705528d48b405c47e5184b8d4204ffab7 SHA512 6bcceb8a486fa7039e85078e8a4918720bb409edbe270d068b3c0f0d9dba748a0c428d01f34e96721a8b83c915bd3c17648ddb939b43d9b389179b834816ecae WHIRLPOOL 15832b55cfab3d64a9adff219937a1f7360f5bd3ebd58aa8730a42dcf398112980e7a1f4f95bc8a14ca97cb3acb0c2a9585ddd26da66aae49a8921621f3fc9dd -EBUILD playonlinux-4.1.6.ebuild 3877 SHA256 e87178cc076c52394f9d0f4d57043fd9092d31a4565acba067aa2be21b149dca SHA512 2b8e6c4052520c7945fb44bdd33ece1a81779a90d750f1e80c25aea2ffadfb9ca1aaac163a49fcce3dd1e6a407bb9128fc633d244be46ee289c8e1ccb1dae8f4 WHIRLPOOL ed2cad5a6222dc50e985af091a1acada23010482095d5878ad98ef386c069ed8e21ac8da16dd298a1b36f70be5b75397042ed5c4a18411ed6b1b157f8c2ba15b -EBUILD playonlinux-4.1.8.ebuild 3899 SHA256 b075d953c378b16af80ca7e048a1334d0754a71b40cdee0acf363444f86fd848 SHA512 0b4e8ef6ec8e77b99befb28e7befa79f5e426c3da038206abdb624c13ff3daaa8c77b50f13d178973a45f634b7bbc4dffce5e65a69be28132a9127142dd94974 WHIRLPOOL e950e7f5e17333adb6dddf158780055d31909c70b404a1aef8d271c6c917bfe70d2c35cdd589d1148535fcc15a12ca6973848376a5b451c4d83c8977e074cdb2 -EBUILD playonlinux-4.2.1.ebuild 3899 SHA256 b075d953c378b16af80ca7e048a1334d0754a71b40cdee0acf363444f86fd848 SHA512 0b4e8ef6ec8e77b99befb28e7befa79f5e426c3da038206abdb624c13ff3daaa8c77b50f13d178973a45f634b7bbc4dffce5e65a69be28132a9127142dd94974 WHIRLPOOL e950e7f5e17333adb6dddf158780055d31909c70b404a1aef8d271c6c917bfe70d2c35cdd589d1148535fcc15a12ca6973848376a5b451c4d83c8977e074cdb2 +DIST PlayOnLinux_4.2.5.tar.gz 4690660 SHA256 9fa13e5aa56a5327b1b8ce1bfe77147814a052ac762fbaa9d27c51616db4b097 SHA512 5773ec5a915e4ab968f261a17b0c9cc2e452c244f0e8137fc219e3b4d5e37f0f4e2709888870f786a9adc8647bd939da2f17977aebe1d455e0fdac3aaa73eca1 WHIRLPOOL 51adbc5aa1e2234d4be40742cf2161d4cfe6fdfe9f79f7aae03d74ba6f84ccad9a178ae7c77315ba84963fe7e7cbce0dfa34a512b96c99cbef260d2832d43989 +DIST PlayOnLinux_4.2.6.tar.gz 3202517 SHA256 34fc06ce55f889673529a405d17ffc045a68cc998a679377056ed63988dd64e2 SHA512 41c4af5335874020f6405f460a0b9787f7dcfb77790661ff254d2af7ff107a94020b75a8b4f1856f1e4b866e63dee49d5823edf4867d64cd20c41b17387f5490 WHIRLPOOL 4278cc00c76abfeecb87d125046a977c69d5e62b751481ffa5ed4ca4a911507bc6b650bd8648cc7b4cd794e7f0c9e91197adc3854c963770bd87a535d83ab562 diff --git a/app-emulation/playonlinux/playonlinux-4.2.6.ebuild b/app-emulation/playonlinux/playonlinux-4.2.6.ebuild new file mode 100644 index 00000000..abb687f7 --- /dev/null +++ b/app-emulation/playonlinux/playonlinux-4.2.6.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/playonlinux-4.1.1.ebuild,v 1.1 2012/06/16 19:12:24 pacho Exp $ + +EAPI="4" +PYTHON_DEPEND="2" + +inherit eutils python games + +MY_PN="PlayOnLinux" + +DESCRIPTION="Set of scripts to easily install and use Windows games and software" +HOMEPAGE="http://playonlinux.com/" +SRC_URI="http://www.playonlinux.com/script_files/${MY_PN}/${PV}/${MY_PN}_${PV}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="winbind" + +DEPEND="" +RDEPEND="app-emulation/wine + app-arch/cabextract + app-arch/p7zip + app-arch/unzip + app-crypt/gnupg + net-analyzer/netcat6 + dev-python/wxpython:2.8 + || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) + net-misc/wget + x11-apps/mesa-progs + x11-terms/xterm + media-gfx/icoutils + winbind? ( net-fs/samba[winbind] ) " + +S=${WORKDIR}/${PN} + +# TODO: +# Having a real install script and let playonlinux use standard filesystem +# architecture to prevent having everything installed into GAMES_DATADIR +# It will let using LANGUAGES easily +# How to deal with Microsoft Fonts installation asked every time ? +# How to deal with wine version installed ? (have a better mgmt of system one) +# Look at debian pkg: http://packages.debian.org/sid/playonlinux + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup + games_pkg_setup +} + +src_prepare() { + sed -i -e "s/\(Categories=\).*/\1Game;Emulator;/" etc/PlayOnLinux.desktop \ + || die + sed -e 's/PYTHON="python"/PYTHON="python2"/' -i lib/variables playonlinux || die + python_convert_shebangs -r 2 . +} + +src_install() { + # all things without exec permissions + insinto "${GAMES_DATADIR}/${PN}" + doins -r resources lang lib etc plugins + + # bash/ install + exeinto "${GAMES_DATADIR}/${PN}/bash" + doexe bash/* + #exeinto "${GAMES_DATADIR}/${PN}/bash/terminals" + #doexe bash/terminals/* + exeinto "${GAMES_DATADIR}/${PN}/bash/expert" + doexe bash/expert/* + + # python/ install + exeinto "${GAMES_DATADIR}/${PN}/python" + doexe python/* + # sub dir without exec permissions + insinto "${GAMES_DATADIR}/${PN}/python" + doins -r python/lib + + # main executable files + exeinto "${GAMES_DATADIR}/${PN}" + doexe ${PN}{,-pkg,-bash,-shell,-url_handler} + + # making a script to run playonlinux from ${GAMES_BINDIR} + echo "#!/bin/bash" > ${PN}_launcher + echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN} \$*" >> ${PN}_launcher + newgamesbin playonlinux_launcher playonlinux + + # making a script to run playonlinux-cmd from ${GAMES_BINDIR} + echo "#!/bin/bash" > ${PN}_cmd_launcher + echo "cd \"${GAMES_DATADIR}/${PN}\" && ./${PN}-cmd \$*" >> ${PN}_cmd_launcher + newgamesbin playonlinux_cmd_launcher playonlinux-cmd + + #dodoc CHANGELOG + + doicon etc/${PN}.png + domenu etc/${MY_PN}.desktop + prepgamesdirs + + if [ -f "/usr/bin/python2.6" ]; then + addwrite /usr/local/bin/ + if [ ! -f "/usr/local/bin/python2.6" ]; then + dosym /usr/bin/python2.6 /usr/local/bin/ || die + else + echo "The file already existed" + rm /usr/local/bin/python2.6 || die + dosym /usr/bin/python2.6 /usr/local/bin/ || die + echo "Replaced it" + fi + if [ ! -f "/usr/local/bin/python2.6-config" ]; then + dosym /usr/bin/python-config-2.6 /usr/local/bin/python2.6-config || die + else + echo "The file already existed" + rm /usr/local/bin/python2.6-config || die + dosym /usr/bin/python-config-2.6 /usr/local/bin/python2.6-config || die + echo "Replaced it" + fi + else + ewarn "There is no python2.6, you should emerge python2.6" + fi +} + +pkg_postinst() { + games_pkg_postinst + python_mod_optimize "${GAMES_DATADIR}/${PN}" +} + +pkg_postrm() { + python_mod_cleanup "${GAMES_DATADIR}/${PN}" + + elog "Installed softwares and games with playonlinux have not been removed." + elog "To remove them, you can re-install playonlinux and remove them using it" + elog "or do it manually by removing .PlayOnLinux/ in your home directory." +} -- cgit v1.2.3 From 4ac606d81cabc453048a467a48ac1e47d4ea465e Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Fri, 3 Apr 2015 17:58:19 +0300 Subject: [eclass/sab-patches.eclass] upgrade the eclass --- eclass/sab-patches.eclass | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/eclass/sab-patches.eclass b/eclass/sab-patches.eclass index 8511256e..40e89911 100644 --- a/eclass/sab-patches.eclass +++ b/eclass/sab-patches.eclass @@ -9,10 +9,13 @@ # Sławomir Nizio # @BLURB: eclass that makes it easier to apply patches from multiple packages # @DESCRIPTION: -# Adds a patch or patches to SRC_URI and makes it easy to apply them, +# Makes it easy to apply patches stored in a remote location # with the intention to make the task easier for Sabayon split ebuilds. # (Plain patches kept in a VCS are very nice, but in the case of split # ebuilds, duplicating the patches is not effective.) +# Patches are not added to SRC_URI by default, because it makes ebuilds +# use "SRC_URI+=..." which makes them more diverged from the original +# one than necessary. # The eclass does not define any phase function. # @ECLASS-VARIABLE: SAB_PATCHES_SRC @@ -31,10 +34,16 @@ if [[ ${#SAB_PATCHES_SRC[@]} -eq 0 ]]; then die "SAB_PATCHES_SRC is not set" fi -for _sab_patch in "${SAB_PATCHES_SRC[@]}"; do - SRC_URI=${_sab_patch} -done -unset _sab_patch +# @FUNCTION: sab-patches_update_SRC_URI +# @DESCRIPTION: +# Appends patches entries to SRC_URI. If it is not done, an error will +# occur later on. +sab-patches_update_SRC_URI() { + local p + for p in "${SAB_PATCHES_SRC[@]}"; do + SRC_URI+=${SRC_URI:+ }${p} + done +} # @FUNCTION: sab-patches_apply_all # @DESCRIPTION: @@ -75,6 +84,21 @@ sab-patches_apply() { done } +# @FUNCTION: sab-patches_unpack +# @DESCRIPTION: +# Unpack every file provided in SAB_PATCHES_SRC. +sab-patches_unpack() { + local p + pushd "${WORKDIR}" > /dev/null || die + + for p in "${SAB_PATCHES_SRC[@]}"; do + local name=${p##*/} + unpack "${name}" + done + + popd > /dev/null || die +} + # @FUNCTION: _sab-patches_apply_nonskipped # @INTERNAL # @DESCRIPTION: -- cgit v1.2.3 From c926301f92694ceaf7f579e104ec618a99fe3b53 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sat, 4 Apr 2015 10:01:20 +0300 Subject: [kde-base/kdm] new version --- kde-base/kdm/Manifest | 1 + kde-base/kdm/kdm-4.11.17-r1.ebuild | 164 +++++++++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+) create mode 100644 kde-base/kdm/kdm-4.11.17-r1.ebuild diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest index 63fa99dc..a35d905c 100644 --- a/kde-base/kdm/Manifest +++ b/kde-base/kdm/Manifest @@ -1,2 +1,3 @@ +DIST kde-workspace-4.11.17.tar.xz 13551548 SHA256 1d52b8430ab31e933f1c2b9645b9d6a944693a404a2b88fc441b241d7922765e SHA512 21b84abfc71e29b6abaf6bdde2bb75ff0940e39fcc05bd92c767c30e5e629c1b4106cdee34b06a8cd4c99809f05596af3f355edb49e9c066043f3ceb54573892 WHIRLPOOL 4377efe85e717ab8f7d9f07647c26f38fdbac69a5c842ae2107581ba0df1a847be7bfa0931d46f99f780d8fc7bd41fd8d8b4382acc388a6c475bb58826af07df DIST kde-workspace-4.11.5.tar.xz 13714748 SHA256 3b99a3991d6d8b1aa4158da67ead30cabb815c07a6c8ee10751307f97d8613cf SHA512 311ef4f13a35f5e5d4b2eb60491d76aa8a47a25c7a565d7378c653b4d01d0d21d867deef9c658dff9bd14a02f1834d4781fed80129b5dc05d1490d34c656a281 WHIRLPOOL 3a853bc77e4beed8e1524a34061ba518b3ebe429e7873d58b30705516b743bcabc79124d01e59a2b9e1dc83cfd5128e8fc2d9fa5f2addb362a44ee53b4685c2d DIST kde-workspace-4.11.6.tar.xz 13531288 SHA256 e1b3cb78dc94f3fab61c588ee610f143a1fd8a70f5f08b5ba19174427f9a6352 SHA512 059877a8f5bb6df47bf043a9f89be6a827b56a0fc11104b189041eb4e08e40d6f9375c1268afcfcee329735d2c62e3959589751b5281603ff1bcc637cec38cd6 WHIRLPOOL ba5f0e277f6abbb502088ac9bdb420a221e570b140dd4a2dd6dccb1dfcf93efd2fceecb075f5a66fbe6c61346a2dfd7290124036f2e0f58091119a00ce7b8346 diff --git a/kde-base/kdm/kdm-4.11.17-r1.ebuild b/kde-base/kdm/kdm-4.11.17-r1.ebuild new file mode 100644 index 00000000..b47756ae --- /dev/null +++ b/kde-base/kdm/kdm-4.11.17-r1.ebuild @@ -0,0 +1,164 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +KDE_HANDBOOK="optional" +KMNAME="kde-workspace" +inherit systemd kde4-meta flag-o-matic user + +DESCRIPTION="KDE login manager, similar to xdm and gdm" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug +consolekit kerberos pam systemd" + +REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )" + +DEPEND=" + $(add_kdebase_dep libkworkspace) + media-libs/qimageblitz + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXtst + consolekit? ( + >=sys-apps/dbus-1.0.2 + sys-auth/consolekit + ) + kerberos? ( virtual/krb5 ) + pam? ( + $(add_kdebase_dep kcheckpass) + virtual/pam + ) + systemd? ( sys-apps/systemd ) +" +RDEPEND="${DEPEND} + $(add_kdebase_dep kdepasswd) + $(add_kdebase_dep libkgreeter) + >=x11-apps/xinit-1.0.5-r2 + x11-apps/xmessage +" + +KMEXTRACTONLY=" + libs/kdm/kgreeterplugin.h +" + +PATCHES=( + "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" +) + +pkg_setup() { + kde4-meta_pkg_setup + + # Create kdm:kdm user + KDM_HOME=/var/lib/kdm + enewgroup kdm + enewuser kdm -1 -1 "${KDM_HOME}" kdm +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use kerberos KDE4_KRB5AUTH) + $(cmake-utils_use_with pam) + $(cmake-utils_use_with consolekit CkConnector) + ) + + kde4-meta_src_configure +} + +src_install() { + export GENKDMCONF_FLAGS="--no-old --no-backup" + + kde4-meta_src_install + + # an equivalent file is already installed by kde-base/startkde, bug 377151 + rm "${ED}/usr/share/apps/kdm/sessions/kde-plasma.desktop" || die + + # Customize the kdmrc configuration: + # - SessionDirs set to /usr/share/xsessions + # - increase server timeout to 30s + # - TerminateServer=true to workaround X server regen bug, bug 278473 + # - DataDir set to /var/lib/kdm + # - FaceDir set to /var/lib/kdm/faces + sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \ + -e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \ + -e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \ + -e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \ + -e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \ + -e "s|themes/elarun$|themes/sabayon|" \ + -i "${ED}"/usr/share/config/kdm/kdmrc \ + || die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc." + + # Don't install empty dir + rmdir "${ED}"/usr/share/config/kdm/sessions + + # Set up permissions to kdm work directory + keepdir "${KDM_HOME}" + fowners root:kdm "${KDM_HOME}" + fperms 1770 "${KDM_HOME}" + + # install logrotate file + insinto /etc/logrotate.d + newins "${FILESDIR}"/kdm-logrotate kdm + + systemd_dounit "${FILESDIR}"/kdm.service +} + +pkg_postinst() { + kde4-meta_pkg_postinst + + local file src dest dir old_dirs=( + /var/lib/kdm-live + /var/lib/kdm-4.6 + /var/lib/kdm-4.5 + /var/lib/kdm-4.4 + /usr/share/apps/kdm + /usr/kde/4.4/share/apps/kdm + /usr/kde/4.3/share/apps/kdm + /usr/kde/4.2/share/apps/kdm + ) + + mkdir -p "${EROOT}${KDM_HOME}/faces" + # Set the default kdm face icon if it's not already set by the system admin + # because this is user-overrideable in that way, it's not in src_install + for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do + src=${file#*:} + dest=${file%:*} + if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then + for dir in "${old_dirs[@]}"; do + if [[ -e ${EROOT}${dir}/${dest} ]]; then + cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}" + break 2 + fi + done + if [[ -n ${src} ]]; then + cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \ + "${EROOT}${KDM_HOME}/${dest}" + fi + fi + done + for dir in "${old_dirs[@]}"; do + if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then + echo + elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE." + elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}." + echo + elog "After doing so, you may delete the directory." + echo + fi + done + + # Make sure permissions are correct -- old installations may have + # gotten this wrong + use prefix || chown root:kdm "${EROOT}${KDM_HOME}" + chmod 1770 "${EROOT}${KDM_HOME}" + + if use consolekit; then + echo + elog "You have compiled 'kdm' with consolekit support. If you want to use kdm," + elog "make sure consolekit daemon is running and started at login time" + elog + elog "rc-update add consolekit default && /etc/init.d/consolekit start" + echo + fi +} -- cgit v1.2.3 From 1aec84d8a25d3ba3fff11b97cdce2317ae3f5610 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sat, 4 Apr 2015 10:03:17 +0300 Subject: [kde-base/kdm] rebrand --- kde-base/kdm/kdm-4.11.17-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-base/kdm/kdm-4.11.17-r1.ebuild b/kde-base/kdm/kdm-4.11.17-r1.ebuild index b47756ae..52d42761 100644 --- a/kde-base/kdm/kdm-4.11.17-r1.ebuild +++ b/kde-base/kdm/kdm-4.11.17-r1.ebuild @@ -85,7 +85,7 @@ src_install() { -e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \ -e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \ -e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \ - -e "s|themes/elarun$|themes/sabayon|" \ + -e "s|themes/elarun$|themes/kogaion|" \ -i "${ED}"/usr/share/config/kdm/kdmrc \ || die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc." -- cgit v1.2.3 From a0c39c968f8cd70f85548ae35f94af98df6a0c6e Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 7 Apr 2015 22:13:01 +0300 Subject: [x11-drivers/nvidia-userspace] editted latest version --- x11-drivers/nvidia-userspace/nvidia-userspace-346.35.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-346.35.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-346.35.ebuild index 9803ec79..d02de75b 100644 --- a/x11-drivers/nvidia-userspace/nvidia-userspace-346.35.ebuild +++ b/x11-drivers/nvidia-userspace/nvidia-userspace-346.35.ebuild @@ -29,7 +29,7 @@ IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X uvm" RESTRICT="bindist mirror strip" EMULTILIB_PKG="true" -COMMON="app-admin/eselect-opencl +COMMON="app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) x-multilib? ( || ( @@ -42,7 +42,7 @@ COMMON="app-admin/eselect-opencl ) multilib? ( app-emulation/emul-linux-x86-baselibs ) X? ( - >=app-admin/eselect-opengl-1.0.9 + >=app-eselect/eselect-opengl-1.0.9 )" DEPEND="${COMMON}" # Note: do not add !>nvidia-userspace-ver or ! Date: Tue, 7 Apr 2015 22:15:16 +0300 Subject: [x11-drivers/*] moving to app-eselect/* --- x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-12.10.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-12.2.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-12.3.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-12.4.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-12.6.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-12.8.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-13.1.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-13.12.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-13.4.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-13.9.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-14.4.ebuild | 2 +- x11-drivers/nvidia-userspace/nvidia-userspace-304.125.ebuild | 2 +- x11-drivers/nvidia-userspace/nvidia-userspace-331.67.ebuild | 2 +- x11-drivers/nvidia-userspace/nvidia-userspace-337.25.ebuild | 2 +- x11-drivers/nvidia-userspace/nvidia-userspace-340.32.ebuild | 2 +- x11-drivers/nvidia-userspace/nvidia-userspace-340.46.ebuild | 2 +- x11-drivers/nvidia-userspace/nvidia-userspace-340.58.ebuild | 2 +- x11-drivers/nvidia-userspace/nvidia-userspace-340.76.ebuild | 2 +- x11-drivers/nvidia-userspace/nvidia-userspace-343.36.ebuild | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild index 3993df43..43dfae9e 100644 --- a/x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild @@ -27,7 +27,7 @@ RDEPEND="<=x11-base/xorg-server-1.11.49 !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra >=app-admin/eselect-opengl-1.0.7 - app-admin/eselect-opencl + app-eselect/eselect-opencl x11-apps/xauth x11-libs/libX11 x11-libs/libXext diff --git a/x11-drivers/ati-userspace/ati-userspace-12.10.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.10.ebuild index e27131b3..ca1a2625 100644 --- a/x11-drivers/ati-userspace/ati-userspace-12.10.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-12.10.ebuild @@ -23,7 +23,7 @@ RDEPEND="<=x11-base/xorg-server-1.12.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra >=app-admin/eselect-opengl-1.0.7 - app-admin/eselect-opencl + app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 diff --git a/x11-drivers/ati-userspace/ati-userspace-12.2.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.2.ebuild index e0460995..c218ac3c 100644 --- a/x11-drivers/ati-userspace/ati-userspace-12.2.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-12.2.ebuild @@ -27,7 +27,7 @@ RDEPEND="<=x11-base/xorg-server-1.11.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra >=app-admin/eselect-opengl-1.0.7 - app-admin/eselect-opencl + app-eselect/eselect-opencl x11-apps/xauth x11-libs/libX11 x11-libs/libXext diff --git a/x11-drivers/ati-userspace/ati-userspace-12.3.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.3.ebuild index 7d0cf802..60b22299 100644 --- a/x11-drivers/ati-userspace/ati-userspace-12.3.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-12.3.ebuild @@ -27,7 +27,7 @@ RDEPEND="<=x11-base/xorg-server-1.11.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra >=app-admin/eselect-opengl-1.0.7 - app-admin/eselect-opencl + app-eselect/eselect-opencl x11-apps/xauth x11-libs/libX11 x11-libs/libXext diff --git a/x11-drivers/ati-userspace/ati-userspace-12.4.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.4.ebuild index 7d0cf802..60b22299 100644 --- a/x11-drivers/ati-userspace/ati-userspace-12.4.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-12.4.ebuild @@ -27,7 +27,7 @@ RDEPEND="<=x11-base/xorg-server-1.11.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra >=app-admin/eselect-opengl-1.0.7 - app-admin/eselect-opencl + app-eselect/eselect-opencl x11-apps/xauth x11-libs/libX11 x11-libs/libXext diff --git a/x11-drivers/ati-userspace/ati-userspace-12.6.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.6.ebuild index 2637daac..856267ef 100644 --- a/x11-drivers/ati-userspace/ati-userspace-12.6.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-12.6.ebuild @@ -28,7 +28,7 @@ RDEPEND="<=x11-base/xorg-server-1.12.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra >=app-admin/eselect-opengl-1.0.7 - app-admin/eselect-opencl + app-eselect/eselect-opencl x11-apps/xauth x11-libs/libX11 x11-libs/libXext diff --git a/x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild index 97cf89c6..938f51e9 100644 --- a/x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild @@ -29,7 +29,7 @@ RDEPEND="<=x11-base/xorg-server-1.12.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra >=app-admin/eselect-opengl-1.0.7 - app-admin/eselect-opencl + app-eselect/eselect-opencl x11-apps/xauth x11-libs/libX11 x11-libs/libXext diff --git a/x11-drivers/ati-userspace/ati-userspace-12.8.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.8.ebuild index ab6501fc..46f487a5 100644 --- a/x11-drivers/ati-userspace/ati-userspace-12.8.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-12.8.ebuild @@ -28,7 +28,7 @@ RDEPEND="<=x11-base/xorg-server-1.12.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra >=app-admin/eselect-opengl-1.0.7 - app-admin/eselect-opencl + app-eselect/eselect-opencl x11-apps/xauth x11-libs/libX11 x11-libs/libXext diff --git a/x11-drivers/ati-userspace/ati-userspace-13.1.ebuild b/x11-drivers/ati-userspace/ati-userspace-13.1.ebuild index ee860be4..57caf96f 100644 --- a/x11-drivers/ati-userspace/ati-userspace-13.1.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-13.1.ebuild @@ -25,7 +25,7 @@ RDEPEND="<=x11-base/xorg-server-1.13.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra >=app-admin/eselect-opengl-1.0.7 - app-admin/eselect-opencl + app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 diff --git a/x11-drivers/ati-userspace/ati-userspace-13.12.ebuild b/x11-drivers/ati-userspace/ati-userspace-13.12.ebuild index e469d09d..479b786a 100644 --- a/x11-drivers/ati-userspace/ati-userspace-13.12.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-13.12.ebuild @@ -28,7 +28,7 @@ RDEPEND="<=x11-base/xorg-server-1.14.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra >=app-admin/eselect-opengl-1.0.7 - app-admin/eselect-opencl + app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 diff --git a/x11-drivers/ati-userspace/ati-userspace-13.4.ebuild b/x11-drivers/ati-userspace/ati-userspace-13.4.ebuild index 82d348e4..abdf4cba 100644 --- a/x11-drivers/ati-userspace/ati-userspace-13.4.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-13.4.ebuild @@ -30,7 +30,7 @@ RDEPEND="<=x11-base/xorg-server-1.13.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra >=app-admin/eselect-opengl-1.0.7 - app-admin/eselect-opencl + app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 diff --git a/x11-drivers/ati-userspace/ati-userspace-13.9.ebuild b/x11-drivers/ati-userspace/ati-userspace-13.9.ebuild index bc8229dc..62a50e8a 100644 --- a/x11-drivers/ati-userspace/ati-userspace-13.9.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-13.9.ebuild @@ -26,7 +26,7 @@ RDEPEND="<=x11-base/xorg-server-1.14.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra >=app-admin/eselect-opengl-1.0.7 - app-admin/eselect-opencl + app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 diff --git a/x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild b/x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild index 3b069987..20cde356 100644 --- a/x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild @@ -26,7 +26,7 @@ RESTRICT="bindist test" RDEPEND=" <=x11-base/xorg-server-1.16.49[-minimal] >=app-admin/eselect-opengl-1.0.7 - app-admin/eselect-opencl + app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 diff --git a/x11-drivers/ati-userspace/ati-userspace-14.4.ebuild b/x11-drivers/ati-userspace/ati-userspace-14.4.ebuild index 2462ee97..ee9e70f5 100644 --- a/x11-drivers/ati-userspace/ati-userspace-14.4.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-14.4.ebuild @@ -26,7 +26,7 @@ RDEPEND="<=x11-base/xorg-server-1.14.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra >=app-admin/eselect-opengl-1.0.7 - app-admin/eselect-opencl + app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-304.125.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-304.125.ebuild index 391d7a6a..916555fc 100644 --- a/x11-drivers/nvidia-userspace/nvidia-userspace-304.125.ebuild +++ b/x11-drivers/nvidia-userspace/nvidia-userspace-304.125.ebuild @@ -26,7 +26,7 @@ IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X" RESTRICT="strip" EMULTILIB_PKG="true" -COMMON="app-admin/eselect-opencl +COMMON="app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) x-multilib? ( app-emulation/emul-linux-x86-xlibs ) multilib? ( app-emulation/emul-linux-x86-baselibs ) diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-331.67.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-331.67.ebuild index 13dbb31d..5ebb153a 100644 --- a/x11-drivers/nvidia-userspace/nvidia-userspace-331.67.ebuild +++ b/x11-drivers/nvidia-userspace/nvidia-userspace-331.67.ebuild @@ -29,7 +29,7 @@ IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X" RESTRICT="bindist mirror strip" EMULTILIB_PKG="true" -COMMON="app-admin/eselect-opencl +COMMON="app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) x-multilib? ( || ( diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-337.25.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-337.25.ebuild index 30af4add..a3b719e7 100644 --- a/x11-drivers/nvidia-userspace/nvidia-userspace-337.25.ebuild +++ b/x11-drivers/nvidia-userspace/nvidia-userspace-337.25.ebuild @@ -29,7 +29,7 @@ IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X uvm" RESTRICT="bindist mirror strip" EMULTILIB_PKG="true" -COMMON="app-admin/eselect-opencl +COMMON="app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) x-multilib? ( || ( diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-340.32.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-340.32.ebuild index 30af4add..a3b719e7 100644 --- a/x11-drivers/nvidia-userspace/nvidia-userspace-340.32.ebuild +++ b/x11-drivers/nvidia-userspace/nvidia-userspace-340.32.ebuild @@ -29,7 +29,7 @@ IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X uvm" RESTRICT="bindist mirror strip" EMULTILIB_PKG="true" -COMMON="app-admin/eselect-opencl +COMMON="app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) x-multilib? ( || ( diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-340.46.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-340.46.ebuild index 30af4add..a3b719e7 100644 --- a/x11-drivers/nvidia-userspace/nvidia-userspace-340.46.ebuild +++ b/x11-drivers/nvidia-userspace/nvidia-userspace-340.46.ebuild @@ -29,7 +29,7 @@ IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X uvm" RESTRICT="bindist mirror strip" EMULTILIB_PKG="true" -COMMON="app-admin/eselect-opencl +COMMON="app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) x-multilib? ( || ( diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-340.58.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-340.58.ebuild index 30af4add..a3b719e7 100644 --- a/x11-drivers/nvidia-userspace/nvidia-userspace-340.58.ebuild +++ b/x11-drivers/nvidia-userspace/nvidia-userspace-340.58.ebuild @@ -29,7 +29,7 @@ IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X uvm" RESTRICT="bindist mirror strip" EMULTILIB_PKG="true" -COMMON="app-admin/eselect-opencl +COMMON="app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) x-multilib? ( || ( diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-340.76.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-340.76.ebuild index 30af4add..a3b719e7 100644 --- a/x11-drivers/nvidia-userspace/nvidia-userspace-340.76.ebuild +++ b/x11-drivers/nvidia-userspace/nvidia-userspace-340.76.ebuild @@ -29,7 +29,7 @@ IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X uvm" RESTRICT="bindist mirror strip" EMULTILIB_PKG="true" -COMMON="app-admin/eselect-opencl +COMMON="app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) x-multilib? ( || ( diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-343.36.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-343.36.ebuild index 30af4add..a3b719e7 100644 --- a/x11-drivers/nvidia-userspace/nvidia-userspace-343.36.ebuild +++ b/x11-drivers/nvidia-userspace/nvidia-userspace-343.36.ebuild @@ -29,7 +29,7 @@ IUSE="acpi multilib x-multilib kernel_FreeBSD kernel_linux tools +X uvm" RESTRICT="bindist mirror strip" EMULTILIB_PKG="true" -COMMON="app-admin/eselect-opencl +COMMON="app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) x-multilib? ( || ( -- cgit v1.2.3 From 61df240f72a84a17945ff4b20e18d426a4451b2a Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 7 Apr 2015 22:19:00 +0300 Subject: Moved app-admin/eselect to app-eselect/eselect* --- app-admin/eselect-lightdm/Manifest | 2 - .../eselect-lightdm/eselect-lightdm-0.2.ebuild | 25 --- .../eselect-lightdm/files/lightdm-0.2.eselect | 176 --------------------- app-eselect/eselect-lightdm/Manifest | 2 + .../eselect-lightdm/eselect-lightdm-0.2.ebuild | 25 +++ .../eselect-lightdm/files/lightdm-0.2.eselect | 176 +++++++++++++++++++++ x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild | 2 +- x11-misc/lightdm-base/lightdm-base-1.4.0-r1.ebuild | 2 +- x11-misc/lightdm-base/lightdm-base-1.4.0.ebuild | 2 +- x11-misc/lightdm-base/lightdm-base-1.8.5-r2.ebuild | 2 +- .../lightdm-gtk-greeter-1.3.1-r1.ebuild | 2 +- .../lightdm-gtk-greeter-1.6.1.ebuild | 2 +- .../lightdm-gtk-greeter-1.7.0.ebuild | 2 +- .../lightdm-gtk-greeter-1.9.0.ebuild | 2 +- x11-misc/lightdm-kde/lightdm-kde-0.3.1.ebuild | 2 +- x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild | 2 +- 16 files changed, 213 insertions(+), 213 deletions(-) delete mode 100644 app-admin/eselect-lightdm/Manifest delete mode 100644 app-admin/eselect-lightdm/eselect-lightdm-0.2.ebuild delete mode 100644 app-admin/eselect-lightdm/files/lightdm-0.2.eselect create mode 100644 app-eselect/eselect-lightdm/Manifest create mode 100644 app-eselect/eselect-lightdm/eselect-lightdm-0.2.ebuild create mode 100644 app-eselect/eselect-lightdm/files/lightdm-0.2.eselect diff --git a/app-admin/eselect-lightdm/Manifest b/app-admin/eselect-lightdm/Manifest deleted file mode 100644 index 28551431..00000000 --- a/app-admin/eselect-lightdm/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -AUX lightdm-0.2.eselect 4393 SHA256 3953380345fcb011f6f6786a1b3800f0e06ff05f7b3abd93eb734a71980bdd25 SHA512 1908ad4f363d2e7cc74ead0d52a90bc87f4752d7140b0e1098935f8f4446cc260ed73b629c895dda3afa3449718077ed70253a9becb60820d94cc2e278aeacc9 WHIRLPOOL be3248dee97a416ad84db3f080673edb7bfcffe08b4d24f9f97307a917bfb4f8cd3c132f5a59cf971ca8c00a1f9379caf328f93f9379643925288f7150283349 -EBUILD eselect-lightdm-0.2.ebuild 497 SHA256 46b5b60218693e53db3a98dcfcebc1c13a44fec4cc2a7d7b7b8ef2e33f2fee5d SHA512 3f46dd3b7ac03d93d416696f03cbeb54cbaaacecec0fbeaff446d19e47175988dddd0c264d7015c38bf70d7808cdf1dd96a7aa643632b809bf957bac15f20a3f WHIRLPOOL e1e14d07473480e70673c4ea3a5b0ada4e93eda083f78e4bf9906724d0bc0cb335fa1d3a332250a3b36056542d1707db6f06e3cdb1568b33172fe05cf9968be9 diff --git a/app-admin/eselect-lightdm/eselect-lightdm-0.2.ebuild b/app-admin/eselect-lightdm/eselect-lightdm-0.2.ebuild deleted file mode 100644 index 7e1ef10b..00000000 --- a/app-admin/eselect-lightdm/eselect-lightdm-0.2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -SRC_URI="" -KEYWORDS="~amd64 ~arm ~x86" - -DESCRIPTION="Eselect module for making easy to switch between LightDM greeters" -HOMEPAGE="http://www.sabayon.org" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -S="${WORKDIR}" - -RDEPEND="app-admin/eselect" -DEPEND="${RDEPEND}" - -src_install() { - insinto /usr/share/eselect/modules - newins "${FILESDIR}/lightdm-${PV}.eselect" lightdm.eselect -} diff --git a/app-admin/eselect-lightdm/files/lightdm-0.2.eselect b/app-admin/eselect-lightdm/files/lightdm-0.2.eselect deleted file mode 100644 index 00cf7e1d..00000000 --- a/app-admin/eselect-lightdm/files/lightdm-0.2.eselect +++ /dev/null @@ -1,176 +0,0 @@ -# -*-eselect-*- vim: ft=eselect -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 or later -# $Id: $ - -DESCRIPTION="Switch between LightDM greeters" -MAINTAINER="lxnay@gentoo.org" -VERSION="0.1" - -# Module variables -GREETERS_DIR="${EROOT}/usr/share/xgreeters" -GREETER_SYM="${GREETERS_DIR}/default.desktop" - -find_targets() { - local f fname - for f in "${GREETERS_DIR}/"*; do - [[ "${f}" == "${GREETER_SYM}" ]] && continue - # skip dirs - [[ -d "${f}" ]] && continue - # skip broken syms etc - [[ ! -e "${f}" ]] && continue - # skip non reg files - [[ ! -f "${f}" ]] && continue - - fname=$(basename "${f}") - [[ "${fname}" == *.desktop ]] || continue - - echo "${fname%%.desktop}" - done -} - -remove_symlink() { - rm "${GREETER_SYM}" -} - -set_symlink() { - local target="${1}" - - if is_number "${target}"; then - local targets=( $(find_targets) ) - target=${targets[target-1]} - fi - - [[ -z "${target}" || ! -f "${GREETERS_DIR}/${target}.desktop" ]] \ - && die -q "Target \"${target}\" doesn't appear to be valid!" - - echo "Setting LightDM greeter to ${target}" - ln -sf "${target}.desktop" "${GREETER_SYM}" || die "Cannot create symlink" -} - -### show action ### - -describe_show() { - echo "Show the current LightDM greeter" -} - -describe_show_options() { - echo "--quiet : only print the actual symlink value" - echo "--silent : same as --quiet" -} - -do_show() { - local quiet="" - - while [[ $# -gt 0 ]]; do - case ${1##--} in - quiet|silent) - quiet="1" - ;; - esac - shift - done - - [[ -z "${quiet}" ]] && write_list_start "Current greeter:" - if [[ -L "${GREETER_SYM}" ]] && [[ -e "${GREETER_SYM}" ]]; then - local greeter=$(canonicalise "${GREETER_SYM}") - local greeter_bn=$(basename "${greeter%.desktop}") - if [[ -n "${quiet}" ]]; then - echo "${greeter_bn}" - else - write_kv_list_entry "${greeter_bn}" "" - fi - else - if [[ -z "${quiet}" ]]; then - write_kv_list_entry "(unset)" "" - fi - fi -} - -### list action ### - -describe_list() { - echo "List available LightDM greeters" -} - -describe_list_options() { - echo "--quiet : only print the actual symlink value" - echo "--silent : same as --quiet" -} - -do_list() { - local quiet - - while [[ $# -gt 0 ]]; do - case ${1##--} in - quiet|silent) - quiet="1" - ;; - esac - shift - done - - local i targets=( $(find_targets) ) - - [[ -z "${quiet}" ]] && write_list_start "Available LightDM greeters:" - for (( i = 0; i < ${#targets[@]}; i++ )); do - if [[ -z "${quiet}" ]]; then - # highlight the target where the symlink is pointing to - [[ ${targets[i]} = \ - $(basename "$(canonicalise "${GREETER_SYM}")") ]] \ - && targets[i]=$(highlight_marker "${targets[i]}") - else - echo "${targets[i]}" - fi - done - [[ -z "${quiet}" ]] && \ - write_numbered_list -m "(none found)" "${targets[@]}" -} - -### set action ### -describe_set() { - echo "Set a new LightDM greeter" -} - -describe_set_parameters() { - echo "" -} - -describe_set_options() { - echo "target : Target name or number (from 'list' action)" - echo "--use-old : use the old value if target is already set" -} - -do_set() { - local use_old - local target="${1}" - - while [[ $# -gt 0 ]]; do - case ${1##--} in - use-old) - use_old="1" - ;; - esac - shift - done - - [[ -z "${target}" ]] && \ - die -q "You didn't tell me what to set the symlink to" - [[ ${#} -gt 1 ]] && die -q "Too many parameters" - - if [[ "${use_old}" = "1" ]]; then - old_target=$(do_show --quiet) - target="${old_target:-${target}}" - fi - - if [[ -L "${GREETER_SYM}" ]]; then - # existing symlink - remove_symlink || die -q "Couldn't remove existing symlink" - set_symlink "${target}" || die -q "Couldn't set a new symlink" - elif [[ -e "${GREETER_SYM}" ]]; then - # we have something strange - die -q "${GREETER_SYM} exists but is not a symlink" - else - set_symlink "${target}" || die -q "Couldn't set a new symlink" - fi -} diff --git a/app-eselect/eselect-lightdm/Manifest b/app-eselect/eselect-lightdm/Manifest new file mode 100644 index 00000000..28551431 --- /dev/null +++ b/app-eselect/eselect-lightdm/Manifest @@ -0,0 +1,2 @@ +AUX lightdm-0.2.eselect 4393 SHA256 3953380345fcb011f6f6786a1b3800f0e06ff05f7b3abd93eb734a71980bdd25 SHA512 1908ad4f363d2e7cc74ead0d52a90bc87f4752d7140b0e1098935f8f4446cc260ed73b629c895dda3afa3449718077ed70253a9becb60820d94cc2e278aeacc9 WHIRLPOOL be3248dee97a416ad84db3f080673edb7bfcffe08b4d24f9f97307a917bfb4f8cd3c132f5a59cf971ca8c00a1f9379caf328f93f9379643925288f7150283349 +EBUILD eselect-lightdm-0.2.ebuild 497 SHA256 46b5b60218693e53db3a98dcfcebc1c13a44fec4cc2a7d7b7b8ef2e33f2fee5d SHA512 3f46dd3b7ac03d93d416696f03cbeb54cbaaacecec0fbeaff446d19e47175988dddd0c264d7015c38bf70d7808cdf1dd96a7aa643632b809bf957bac15f20a3f WHIRLPOOL e1e14d07473480e70673c4ea3a5b0ada4e93eda083f78e4bf9906724d0bc0cb335fa1d3a332250a3b36056542d1707db6f06e3cdb1568b33172fe05cf9968be9 diff --git a/app-eselect/eselect-lightdm/eselect-lightdm-0.2.ebuild b/app-eselect/eselect-lightdm/eselect-lightdm-0.2.ebuild new file mode 100644 index 00000000..7e1ef10b --- /dev/null +++ b/app-eselect/eselect-lightdm/eselect-lightdm-0.2.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +SRC_URI="" +KEYWORDS="~amd64 ~arm ~x86" + +DESCRIPTION="Eselect module for making easy to switch between LightDM greeters" +HOMEPAGE="http://www.sabayon.org" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +S="${WORKDIR}" + +RDEPEND="app-admin/eselect" +DEPEND="${RDEPEND}" + +src_install() { + insinto /usr/share/eselect/modules + newins "${FILESDIR}/lightdm-${PV}.eselect" lightdm.eselect +} diff --git a/app-eselect/eselect-lightdm/files/lightdm-0.2.eselect b/app-eselect/eselect-lightdm/files/lightdm-0.2.eselect new file mode 100644 index 00000000..00cf7e1d --- /dev/null +++ b/app-eselect/eselect-lightdm/files/lightdm-0.2.eselect @@ -0,0 +1,176 @@ +# -*-eselect-*- vim: ft=eselect +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 or later +# $Id: $ + +DESCRIPTION="Switch between LightDM greeters" +MAINTAINER="lxnay@gentoo.org" +VERSION="0.1" + +# Module variables +GREETERS_DIR="${EROOT}/usr/share/xgreeters" +GREETER_SYM="${GREETERS_DIR}/default.desktop" + +find_targets() { + local f fname + for f in "${GREETERS_DIR}/"*; do + [[ "${f}" == "${GREETER_SYM}" ]] && continue + # skip dirs + [[ -d "${f}" ]] && continue + # skip broken syms etc + [[ ! -e "${f}" ]] && continue + # skip non reg files + [[ ! -f "${f}" ]] && continue + + fname=$(basename "${f}") + [[ "${fname}" == *.desktop ]] || continue + + echo "${fname%%.desktop}" + done +} + +remove_symlink() { + rm "${GREETER_SYM}" +} + +set_symlink() { + local target="${1}" + + if is_number "${target}"; then + local targets=( $(find_targets) ) + target=${targets[target-1]} + fi + + [[ -z "${target}" || ! -f "${GREETERS_DIR}/${target}.desktop" ]] \ + && die -q "Target \"${target}\" doesn't appear to be valid!" + + echo "Setting LightDM greeter to ${target}" + ln -sf "${target}.desktop" "${GREETER_SYM}" || die "Cannot create symlink" +} + +### show action ### + +describe_show() { + echo "Show the current LightDM greeter" +} + +describe_show_options() { + echo "--quiet : only print the actual symlink value" + echo "--silent : same as --quiet" +} + +do_show() { + local quiet="" + + while [[ $# -gt 0 ]]; do + case ${1##--} in + quiet|silent) + quiet="1" + ;; + esac + shift + done + + [[ -z "${quiet}" ]] && write_list_start "Current greeter:" + if [[ -L "${GREETER_SYM}" ]] && [[ -e "${GREETER_SYM}" ]]; then + local greeter=$(canonicalise "${GREETER_SYM}") + local greeter_bn=$(basename "${greeter%.desktop}") + if [[ -n "${quiet}" ]]; then + echo "${greeter_bn}" + else + write_kv_list_entry "${greeter_bn}" "" + fi + else + if [[ -z "${quiet}" ]]; then + write_kv_list_entry "(unset)" "" + fi + fi +} + +### list action ### + +describe_list() { + echo "List available LightDM greeters" +} + +describe_list_options() { + echo "--quiet : only print the actual symlink value" + echo "--silent : same as --quiet" +} + +do_list() { + local quiet + + while [[ $# -gt 0 ]]; do + case ${1##--} in + quiet|silent) + quiet="1" + ;; + esac + shift + done + + local i targets=( $(find_targets) ) + + [[ -z "${quiet}" ]] && write_list_start "Available LightDM greeters:" + for (( i = 0; i < ${#targets[@]}; i++ )); do + if [[ -z "${quiet}" ]]; then + # highlight the target where the symlink is pointing to + [[ ${targets[i]} = \ + $(basename "$(canonicalise "${GREETER_SYM}")") ]] \ + && targets[i]=$(highlight_marker "${targets[i]}") + else + echo "${targets[i]}" + fi + done + [[ -z "${quiet}" ]] && \ + write_numbered_list -m "(none found)" "${targets[@]}" +} + +### set action ### +describe_set() { + echo "Set a new LightDM greeter" +} + +describe_set_parameters() { + echo "" +} + +describe_set_options() { + echo "target : Target name or number (from 'list' action)" + echo "--use-old : use the old value if target is already set" +} + +do_set() { + local use_old + local target="${1}" + + while [[ $# -gt 0 ]]; do + case ${1##--} in + use-old) + use_old="1" + ;; + esac + shift + done + + [[ -z "${target}" ]] && \ + die -q "You didn't tell me what to set the symlink to" + [[ ${#} -gt 1 ]] && die -q "Too many parameters" + + if [[ "${use_old}" = "1" ]]; then + old_target=$(do_show --quiet) + target="${old_target:-${target}}" + fi + + if [[ -L "${GREETER_SYM}" ]]; then + # existing symlink + remove_symlink || die -q "Couldn't remove existing symlink" + set_symlink "${target}" || die -q "Couldn't set a new symlink" + elif [[ -e "${GREETER_SYM}" ]]; then + # we have something strange + die -q "${GREETER_SYM} exists but is not a symlink" + else + set_symlink "${target}" || die -q "Couldn't set a new symlink" + fi +} diff --git a/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild b/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild index 642486e7..b8f2b642 100644 --- a/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild +++ b/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild @@ -34,7 +34,7 @@ DEPEND="${COMMON_DEPEND} dev-util/intltool sys-devel/gettext virtual/pkgconfig" -PDEPEND="app-admin/eselect-lightdm" +PDEPEND="app-eselect/eselect-lightdm" DOCS=( NEWS ) diff --git a/x11-misc/lightdm-base/lightdm-base-1.4.0-r1.ebuild b/x11-misc/lightdm-base/lightdm-base-1.4.0-r1.ebuild index d45f2006..40699016 100644 --- a/x11-misc/lightdm-base/lightdm-base-1.4.0-r1.ebuild +++ b/x11-misc/lightdm-base/lightdm-base-1.4.0-r1.ebuild @@ -34,7 +34,7 @@ DEPEND="${COMMON_DEPEND} dev-util/intltool sys-devel/gettext virtual/pkgconfig" -PDEPEND="app-admin/eselect-lightdm" +PDEPEND="app-eselect/eselect-lightdm" DOCS=( NEWS ) diff --git a/x11-misc/lightdm-base/lightdm-base-1.4.0.ebuild b/x11-misc/lightdm-base/lightdm-base-1.4.0.ebuild index 6dbd5f7f..724dcd10 100644 --- a/x11-misc/lightdm-base/lightdm-base-1.4.0.ebuild +++ b/x11-misc/lightdm-base/lightdm-base-1.4.0.ebuild @@ -34,7 +34,7 @@ DEPEND="${COMMON_DEPEND} dev-util/intltool sys-devel/gettext virtual/pkgconfig" -PDEPEND="app-admin/eselect-lightdm" +PDEPEND="app-eselect/eselect-lightdm" DOCS=( NEWS ) diff --git a/x11-misc/lightdm-base/lightdm-base-1.8.5-r2.ebuild b/x11-misc/lightdm-base/lightdm-base-1.8.5-r2.ebuild index fd43798d..c9cc15b9 100644 --- a/x11-misc/lightdm-base/lightdm-base-1.8.5-r2.ebuild +++ b/x11-misc/lightdm-base/lightdm-base-1.8.5-r2.ebuild @@ -34,7 +34,7 @@ DEPEND="${COMMON_DEPEND} dev-util/intltool sys-devel/gettext virtual/pkgconfig" -PDEPEND="app-admin/eselect-lightdm" +PDEPEND="app-eselect/eselect-lightdm" DOCS=( NEWS ) diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild index ee1077e5..9288f4b2 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild @@ -16,7 +16,7 @@ IUSE="" # This ebuild needs custom Rogentos themes, thus it must depend on rogentos-artwork-core DEPEND="x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2" -RDEPEND="app-admin/eselect-lightdm +RDEPEND="app-eselect/eselect-lightdm x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/kogaion-dark-theme diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild index caaec402..13eafaf6 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild @@ -16,7 +16,7 @@ IUSE="" # This ebuild needs custom Sabayon themes, thus it must depend on kogaion-artwork-core DEPEND="x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2" -RDEPEND="app-admin/eselect-lightdm +RDEPEND="app-eselect/eselect-lightdm x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.7.0.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.7.0.ebuild index 6c30951d..a8aef2e6 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.7.0.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.7.0.ebuild @@ -19,7 +19,7 @@ IUSE="" DEPEND="x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2" RDEPEND="!!=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.9.0.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.9.0.ebuild index be818c54..4ed72451 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.9.0.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.9.0.ebuild @@ -19,7 +19,7 @@ IUSE="" DEPEND="x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2" RDEPEND="!!=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard diff --git a/x11-misc/lightdm-kde/lightdm-kde-0.3.1.ebuild b/x11-misc/lightdm-kde/lightdm-kde-0.3.1.ebuild index 1e9ac685..502867f3 100644 --- a/x11-misc/lightdm-kde/lightdm-kde-0.3.1.ebuild +++ b/x11-misc/lightdm-kde/lightdm-kde-0.3.1.ebuild @@ -24,7 +24,7 @@ DEPEND="x11-libs/libX11 >=x11-misc/lightdm-1.3.2[qt4] " RDEPEND="${DEPEND} - app-admin/eselect-lightdm" + app-eselect/eselect-lightdm" S=${WORKDIR}/${PN/-kde}-${PV} diff --git a/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild b/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild index 0099e1a5..e1d063b2 100644 --- a/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild +++ b/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild @@ -24,7 +24,7 @@ DEPEND="x11-libs/libX11 >=x11-misc/lightdm-1.3.2[qt4] " RDEPEND="${DEPEND} - app-admin/eselect-lightdm" + app-eselect/eselect-lightdm" S=${WORKDIR}/${PN/-kde}-${PV} -- cgit v1.2.3 From 927d78a9133dad2f94fe24b851b2dfb26ef73a33 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 7 Apr 2015 22:26:21 +0300 Subject: app-admin/eselect-uimage moved to app-eselect/uimage --- eclass/kogaion-kernel.eclass | 8 ++++---- eclass/rogentos-kernel.eclass | 8 ++++---- eclass/sabayon-kernel.eclass | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eclass/kogaion-kernel.eclass b/eclass/kogaion-kernel.eclass index 8c74a29b..f34cfc94 100644 --- a/eclass/kogaion-kernel.eclass +++ b/eclass/kogaion-kernel.eclass @@ -785,8 +785,8 @@ kogaion-kernel_uimage_config() { # 1. /boot/uImage symlink is broken (pkg_postrm) # 2. /boot/uImage symlink doesn't exist (pkg_postinst) - if ! has_version app-admin/eselect-uimage; then - ewarn "app-admin/eselect-uimage not installed" + if ! has_version app-eselect/uimage; then + ewarn "app-eselect/uimage not installed" ewarn "If you are using this tool, please install it" return 0 fi @@ -820,8 +820,8 @@ kogaion-kernel_bzimage_config() { use x86 && kern_arch="x86" use amd64 && kern_arch="x86_64" - if ! has_version app-admin/eselect-bzimage; then - ewarn "app-admin/eselect-bzimage not installed" + if ! has_version app-eselect/eselect-bzimage; then + ewarn "app-eselect/eselect-bzimage not installed" ewarn "If you are using this tool, please install it" return 0 fi diff --git a/eclass/rogentos-kernel.eclass b/eclass/rogentos-kernel.eclass index 78f2f90f..08f83821 100644 --- a/eclass/rogentos-kernel.eclass +++ b/eclass/rogentos-kernel.eclass @@ -785,8 +785,8 @@ rogentos-kernel_uimage_config() { # 1. /boot/uImage symlink is broken (pkg_postrm) # 2. /boot/uImage symlink doesn't exist (pkg_postinst) - if ! has_version app-admin/eselect-uimage; then - ewarn "app-admin/eselect-uimage not installed" + if ! has_version app-eselect/uimage; then + ewarn "app-eselect/uimage not installed" ewarn "If you are using this tool, please install it" return 0 fi @@ -820,8 +820,8 @@ rogentos-kernel_bzimage_config() { use x86 && kern_arch="x86" use amd64 && kern_arch="x86_64" - if ! has_version app-admin/eselect-bzimage; then - ewarn "app-admin/eselect-bzimage not installed" + if ! has_version app-eselect/eselect-bzimage; then + ewarn "app-eselect/eselect-bzimage not installed" ewarn "If you are using this tool, please install it" return 0 fi diff --git a/eclass/sabayon-kernel.eclass b/eclass/sabayon-kernel.eclass index 7197ca00..710aa0a7 100644 --- a/eclass/sabayon-kernel.eclass +++ b/eclass/sabayon-kernel.eclass @@ -786,8 +786,8 @@ sabayon-kernel_uimage_config() { # 1. /boot/uImage symlink is broken (pkg_postrm) # 2. /boot/uImage symlink doesn't exist (pkg_postinst) - if ! has_version app-admin/eselect-uimage; then - ewarn "app-admin/eselect-uimage not installed" + if ! has_version app-eselect/uimage; then + ewarn "app-eselect/uimage not installed" ewarn "If you are using this tool, please install it" return 0 fi @@ -821,8 +821,8 @@ sabayon-kernel_bzimage_config() { use x86 && kern_arch="x86" use amd64 && kern_arch="x86_64" - if ! has_version app-admin/eselect-bzimage; then - ewarn "app-admin/eselect-bzimage not installed" + if ! has_version app-eselect/eselect-bzimage; then + ewarn "app-eselect/eselect-bzimage not installed" ewarn "If you are using this tool, please install it" return 0 fi -- cgit v1.2.3 From 7b703c77bfafe1ff53b54140e48d03109d3c257d Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Wed, 8 Apr 2015 02:08:51 +0300 Subject: [app-eselect/lightdm] upgrade to no-manifest --- app-eselect/eselect-lightdm/Manifest | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 app-eselect/eselect-lightdm/Manifest diff --git a/app-eselect/eselect-lightdm/Manifest b/app-eselect/eselect-lightdm/Manifest deleted file mode 100644 index 28551431..00000000 --- a/app-eselect/eselect-lightdm/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -AUX lightdm-0.2.eselect 4393 SHA256 3953380345fcb011f6f6786a1b3800f0e06ff05f7b3abd93eb734a71980bdd25 SHA512 1908ad4f363d2e7cc74ead0d52a90bc87f4752d7140b0e1098935f8f4446cc260ed73b629c895dda3afa3449718077ed70253a9becb60820d94cc2e278aeacc9 WHIRLPOOL be3248dee97a416ad84db3f080673edb7bfcffe08b4d24f9f97307a917bfb4f8cd3c132f5a59cf971ca8c00a1f9379caf328f93f9379643925288f7150283349 -EBUILD eselect-lightdm-0.2.ebuild 497 SHA256 46b5b60218693e53db3a98dcfcebc1c13a44fec4cc2a7d7b7b8ef2e33f2fee5d SHA512 3f46dd3b7ac03d93d416696f03cbeb54cbaaacecec0fbeaff446d19e47175988dddd0c264d7015c38bf70d7808cdf1dd96a7aa643632b809bf957bac15f20a3f WHIRLPOOL e1e14d07473480e70673c4ea3a5b0ada4e93eda083f78e4bf9906724d0bc0cb335fa1d3a332250a3b36056542d1707db6f06e3cdb1568b33172fe05cf9968be9 -- cgit v1.2.3 From 2398508a83981596627633a846d5cfb3f7e989a3 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Wed, 8 Apr 2015 02:10:57 +0300 Subject: [gnome-extra/gnome-shell] re-evaluate ebuild --- .../gnome-shell-windowlist/gnome-shell-windowlist-20120121.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-extra/gnome-shell-windowlist/gnome-shell-windowlist-20120121.ebuild b/gnome-extra/gnome-shell-windowlist/gnome-shell-windowlist-20120121.ebuild index 61845171..a730903e 100644 --- a/gnome-extra/gnome-shell-windowlist/gnome-shell-windowlist-20120121.ebuild +++ b/gnome-extra/gnome-shell-windowlist/gnome-shell-windowlist-20120121.ebuild @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86" IUSE="" -RDEPEND="app-admin/eselect-gnome-shell-extensions +RDEPEND="app-eselect/eselect-gnome-shell-extensions gnome-base/gnome-shell" DEPEND="" -- cgit v1.2.3 From 046475e06fd173e387e4e7afa5aea790b8c6fee8 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Thu, 9 Apr 2015 02:18:44 +0300 Subject: [app-crypt/pinentry-base] revamp of ebuild --- app-crypt/pinentry-base/pinentry-base-0.9.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-crypt/pinentry-base/pinentry-base-0.9.0.ebuild b/app-crypt/pinentry-base/pinentry-base-0.9.0.ebuild index e22651be..787d2e92 100644 --- a/app-crypt/pinentry-base/pinentry-base-0.9.0.ebuild +++ b/app-crypt/pinentry-base/pinentry-base-0.9.0.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~arm ~amd64 ~x86" IUSE="gtk qt4 caps static" RDEPEND=" - app-admin/eselect-pinentry + app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) sys-libs/ncurses static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) -- cgit v1.2.3 From 354a68cc9d1b8e44e51dc58ce8b70a22f1e475cb Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Thu, 9 Apr 2015 02:29:44 +0300 Subject: [x11-drivers/nvidia-userspace] moving to app-eselect --- x11-drivers/nvidia-userspace/nvidia-userspace-173.14.39.ebuild | 2 +- x11-drivers/nvidia-userspace/nvidia-userspace-304.125.ebuild | 2 +- x11-drivers/nvidia-userspace/nvidia-userspace-331.67.ebuild | 2 +- x11-drivers/nvidia-userspace/nvidia-userspace-337.25.ebuild | 2 +- x11-drivers/nvidia-userspace/nvidia-userspace-340.32.ebuild | 2 +- x11-drivers/nvidia-userspace/nvidia-userspace-340.46.ebuild | 2 +- x11-drivers/nvidia-userspace/nvidia-userspace-340.58.ebuild | 2 +- x11-drivers/nvidia-userspace/nvidia-userspace-340.76.ebuild | 2 +- x11-drivers/nvidia-userspace/nvidia-userspace-343.36.ebuild | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-173.14.39.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-173.14.39.ebuild index 504cdab8..b73da653 100644 --- a/x11-drivers/nvidia-userspace/nvidia-userspace-173.14.39.ebuild +++ b/x11-drivers/nvidia-userspace/nvidia-userspace-173.14.39.ebuild @@ -26,7 +26,7 @@ EMULTILIB_PKG="true" COMMON="x11-base/xorg-server kernel_linux? ( >=sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-opengl ) - >=app-admin/eselect-opengl-1.0.9" + >=app-eselect/eselect-opengl-1.0.9" DEPEND="${COMMON} kernel_linux? ( virtual/linux-sources )" # Note: do not add !>nvidia-userspace-ver or !nvidia-userspace-ver or !nvidia-userspace-ver or !nvidia-userspace-ver or !nvidia-userspace-ver or !nvidia-userspace-ver or !nvidia-userspace-ver or !nvidia-userspace-ver or !nvidia-userspace-ver or ! Date: Thu, 9 Apr 2015 02:30:10 +0300 Subject: [x11-drivers/ati-userspace] moving to app-eselect --- x11-drivers/ati-userspace/ati-userspace-11.10.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-11.11.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-11.12.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-11.6.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-11.8.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-11.9.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-12.10.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-12.2.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-12.3.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-12.4.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-12.6.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-12.8.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-13.1.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-13.12.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-13.4.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-13.9.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild | 2 +- x11-drivers/ati-userspace/ati-userspace-14.4.ebuild | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/x11-drivers/ati-userspace/ati-userspace-11.10.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.10.ebuild index 97f73d32..dec54b19 100644 --- a/x11-drivers/ati-userspace/ati-userspace-11.10.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-11.10.ebuild @@ -26,7 +26,7 @@ SLOT="1" RDEPEND="<=x11-base/xorg-server-1.10.99 !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 x11-apps/xauth x11-libs/libX11 x11-libs/libXext diff --git a/x11-drivers/ati-userspace/ati-userspace-11.11.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.11.ebuild index 14f897db..97d6c35e 100644 --- a/x11-drivers/ati-userspace/ati-userspace-11.11.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-11.11.ebuild @@ -26,7 +26,7 @@ SLOT="1" RDEPEND="<=x11-base/xorg-server-1.11.49 !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 x11-apps/xauth x11-libs/libX11 x11-libs/libXext diff --git a/x11-drivers/ati-userspace/ati-userspace-11.12.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.12.ebuild index 14f897db..97d6c35e 100644 --- a/x11-drivers/ati-userspace/ati-userspace-11.12.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-11.12.ebuild @@ -26,7 +26,7 @@ SLOT="1" RDEPEND="<=x11-base/xorg-server-1.11.49 !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 x11-apps/xauth x11-libs/libX11 x11-libs/libXext diff --git a/x11-drivers/ati-userspace/ati-userspace-11.6.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.6.ebuild index 94046c53..7060761f 100644 --- a/x11-drivers/ati-userspace/ati-userspace-11.6.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-11.6.ebuild @@ -26,7 +26,7 @@ SLOT="1" RDEPEND="<=x11-base/xorg-server-1.10.99 !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 x11-apps/xauth x11-libs/libX11 x11-libs/libXext diff --git a/x11-drivers/ati-userspace/ati-userspace-11.8.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.8.ebuild index f38ceffa..70be70a2 100644 --- a/x11-drivers/ati-userspace/ati-userspace-11.8.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-11.8.ebuild @@ -26,7 +26,7 @@ SLOT="1" RDEPEND="<=x11-base/xorg-server-1.10.99 !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 x11-apps/xauth x11-libs/libX11 x11-libs/libXext diff --git a/x11-drivers/ati-userspace/ati-userspace-11.9.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.9.ebuild index f38ceffa..70be70a2 100644 --- a/x11-drivers/ati-userspace/ati-userspace-11.9.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-11.9.ebuild @@ -26,7 +26,7 @@ SLOT="1" RDEPEND="<=x11-base/xorg-server-1.10.99 !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 x11-apps/xauth x11-libs/libX11 x11-libs/libXext diff --git a/x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild index 43dfae9e..4f079e54 100644 --- a/x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild @@ -26,7 +26,7 @@ SLOT="1" RDEPEND="<=x11-base/xorg-server-1.11.49 !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl x11-apps/xauth x11-libs/libX11 diff --git a/x11-drivers/ati-userspace/ati-userspace-12.10.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.10.ebuild index ca1a2625..08601cf6 100644 --- a/x11-drivers/ati-userspace/ati-userspace-12.10.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-12.10.ebuild @@ -22,7 +22,7 @@ RESTRICT="bindist" RDEPEND="<=x11-base/xorg-server-1.12.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth diff --git a/x11-drivers/ati-userspace/ati-userspace-12.2.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.2.ebuild index c218ac3c..8e7a6b65 100644 --- a/x11-drivers/ati-userspace/ati-userspace-12.2.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-12.2.ebuild @@ -26,7 +26,7 @@ SLOT="1" RDEPEND="<=x11-base/xorg-server-1.11.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl x11-apps/xauth x11-libs/libX11 diff --git a/x11-drivers/ati-userspace/ati-userspace-12.3.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.3.ebuild index 60b22299..9c8bcd71 100644 --- a/x11-drivers/ati-userspace/ati-userspace-12.3.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-12.3.ebuild @@ -26,7 +26,7 @@ SLOT="1" RDEPEND="<=x11-base/xorg-server-1.11.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl x11-apps/xauth x11-libs/libX11 diff --git a/x11-drivers/ati-userspace/ati-userspace-12.4.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.4.ebuild index 60b22299..9c8bcd71 100644 --- a/x11-drivers/ati-userspace/ati-userspace-12.4.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-12.4.ebuild @@ -26,7 +26,7 @@ SLOT="1" RDEPEND="<=x11-base/xorg-server-1.11.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl x11-apps/xauth x11-libs/libX11 diff --git a/x11-drivers/ati-userspace/ati-userspace-12.6.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.6.ebuild index 856267ef..6296ae5f 100644 --- a/x11-drivers/ati-userspace/ati-userspace-12.6.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-12.6.ebuild @@ -27,7 +27,7 @@ RESTRICT="bindist" RDEPEND="<=x11-base/xorg-server-1.12.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl x11-apps/xauth x11-libs/libX11 diff --git a/x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild index 938f51e9..7500a882 100644 --- a/x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild @@ -28,7 +28,7 @@ RESTRICT="bindist" RDEPEND="<=x11-base/xorg-server-1.12.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl x11-apps/xauth x11-libs/libX11 diff --git a/x11-drivers/ati-userspace/ati-userspace-12.8.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.8.ebuild index 46f487a5..c3a78943 100644 --- a/x11-drivers/ati-userspace/ati-userspace-12.8.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-12.8.ebuild @@ -27,7 +27,7 @@ RESTRICT="bindist" RDEPEND="<=x11-base/xorg-server-1.12.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl x11-apps/xauth x11-libs/libX11 diff --git a/x11-drivers/ati-userspace/ati-userspace-13.1.ebuild b/x11-drivers/ati-userspace/ati-userspace-13.1.ebuild index 57caf96f..d11ed452 100644 --- a/x11-drivers/ati-userspace/ati-userspace-13.1.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-13.1.ebuild @@ -24,7 +24,7 @@ RESTRICT="bindist" RDEPEND="<=x11-base/xorg-server-1.13.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth diff --git a/x11-drivers/ati-userspace/ati-userspace-13.12.ebuild b/x11-drivers/ati-userspace/ati-userspace-13.12.ebuild index 479b786a..a0014f9b 100644 --- a/x11-drivers/ati-userspace/ati-userspace-13.12.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-13.12.ebuild @@ -27,7 +27,7 @@ RESTRICT="bindist test" RDEPEND="<=x11-base/xorg-server-1.14.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth diff --git a/x11-drivers/ati-userspace/ati-userspace-13.4.ebuild b/x11-drivers/ati-userspace/ati-userspace-13.4.ebuild index abdf4cba..83360820 100644 --- a/x11-drivers/ati-userspace/ati-userspace-13.4.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-13.4.ebuild @@ -29,7 +29,7 @@ RESTRICT="bindist test" RDEPEND="<=x11-base/xorg-server-1.13.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth diff --git a/x11-drivers/ati-userspace/ati-userspace-13.9.ebuild b/x11-drivers/ati-userspace/ati-userspace-13.9.ebuild index 62a50e8a..48c7a900 100644 --- a/x11-drivers/ati-userspace/ati-userspace-13.9.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-13.9.ebuild @@ -25,7 +25,7 @@ RESTRICT="bindist test" RDEPEND="<=x11-base/xorg-server-1.14.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth diff --git a/x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild b/x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild index 20cde356..6059689a 100644 --- a/x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild @@ -25,7 +25,7 @@ RESTRICT="bindist test" RDEPEND=" <=x11-base/xorg-server-1.16.49[-minimal] - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth diff --git a/x11-drivers/ati-userspace/ati-userspace-14.4.ebuild b/x11-drivers/ati-userspace/ati-userspace-14.4.ebuild index ee9e70f5..bfcd84bf 100644 --- a/x11-drivers/ati-userspace/ati-userspace-14.4.ebuild +++ b/x11-drivers/ati-userspace/ati-userspace-14.4.ebuild @@ -25,7 +25,7 @@ RESTRICT="bindist test" RDEPEND="<=x11-base/xorg-server-1.14.49[-minimal] !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra - >=app-admin/eselect-opengl-1.0.7 + >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth -- cgit v1.2.3 From b4d13f7c6fffb2c9f6fd191e8510e52b9c439c36 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Thu, 9 Apr 2015 02:30:36 +0300 Subject: [app-misc/kogaion-live] moving to app-eselect --- app-misc/kogaion-live/kogaion-live-1.ebuild | 2 +- app-misc/kogaion-live/kogaion-live-2-r1.ebuild | 2 +- app-misc/kogaion-live/kogaion-live-2.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-misc/kogaion-live/kogaion-live-1.ebuild b/app-misc/kogaion-live/kogaion-live-1.ebuild index 8e7fc017..40d8a24c 100644 --- a/app-misc/kogaion-live/kogaion-live-1.ebuild +++ b/app-misc/kogaion-live/kogaion-live-1.ebuild @@ -19,7 +19,7 @@ IUSE="" DEPEND="" RDEPEND="!app-misc/livecd-tools - app-admin/eselect-opengl + app-eselect/eselect-opengl dev-util/dialog sys-apps/gawk sys-apps/pciutils diff --git a/app-misc/kogaion-live/kogaion-live-2-r1.ebuild b/app-misc/kogaion-live/kogaion-live-2-r1.ebuild index 34970d4d..11946d43 100644 --- a/app-misc/kogaion-live/kogaion-live-2-r1.ebuild +++ b/app-misc/kogaion-live/kogaion-live-2-r1.ebuild @@ -19,7 +19,7 @@ IUSE="" DEPEND="" RDEPEND="!app-misc/livecd-tools - app-admin/eselect-opengl + app-eselect/eselect-opengl dev-util/dialog sys-apps/gawk sys-apps/pciutils diff --git a/app-misc/kogaion-live/kogaion-live-2.ebuild b/app-misc/kogaion-live/kogaion-live-2.ebuild index de5f1161..20b6bc0f 100644 --- a/app-misc/kogaion-live/kogaion-live-2.ebuild +++ b/app-misc/kogaion-live/kogaion-live-2.ebuild @@ -19,7 +19,7 @@ IUSE="" DEPEND="" RDEPEND="!app-misc/livecd-tools - app-admin/eselect-opengl + app-eselect/eselect-opengl dev-util/dialog sys-apps/gawk sys-apps/pciutils -- cgit v1.2.3 From d76379ab2e5c4ab65bf44f9a9804069a20354019 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Thu, 9 Apr 2015 02:31:07 +0300 Subject: [net-misc/tigervnc] moving to app-eselect --- net-misc/tigervnc/Manifest | 1 - net-misc/tigervnc/tigervnc-1.2.0.ebuild | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index 8e3f9f39..841273fd 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -2,4 +2,3 @@ DIST tigervnc-1.2.0-patches-0.1.tar.bz2 10194 SHA256 cf58845892b50f1a9f01567747d DIST tigervnc-1.2.0.tar.gz 2487050 SHA256 6e0910f1ff1681bc8b52e7ea805e586b88b352c88f66e4c2cc31aa39c4a32f53 SHA512 a1ffe59f0db394455859a8de0551819f15f976689565fffc72c5eff9953e9678ff02f10dc0fc51931e251b6b8aee27c5c75c008ee6a7557f3db42911a90a27e5 WHIRLPOOL 5d2fc9be4cf9e281a29d27fc14362471d98b83bf3c396521ab267ad6fea24ed5c5ebeb81775af11ed06f3d0977fcda6976ea6dd16cfe798ed828442ef76a2c78 DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c DIST xorg-server-1.13.0.tar.bz2 5469168 SHA256 548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a SHA512 840a341f796386156ff4eb599c4b3b96090d3fda9cdbe70c45ff175c8d01b62cb9ba04a6c73ddde90996f8b96be1a3d925c9803a3b629cb4bc317374b7b1e014 WHIRLPOOL f52984556237f7c1dd4537727050e6b8347592ef5cd8e6787c65c3fee9bdcadb9709315929636fdc89a2fb4cdfd30f5224072954ed091eafb10fd8cd64a5ac30 -EBUILD tigervnc-1.2.0.ebuild 4881 SHA256 a17d99f14d540bb6403603e4a684b6e7da850aea8bc0f42e890d9ca7acc108c6 SHA512 63d142129fafececf893539b1ab78b8f8df2c5429dcf2bef43e7f75853e9a23ad38fa6e938111018b14bf7f51df3fb180f00a812eeae1404f56cb75c5d3c3355 WHIRLPOOL de083b54e1135643e46fe362862557e6046a680ba7189d43f5942425779a9489eb045f384b2cced0a22b1298732b3e5e35f0b4a3c89234c09b2804829b9c50c8 diff --git a/net-misc/tigervnc/tigervnc-1.2.0.ebuild b/net-misc/tigervnc/tigervnc-1.2.0.ebuild index 6cc27b7f..17dfe7d3 100644 --- a/net-misc/tigervnc/tigervnc-1.2.0.ebuild +++ b/net-misc/tigervnc/tigervnc-1.2.0.ebuild @@ -43,7 +43,7 @@ RDEPEND="virtual/jpeg >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 - opengl? ( >=app-admin/eselect-opengl-1.0.8 ) + opengl? ( >=app-eselect/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) ) !net-misc/vnc -- cgit v1.2.3 From 97e33617ca24c9deb14d3fa7ab7a3b4413f866a4 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sat, 11 Apr 2015 12:05:44 +0300 Subject: [dev-java/*] moving to app-eselect --- dev-java/eclipse-ecj/eclipse-ecj-3.3.0-r3.ebuild | 2 +- dev-java/eclipse-ecj/eclipse-ecj-3.4-r4.ebuild | 2 +- dev-java/eclipse-ecj/eclipse-ecj-3.5.2.ebuild | 2 +- dev-java/eclipse-ecj/eclipse-ecj-3.6.ebuild | 2 +- dev-java/eclipse-ecj/eclipse-ecj-3.7.1.ebuild | 2 +- dev-java/eclipse-ecj/eclipse-ecj-3.7.2.ebuild | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.3.0-r3.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.3.0-r3.ebuild index 9e5c9cae..f2083877 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-3.3.0-r3.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-3.3.0-r3.ebuild @@ -17,7 +17,7 @@ KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x8 SLOT="3.3" IUSE="" -COMMON_DEPEND="app-admin/eselect-ecj" +COMMON_DEPEND="app-eselect/eselect-ecj" RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPEND}" DEPEND=" Date: Sat, 11 Apr 2015 12:06:06 +0300 Subject: [gsl*] moving to app-eselect --- sci-libs/gsl-empty/gsl-empty-1.15.ebuild | 2 +- sci-libs/gsl/gsl-1.15.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-libs/gsl-empty/gsl-empty-1.15.ebuild b/sci-libs/gsl-empty/gsl-empty-1.15.ebuild index aa5de3c1..9d8b0ab0 100644 --- a/sci-libs/gsl-empty/gsl-empty-1.15.ebuild +++ b/sci-libs/gsl-empty/gsl-empty-1.15.ebuild @@ -21,7 +21,7 @@ IUSE="cblas-external static-libs" RDEPEND="cblas-external? ( virtual/cblas )" DEPEND="${RDEPEND} - app-admin/eselect-cblas + app-eselect/eselect-cblas virtual/pkgconfig" DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO ) diff --git a/sci-libs/gsl/gsl-1.15.ebuild b/sci-libs/gsl/gsl-1.15.ebuild index ef216e67..5fad25b5 100644 --- a/sci-libs/gsl/gsl-1.15.ebuild +++ b/sci-libs/gsl/gsl-1.15.ebuild @@ -17,7 +17,7 @@ IUSE="cblas-external static-libs" RDEPEND="cblas-external? ( virtual/cblas )" DEPEND="${RDEPEND} - app-admin/eselect-cblas + app-eselect/eselect-cblas virtual/pkgconfig" DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO ) -- cgit v1.2.3 From 540a66df8c1e66387db4232789af1ee85cc21226 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sat, 11 Apr 2015 12:06:33 +0300 Subject: [x11-base/xorg-server] moving to app-eselect --- x11-base/xorg-server/xorg-server-1.15.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-base/xorg-server/xorg-server-1.15.0.ebuild b/x11-base/xorg-server/xorg-server-1.15.0.ebuild index 0b2ac5c9..b87199f4 100644 --- a/x11-base/xorg-server/xorg-server-1.15.0.ebuild +++ b/x11-base/xorg-server/xorg-server-1.15.0.ebuild @@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-f IUSE_SERVERS="dmx kdrive xnest xorg xvfb" IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev unwind" -CDEPEND=">=app-admin/eselect-opengl-1.0.8 +CDEPEND=">=app-eselect/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 -- cgit v1.2.3 From 3f84915ecf462e5fb1f6250babd11b44c484703d Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sat, 11 Apr 2015 12:07:01 +0300 Subject: [app-misc/rogentos-live] moving to eselect --- app-misc/rogentos-live/rogentos-live-1.ebuild | 2 +- app-misc/rogentos-live/rogentos-live-2-r1.ebuild | 2 +- app-misc/rogentos-live/rogentos-live-2.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-misc/rogentos-live/rogentos-live-1.ebuild b/app-misc/rogentos-live/rogentos-live-1.ebuild index 3a47607f..fa74b8eb 100644 --- a/app-misc/rogentos-live/rogentos-live-1.ebuild +++ b/app-misc/rogentos-live/rogentos-live-1.ebuild @@ -18,7 +18,7 @@ IUSE="" DEPEND="" RDEPEND="!app-misc/livecd-tools - app-admin/eselect-opengl + app-eselect/eselect-opengl dev-util/dialog sys-apps/gawk sys-apps/pciutils diff --git a/app-misc/rogentos-live/rogentos-live-2-r1.ebuild b/app-misc/rogentos-live/rogentos-live-2-r1.ebuild index 3f028a48..fb9faa46 100644 --- a/app-misc/rogentos-live/rogentos-live-2-r1.ebuild +++ b/app-misc/rogentos-live/rogentos-live-2-r1.ebuild @@ -18,7 +18,7 @@ IUSE="" DEPEND="" RDEPEND="!app-misc/livecd-tools - app-admin/eselect-opengl + app-eselect/eselect-opengl dev-util/dialog sys-apps/gawk sys-apps/pciutils diff --git a/app-misc/rogentos-live/rogentos-live-2.ebuild b/app-misc/rogentos-live/rogentos-live-2.ebuild index 0a231479..b0b9195f 100644 --- a/app-misc/rogentos-live/rogentos-live-2.ebuild +++ b/app-misc/rogentos-live/rogentos-live-2.ebuild @@ -18,7 +18,7 @@ IUSE="" DEPEND="" RDEPEND="!app-misc/livecd-tools - app-admin/eselect-opengl + app-eselect/eselect-opengl dev-util/dialog sys-apps/gawk sys-apps/pciutils -- cgit v1.2.3 From 1dbd9d236db089781740ffb2c7de0c4ca23f4146 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sun, 12 Apr 2015 18:16:19 +0300 Subject: [dev-vcs/subversion] new version and patch --- dev-vcs/subversion/Manifest | 1 + dev-vcs/subversion/files/svnserve.initd3 | 21 ++ dev-vcs/subversion/subversion-1.8.13.ebuild | 466 ++++++++++++++++++++++++++++ 3 files changed, 488 insertions(+) create mode 100644 dev-vcs/subversion/files/svnserve.initd3 create mode 100644 dev-vcs/subversion/subversion-1.8.13.ebuild diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index 2d004a41..b8d96dfe 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -1,3 +1,4 @@ DIST subversion-1.8.10.tar.bz2 6899384 SHA256 1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc SHA512 a03e618ee700132a1668668519cccc34dbd46777acfbaa9c3f1769d53a1ee4499a10c53c9b212d27e17b259e19d071b672f247cfcc6502e10122a852ae1b6bd0 WHIRLPOOL bff8ce6509263a6de6a19d135c96f50f4bba24c539a3d0a7300b547c8a264ddd6d3ba38b78680a9dceb171306819ca2835f00d1cf4afa7a9001ae104567c4022 DIST subversion-1.8.11.tar.bz2 6896225 SHA256 10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9 SHA512 86c4ff71a0f448895f26cb1674d1e7230ceacfa5cb2a0ccf28589b8c7f30ff65d2bb6b2c201b95ce53b7b877de98e1a69bf291a8cea4e4005afbbb1d0a62aae1 WHIRLPOOL 08c782e2f578a613e5c380922c05230b3ed0114b28f0dbd6a976089db5f563b160641158682e1d53481b06a961a401e26114452517e51e16a0fc12c0c88b3247 +DIST subversion-1.8.13.tar.bz2 6863330 SHA256 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 SHA512 5b145888fdd294b871066483f9cc5af811aadd88c537c3859b005b73efaf66bd8d5c7c4dc6562897c00331be2ddfd834688a90eb5c229bc6625ab3c45c02045f WHIRLPOOL d79c71385e21ee3254a798687fd1de3e01a1577287b03d9a0f87e0a31621501e749ee9b37f40c59cb206fc68ba9968132e724f3c4a12c7aa8d5aa59d66a4ade4 DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad diff --git a/dev-vcs/subversion/files/svnserve.initd3 b/dev-vcs/subversion/files/svnserve.initd3 new file mode 100644 index 00000000..2a4fd4b0 --- /dev/null +++ b/dev-vcs/subversion/files/svnserve.initd3 @@ -0,0 +1,21 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/files/svnserve.initd3,v 1.1 2015/04/09 12:58:45 polynomial-c Exp $ + +description="svn server" +pidfile="/var/run/svnserve.pid" +command="/usr/bin/svnserve" +command_args="--foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn}" +command_background="true" +start_stop_daemon_args="-u ${SVNSERVE_USER:-apache} -g ${SVNSERVE_GROUP:-apache}" + +depend() { + need net +} + +start_pre() { + # Ensure that we run from a readable working dir, and that we do not + # lock filesystems when being run from such a location. + cd / +} diff --git a/dev-vcs/subversion/subversion-1.8.13.ebuild b/dev-vcs/subversion/subversion-1.8.13.ebuild new file mode 100644 index 00000000..5c3122bb --- /dev/null +++ b/dev-vcs/subversion/subversion-1.8.13.ebuild @@ -0,0 +1,466 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_OPTIONAL=1 +WANT_AUTOMAKE="none" +GENTOO_DEPEND_ON_PERL="no" + +SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz ) +inherit sab-patches autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool multilib perl-module eutils + +MY_P="${P/_/-}" +DESCRIPTION="Advanced version control system" +HOMEPAGE="http://subversion.apache.org/" +SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + +sab-patches_update_SRC_URI + +LICENSE="Subversion GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax" + +COMMON_DEPEND=">=dev-db/sqlite-3.7.12 + >=dev-libs/apr-1.3:1 + >=dev-libs/apr-util-1.3:1 + dev-libs/expat + sys-apps/file + sys-libs/zlib + app-arch/bzip2 + berkdb? ( >=sys-libs/db-4.0.14:= ) + ctypes-python? ( ${PYTHON_DEPS} ) + gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) + kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + ruby? ( >=dev-lang/ruby-2.1:2.1 + dev-ruby/rubygems[ruby_targets_ruby21] ) + sasl? ( dev-libs/cyrus-sasl ) + http? ( >=net-libs/serf-1.2.1 )" +RDEPEND="${COMMON_DEPEND} + apache2? ( www-servers/apache[apache2_modules_dav] ) + kde? ( || ( kde-apps/kwalletd:4 kde-base/kwalletd ) ) + nls? ( virtual/libintl ) + perl? ( dev-perl/URI )" +# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once +DEPEND="${COMMON_DEPEND} + test? ( ${PYTHON_DEPS} ) + !!/dev/null)")" + einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." + fi + fi + einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" + einfo + + if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then + eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" + eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." + eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"." + eerror "Aborting to avoid possible run-time crashes." + die "Berkeley DB version mismatch" + fi + fi + + depend.apache_pkg_setup + + if ! use http ; then + ewarn "WebDAV support is disabled. You need WebDAV to" + ewarn "access repositories through the HTTP protocol." + ewarn "Consider enabling \"http\" USE flag" + echo -ne "\a" + fi + + if use debug ; then + append-cppflags -DSVN_DEBUG -DAP_DEBUG + fi + + # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E + [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ + + # Allow for custom repository locations. + SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" +} + +src_prepare() { + local SAB_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) + sab-patches_apply_all + epatch_user + + fperms +x build/transform_libtool_scripts.sh + + sed -i \ + -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ + -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac + + # this bites us in particular on Solaris + sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ + die "/bin/sh is not POSIX shell!" + + eautoconf + elibtoolize + + sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \ + -i build-outputs.mk || die "sed failed" + + if use python ; then + if [[ ${CHOST} == *-darwin* ]] ; then + # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C20130614113003.GA19257@tarsus.local2%3E + # in short, we don't have gnome-keyring stuff here, patch + # borrowed from MacPorts + die "Darwin not supported; use Gentoo ebuild" # no need to bother with the patch for our needs + #epatch "${FILESDIR}"/...swig-python-no-gnome-keyring.patch + fi + + # XXX: make python_copy_sources accept path + S=${S}/subversion/bindings/swig/python python_copy_sources + rm -r "${S}"/subversion/bindings/swig/python || die + fi +} + +src_configure() { + local myconf + + if use python || use perl || use ruby; then + myconf+=" --with-swig" + else + myconf+=" --without-swig" + fi + + case ${CHOST} in + *-aix*) + # avoid recording immediate path to sharedlibs into executables + append-ldflags -Wl,-bnoipath + ;; + *-interix*) + # loader crashes on the LD_PRELOADs... + myconf+=" --disable-local-library-preloading" + ;; + *-solaris*) + # need -lintl to link + use nls && append-libs intl + # this breaks installation, on x64 echo replacement is 32-bits + myconf+=" --disable-local-library-preloading" + ;; + *-mint*) + myconf+=" --enable-all-static --disable-local-library-preloading" + ;; + *) + # inject LD_PRELOAD entries for easy in-tree development + myconf+=" --enable-local-library-preloading" + ;; + esac + + #version 1.7.7 again tries to link against the older installed version and fails, when trying to + #compile for x86 on amd64, so workaround this issue again + #check newer versions, if this is still/again needed + myconf+=" --disable-disallowing-of-undefined-references" + + # for build-time scripts + if use ctypes-python || use python || use test; then + python_export_best + fi + + if use python && [[ ${CHOST} == *-darwin* ]] ; then + export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' + export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' + export ac_cv_python_compile="$(tc-getCC)" + fi + + # force ruby-2.1 + # allow overriding Python include directory + ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby21 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc21 \ + ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ + econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ + $(use_with apache2 apache-libexecdir) \ + $(use_with apache2 apxs "${APXS}") \ + $(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \ + $(use_with ctypes-python ctypesgen "${EPREFIX}/usr") \ + $(use_enable dso runtime-module-search) \ + $(use_with gnome-keyring) \ + --disable-javahl \ + $(use_with kde kwallet) \ + $(use_enable nls) \ + $(use_with sasl) \ + $(use_with http serf) \ + ${myconf} \ + --with-apr="${EPREFIX}/usr/bin/apr-1-config" \ + --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \ + --disable-experimental-libtool \ + --without-jikes \ + --disable-mod-activation \ + --disable-static +} + +src_compile() { + emake local-all + + if use ctypes-python ; then + # pre-generate .py files + use ctypes-python && emake ctypes-python + + pushd subversion/bindings/ctypes-python >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi + + if use python ; then + swig_py_compile() { + local p=subversion/bindings/swig/python + rm -f ${p} || die + ln -s "${BUILD_DIR}" ${p} || die + + python_export PYTHON_INCLUDEDIR + emake swig-py \ + swig_pydir="$(python_get_sitedir)/libsvn" \ + swig_pydir_extra="$(python_get_sitedir)/svn" + } + + # this will give us proper BUILD_DIR for symlinking + BUILD_DIR=python \ + python_foreach_impl swig_py_compile + fi + + if use perl ; then + emake swig-pl + fi + + if use ruby ; then + emake swig-rb + fi + + if use extras ; then + emake tools + fi + + if use doc ; then + doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" + fi +} + +src_test() { + if has_version ~${CATEGORY}/${P} ; then + default + + if use ctypes-python ; then + python_test() { + "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \ + || die "ctypes-python tests fail with ${EPYTHON}" + } + + distutils-r1_src_test + fi + + if use python ; then + swig_py_test() { + pushd "${BUILD_DIR}" >/dev/null || die + "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}" + popd >/dev/null || die + } + + BUILD_DIR=subversion/bindings/swig/python \ + python_foreach_impl swig_py_test + fi + else + ewarn "The test suite shows errors when there is an older version of" + ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*" + ewarn "before running the test suite." + ewarn "Test suite skipped." + fi +} + +src_install() { + emake -j1 DESTDIR="${D}" local-install + + if use ctypes-python ; then + pushd subversion/bindings/ctypes-python >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die + fi + + if use python ; then + swig_py_install() { + local p=subversion/bindings/swig/python + rm -f ${p} || die + ln -s "${BUILD_DIR}" ${p} || die + + emake \ + DESTDIR="${D}" \ + swig_pydir="$(python_get_sitedir)/libsvn" \ + swig_pydir_extra="$(python_get_sitedir)/svn" \ + install-swig-py + } + + BUILD_DIR=python \ + python_foreach_impl swig_py_install + fi + + if use perl ; then + emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl + perl_delete_localpod + find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete + fi + + if use ruby ; then + emake DESTDIR="${D}" install-swig-rb + fi + + # Install Apache module configuration. + if use apache2 ; then + keepdir "${APACHE_MODULES_CONFDIR}" + insinto "${APACHE_MODULES_CONFDIR}" + doins "${FILESDIR}/47_mod_dav_svn.conf" + fi + + # Install Bash Completion, bug 43179. + newbashcomp tools/client-side/bash_completion svn + bashcomp_alias svn svn{admin,dumpfilter,look,sync,version} + rm -f tools/client-side/bash_completion + + # Install hot backup script, bug 54304. + newbin tools/backup/hot-backup.py svn-hot-backup + rm -fr tools/backup + + # Install svnserve init-script and xinet.d snippet, bug 43245. + newinitd "${FILESDIR}"/svnserve.initd3 svnserve + newconfd "${FILESDIR}"/svnserve.confd svnserve + insinto /etc/xinetd.d + newins "${FILESDIR}"/svnserve.xinetd svnserve + + #adjust default user and group with disabled apache2 USE flag, bug 381385 + use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \ + -e "s\GROUP:-apache\GROUP:-svnusers\g" \ + -i "${ED}"etc/init.d/svnserve || die + use apache2 || sed -e "0,/apache/s//svn/" \ + -e "s:apache:svnusers:" \ + -i "${ED}"etc/xinetd.d/svnserve || die + + # Install documentation. + dodoc CHANGES COMMITTERS README + dodoc tools/xslt/svnindex.{css,xsl} + rm -fr tools/xslt + + # Install extra files. + if use extras ; then + cat << EOF > 80subversion-extras +PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" +ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" +EOF + doenvd 80subversion-extras + + emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools + + find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr + rm -fr tools/client-side/svnmucc + rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* + rm -fr tools/{buildbot,dev,diff,po} + + insinto /usr/share/${PN} + find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die + doins -r tools + fi + + if use doc ; then + dohtml -r doc/doxygen/html/* + fi + + prune_libtool_files --all + + cd "${ED}"usr/share/locale + for i in * ; do + [[ $i == *$LINGUAS* ]] || { rm -r $i || die ; } + done +} + +pkg_preinst() { + # Compare versions of Berkeley DB, bug 122877. + if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]] ; then + OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then + CHANGED_BDB_VERSION="1" + fi + fi +} + +pkg_postinst() { + if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then + ewarn "You upgraded from an older version of Berkeley DB and may experience" + ewarn "problems with your repository. Run the following commands as root to fix it:" + ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" + ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" + fi + + ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches." +} + +pkg_postrm() { + : +} + +pkg_config() { + # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC} + # already has EPREFIX in it + einfo "Initializing the database in ${SVN_REPOS_LOC}..." + if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then + echo "A Subversion repository already exists and I will not overwrite it." + echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version." + else + mkdir -p "${SVN_REPOS_LOC}/conf" + + einfo "Populating repository directory..." + # Create initial repository. + "${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos" + + einfo "Setting repository permissions..." + SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" + SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" + if use apache2 ; then + [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" + [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" + else + [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" + [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" + fi + chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf" + chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos" + echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet." + echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\"" + echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet." + echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\"" + echo "to finish the configuration." + fi +} -- cgit v1.2.3 From c04ea80a68f7b11cb0d558eaf7465e3696fb98c7 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sun, 12 Apr 2015 18:18:04 +0300 Subject: [dev-vcs/subversion] path correct --- dev-vcs/subversion/subversion-1.8.13.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-vcs/subversion/subversion-1.8.13.ebuild b/dev-vcs/subversion/subversion-1.8.13.ebuild index 5c3122bb..31614b52 100644 --- a/dev-vcs/subversion/subversion-1.8.13.ebuild +++ b/dev-vcs/subversion/subversion-1.8.13.ebuild @@ -8,7 +8,7 @@ DISTUTILS_OPTIONAL=1 WANT_AUTOMAKE="none" GENTOO_DEPEND_ON_PERL="no" -SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz ) +SAB_PATCHES_SRC=( mirror://kogaion/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz ) inherit sab-patches autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool multilib perl-module eutils MY_P="${P/_/-}" -- cgit v1.2.3 From cf9e1ef0b6c30c34031f2d4b5e5fe250b90a87ea Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sun, 12 Apr 2015 19:03:26 +0300 Subject: [kde-base/oxygen-icons] major revamp --- kde-base/oxygen-icons/oxygen-icons-4.10.4.ebuild | 2 +- kde-base/oxygen-icons/oxygen-icons-4.9.0.ebuild | 2 +- kde-base/oxygen-icons/oxygen-icons-4.9.1.ebuild | 2 +- kde-base/oxygen-icons/oxygen-icons-4.9.2.ebuild | 2 +- kde-base/oxygen-icons/oxygen-icons-4.9.3.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kde-base/oxygen-icons/oxygen-icons-4.10.4.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.10.4.ebuild index e9e1e714..c3d48d3f 100644 --- a/kde-base/oxygen-icons/oxygen-icons-4.10.4.ebuild +++ b/kde-base/oxygen-icons/oxygen-icons-4.10.4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: Exp $ -EAPI=4 +EAPI=5 if [[ ${PV} == *9999 ]]; then KMNAME="kdesupport" diff --git a/kde-base/oxygen-icons/oxygen-icons-4.9.0.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.9.0.ebuild index 3213a25f..fc502065 100644 --- a/kde-base/oxygen-icons/oxygen-icons-4.9.0.ebuild +++ b/kde-base/oxygen-icons/oxygen-icons-4.9.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: Exp $ -EAPI=4 +EAPI=5 if [[ ${PV} == *9999 ]]; then KMNAME="kdesupport" diff --git a/kde-base/oxygen-icons/oxygen-icons-4.9.1.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.9.1.ebuild index 3213a25f..fc502065 100644 --- a/kde-base/oxygen-icons/oxygen-icons-4.9.1.ebuild +++ b/kde-base/oxygen-icons/oxygen-icons-4.9.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: Exp $ -EAPI=4 +EAPI=5 if [[ ${PV} == *9999 ]]; then KMNAME="kdesupport" diff --git a/kde-base/oxygen-icons/oxygen-icons-4.9.2.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.9.2.ebuild index ee29b964..69f2b584 100644 --- a/kde-base/oxygen-icons/oxygen-icons-4.9.2.ebuild +++ b/kde-base/oxygen-icons/oxygen-icons-4.9.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: Exp $ -EAPI=4 +EAPI=5 if [[ ${PV} == *9999 ]]; then KMNAME="kdesupport" diff --git a/kde-base/oxygen-icons/oxygen-icons-4.9.3.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.9.3.ebuild index e9e1e714..c3d48d3f 100644 --- a/kde-base/oxygen-icons/oxygen-icons-4.9.3.ebuild +++ b/kde-base/oxygen-icons/oxygen-icons-4.9.3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: Exp $ -EAPI=4 +EAPI=5 if [[ ${PV} == *9999 ]]; then KMNAME="kdesupport" -- cgit v1.2.3 From accbf06fc6adda2849f2931c5d1c5d5520077480 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sun, 12 Apr 2015 19:10:04 +0300 Subject: (*) major revamp of ebuilds, upgrading EAPIs --- app-office/libreoffice-l10n-ro/Manifest | 1 + .../libreoffice-l10n-ro-4.4.1.ebuild | 9 + gnome-base/libgnome/Manifest | 1 - gnome-base/libgnome/libgnome-2.32.0.ebuild | 55 ---- gnome-base/libgnome/libgnome-2.32.1.ebuild | 45 ++-- media-tv/kodi/Manifest | 2 + media-tv/kodi/files/generate.sh | 34 +++ .../kodi/files/kodi-14.0-dvddemux-ffmpeg.patch | 16 ++ media-tv/kodi/files/kodi-14.1-no-arm-flags.patch | 16 ++ media-tv/kodi/files/kodi-9999-nomythtv.patch | 67 +++++ media-tv/kodi/files/kodi-9999-texturepacker.patch | 17 ++ media-tv/kodi/kodi-14.1.ebuild | 277 +++++++++++++++++++++ 12 files changed, 467 insertions(+), 73 deletions(-) create mode 100644 app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.4.1.ebuild delete mode 100644 gnome-base/libgnome/libgnome-2.32.0.ebuild create mode 100644 media-tv/kodi/Manifest create mode 100644 media-tv/kodi/files/generate.sh create mode 100644 media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch create mode 100644 media-tv/kodi/files/kodi-14.1-no-arm-flags.patch create mode 100644 media-tv/kodi/files/kodi-9999-nomythtv.patch create mode 100644 media-tv/kodi/files/kodi-9999-texturepacker.patch create mode 100644 media-tv/kodi/kodi-14.1.ebuild diff --git a/app-office/libreoffice-l10n-ro/Manifest b/app-office/libreoffice-l10n-ro/Manifest index a70129f5..34e92886 100644 --- a/app-office/libreoffice-l10n-ro/Manifest +++ b/app-office/libreoffice-l10n-ro/Manifest @@ -1,2 +1,3 @@ DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ro.tar.gz 2397321 SHA256 00e3266a72527a6ec3fb3ff6d3f1f875f6573bf6407854e22790544e9c3dc1ee SHA512 cca0a147906e5488b90d9386931e5e6e4cb803c339365d1e75a9db5e55f82f724a5e680f834dc3ea38fd3684e95e37c10e7594ed47405f5daf8761dc17487cf0 WHIRLPOOL 0b7a3980aaae93e61ee4ac757242b496b4b7c0d76999ec318e16612e86015bdd2a043c479b742037c9a1b42cb9550cbaa0f9216e4c93b989cfcaaeedeb033da5 DIST LibreOffice_4.2.6-secfix_Linux_x86_rpm_langpack_ro.tar.gz 2396709 SHA256 e761f901a24ab95ea1490623b6467a3631329470315f6aa7ea55dce47821189c SHA512 dbb28913867538ddf9fedd301b4deb70a811b66ed07cd2a894b1b39d6499f2a7f45901e047e7a1d21c9a4ead8fc1ac446c9ab8b7a95f133dc148c918b31aa610 WHIRLPOOL 9d2033a7997b9f923bb3ea335b2fab6d3af894a924ea6498aa309d4232ad8634d1643b47ffdc69139d00d9dd3ae034b023557fc0582741f23ab17f9139810580 +DIST LibreOffice_4.4.1_Linux_x86_rpm_langpack_ro.tar.gz 2368593 SHA256 c7a5c914c4929fcbb78eb03d1faa263467d59b1dd68d7ca9d0c8eb9f93cc177b SHA512 785d0d976760e4706c148519a076b2458a16caf954dfd146510cb7cfe4a5c9b3b3dbee3869fee12972ae089d1a5f3d4195d1bcf97323942f2745a22be397c6ea WHIRLPOOL b7da3d19b06218d1ea0e0b3eccf79ee771f8fb40814d3cc5e82e9fa1347d83286c0c9d56f0778de32209c8d6c55c69a93c238024a76c8d029fc9626ec8e9eb3f diff --git a/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.4.1.ebuild b/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.4.1.ebuild new file mode 100644 index 00000000..716c9730 --- /dev/null +++ b/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.4.1.ebuild @@ -0,0 +1,9 @@ +# Copyright 2004-2011 Sabayon Linux +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +HELPPACK_AVAIL="0" +L10N_LANG="Romanian" +inherit libreoffice-l10n-2 + diff --git a/gnome-base/libgnome/Manifest b/gnome-base/libgnome/Manifest index e4b2b518..305a9199 100644 --- a/gnome-base/libgnome/Manifest +++ b/gnome-base/libgnome/Manifest @@ -1,3 +1,2 @@ DIST gentoo-gdm-theme-r3.tar.bz2 411703 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a WHIRLPOOL bac9f9ef3e7e88401e605c34deca6e7c31e2d4456af3781252a91f7bc33084af27ecc9e4a74022767b25db23d8f70842a39225c8544f1c02229ad7f7af670d42 -DIST libgnome-2.32.0.tar.bz2 1731179 SHA256 d65e49bf075eb2b3efebec38ceb409693154d18396365765da1a71630bc3dd02 DIST libgnome-2.32.1.tar.bz2 1776006 SHA256 b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4 SHA512 f94e603255a93e73249e0fd9ed5604d732b44ad46f3cc3065afb46fc6162f6cf29304f49440b5c06303b8e68608b6fd16236076813febb5f1cbdcde4bfc3b3e3 WHIRLPOOL b5d04cbbbf7064fdd6ccf6e140ac89285c585a82a66687fc9ce3ec5d74f50ec52d52416fadfa34bb79946c99188aa3bf6aa0b7d597c8d3d526f6938c74f602a6 diff --git a/gnome-base/libgnome/libgnome-2.32.0.ebuild b/gnome-base/libgnome/libgnome-2.32.0.ebuild deleted file mode 100644 index a207f4e0..00000000 --- a/gnome-base/libgnome/libgnome-2.32.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.32.0.ebuild,v 1.2 2010/10/21 21:33:15 eva Exp $ - -EAPI="3" -GCONF_DEBUG="yes" - -inherit gnome2 eutils - -DESCRIPTION="Essential Gnome Libraries" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="doc esd" - -SRC_URI="${SRC_URI}" - -RDEPEND=">=gnome-base/gconf-2 - >=dev-libs/glib-2.16 - >=gnome-base/gnome-vfs-2.5.3 - >=gnome-base/libbonobo-2.13 - >=dev-libs/popt-1.7 - media-libs/libcanberra - esd? ( - >=media-sound/esound-0.2.26 - >=media-libs/audiofile-0.2.3 )" - -DEPEND="${RDEPEND} - >=dev-lang/perl-5 - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.17 - doc? ( >=dev-util/gtk-doc-1 )" - -PDEPEND="gnome-base/gvfs" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-schemas-install - --enable-sound - $(use_enable esd)" - DOCS="AUTHORS ChangeLog NEWS README" -} - -src_prepare() { - gnome2_src_prepare - - # Make sure menus have icons. People don't like change - epatch "${FILESDIR}/${PN}-2.28.0-menus-have-icons.patch" - - # Sabayon customization - epatch "${FILESDIR}/${PN}-2.32-sabayon-background.patch" -} - diff --git a/gnome-base/libgnome/libgnome-2.32.1.ebuild b/gnome-base/libgnome/libgnome-2.32.1.ebuild index 7df916e0..2d6cec1c 100644 --- a/gnome-base/libgnome/libgnome-2.32.1.ebuild +++ b/gnome-base/libgnome/libgnome-2.32.1.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.32.1.ebuild,v 1.6 2011/03/22 19:16:21 ranger Exp $ +# $Header: $ -EAPI="3" +EAPI="4" GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" +GNOME_TARBALL_SUFFIX="bz2" inherit gnome2 eutils @@ -12,43 +14,52 @@ HOMEPAGE="http://library.gnome.org/devel/libgnome/stable/" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="doc esd" +KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +IUSE="branding doc" + +SRC_URI="${SRC_URI} + branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )" RDEPEND=">=gnome-base/gconf-2 - >=dev-libs/glib-2.16 + >=dev-libs/glib-2.16:2 >=gnome-base/gnome-vfs-2.5.3 >=gnome-base/libbonobo-2.13 >=dev-libs/popt-1.7 - media-libs/libcanberra - esd? ( - >=media-sound/esound-0.2.26 - >=media-libs/audiofile-0.2.3 )" + media-libs/libcanberra" DEPEND="${RDEPEND} >=dev-lang/perl-5 >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.17 + virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1 )" PDEPEND="gnome-base/gvfs" pkg_setup() { G2CONF="${G2CONF} + --disable-static --disable-schemas-install --enable-canberra - $(use_enable esd)" + --disable-esd" DOCS="AUTHORS ChangeLog NEWS README" } src_prepare() { gnome2_src_prepare + # Sabayon customization + epatch "${FILESDIR}/${PN}-2.32-sabayon-background.patch" + # Make sure menus have icons. People don't like change epatch "${FILESDIR}/${PN}-2.28.0-menus-have-icons.patch" - # Sabayon customization - epatch "${FILESDIR}/${PN}-2.32-sabayon-background.patch" + use branding && epatch "${FILESDIR}"/${PN}-2.26.0-branding.patch + + # Default to Adwaita theme over Clearlooks to proper gtk3 support + sed -i -e 's/Clearlooks/Adwaita/' schemas/desktop_gnome_interface.schemas.in.in || die + + # Drop DEPRECATED flags + sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' libgnome/Makefile.* || die } src_install() { @@ -56,9 +67,9 @@ src_install() { if use branding; then # Add gentoo backgrounds - dodir /usr/share/pixmaps/backgrounds/gnome/gentoo || die "dodir failed" + dodir /usr/share/pixmaps/backgrounds/gnome/gentoo insinto /usr/share/pixmaps/backgrounds/gnome/gentoo - doins "${WORKDIR}"/gentoo-emergence/gentoo-emergence.png || die "doins 1 failed" - doins "${WORKDIR}"/gentoo-cow/gentoo-cow-alpha.png || die "doins 2 failed" + doins "${WORKDIR}"/gentoo-emergence/gentoo-emergence.png + doins "${WORKDIR}"/gentoo-cow/gentoo-cow-alpha.png fi } diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest new file mode 100644 index 00000000..4ef5ffdc --- /dev/null +++ b/media-tv/kodi/Manifest @@ -0,0 +1,2 @@ +DIST kodi-14.1-generated-addons.tar.xz 71072 SHA256 0666eae88a3214f7577544975524b95a9f55b107cde5124d5d299351427c5d39 SHA512 a26889ba8af33316ac61bbf5a55ec6cd72cb867eac9b6d7c626ff890f3287de8704cf8372a5e2b72d6075ab8c31ba3d8465d1da0c9437065fe6e0171a560142f WHIRLPOOL 34a7067964febd71d5e07333a1ef90c14ad3d7d09e82aa4a3245b8174b068a1b2b31d0d6e5d20a449d11d34701b59611b725c8f37ce61702489c84bda16f227a +DIST kodi-14.1.tar.gz 70832109 SHA256 a38059e292cf8523918834e49fcc2d688525ceb7951ddf7f5ee535f4147255d6 SHA512 05dccad279073fc804faf2f179ba370f612d53c823dd333fdd151e05de37eb8202cc981ba48afff695d475bafde9c8f05f562fe09883593a70299a2f098a9849 WHIRLPOOL 464ff2673c9e65466dff73d3c91b8754ee68d64b4a18ebb0b0c6e8efa2da1cc32ab22686530a8469a105bf7a089d8928db64c5c61d272462c13485006875b506 diff --git a/media-tv/kodi/files/generate.sh b/media-tv/kodi/files/generate.sh new file mode 100644 index 00000000..2e5b67fb --- /dev/null +++ b/media-tv/kodi/files/generate.sh @@ -0,0 +1,34 @@ +#!/bin/bash +# Generate the various interface files that normally requires java. +# This makes building the release versions much nicer. + +set -eux + +PV=$1 +PN=kodi +P="${PN}-${PV}" +DISTDIR="/usr/portage/distfiles" +GITDIR="/usr/local/src/kodi/git" + +if [[ ${PV} != "9999" ]] ; then + rm -rf xbmc-*/ + tar xf ${DISTDIR}/${P}.tar.gz + d=$(echo xbmc-*/) +else + stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d) + P+="-${stamp}" + cd ${GITDIR} + d=. +fi +#cd ${d} && git init . && git add . && git commit -qmm && cd .. +make -C ${d} -j -f codegenerator.mk +tar="${DISTDIR}/${P}-generated-addons.tar.xz" +tar cf - \ + ${d}/xbmc/interfaces/python/generated/*.cpp \ + ${d}/xbmc/interfaces/json-rpc/ServiceDescription.h \ + | xz > "${tar}" +if [[ ${PV} != "9999" ]] ; then + rm -rf xbmc-*/ +fi + +du -b "${tar}" diff --git a/media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch b/media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch new file mode 100644 index 00000000..94b86666 --- /dev/null +++ b/media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch @@ -0,0 +1,16 @@ +sniped from: +http://cvs.rpmfusion.org/viewvc/rpms/kodi/devel/kodi-14.0-dvddemux-ffmpeg.patch?root=free&view=markup + +--- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp ++++ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +@@ -519,10 +519,6 @@ + + void CDVDDemuxFFmpeg::Flush() + { +- // naughty usage of an internal ffmpeg function +- if (m_pFormatContext) +- av_read_frame_flush(m_pFormatContext); +- + m_currentPts = DVD_NOPTS_VALUE; + + m_pkt.result = -1; diff --git a/media-tv/kodi/files/kodi-14.1-no-arm-flags.patch b/media-tv/kodi/files/kodi-14.1-no-arm-flags.patch new file mode 100644 index 00000000..82a73835 --- /dev/null +++ b/media-tv/kodi/files/kodi-14.1-no-arm-flags.patch @@ -0,0 +1,16 @@ +http://bugs.gentoo.org/400617 + +do not force any particular ABI or FPU or SIMD compiler flags for arm +targets. let the toolchain and user CFLAGS control that. + +--- a/configure.in ++++ b/configure.in +@@ -571,7 +571,7 @@ + elif test "$target_platform" = "target_raspberry_pi"; then + ARCH="arm" + use_arch="arm" +-elif test "$use_arch" = "arm"; then ++elif false; then + CFLAGS="$CFLAGS -mno-apcs-stack-check" + CXXFLAGS="$CXXFLAGS -mno-apcs-stack-check" + FFMPEG_EXTRACFLAGS="" diff --git a/media-tv/kodi/files/kodi-9999-nomythtv.patch b/media-tv/kodi/files/kodi-9999-nomythtv.patch new file mode 100644 index 00000000..40ab23b9 --- /dev/null +++ b/media-tv/kodi/files/kodi-9999-nomythtv.patch @@ -0,0 +1,67 @@ +http://trac.xbmc.org/ticket/11775 + +make mythtv support optional + +diff --git a/Makefile.in b/Makefile.in +index 9ffae7e..17cc525 100755 +--- a/Makefile.in ++++ b/Makefile.in +@@ -209,7 +209,7 @@ LIB_DIRS=\ + lib/cpluff \ + lib/xbmc-dll-symbols + +-ifeq (@USE_MYSQL@,1) ++ifeq (@USE_MYTHTV@,1) + LIB_DIRS += lib/cmyth + CMYTH=cmyth + endif +diff --git a/configure.in b/configure.in +index d44825f..629d7b4 100755 +--- a/configure.in ++++ b/configure.in +@@ -479,6 +479,12 @@ AC_ARG_ENABLE([mysql], + [AS_HELP_STRING([--disable-mysql], + [disable mysql])], + ++AC_ARG_ENABLE([mythtv], ++ [AS_HELP_STRING([--disable-mythtv], ++ [disable mythtv])], ++ [use_mythtv=$enableval], ++ [use_mythtv=yes]) ++ + AC_ARG_ENABLE([webserver], + [AS_HELP_STRING([--disable-webserver], + [disable webserver])], +@@ -1080,6 +1086,9 @@ if test "$use_mysql" = "yes"; then + else + AC_MSG_ERROR($missing_program) + fi ++ if test "$use_mythtv" = "yes"; then ++ AC_DEFINE([HAVE_MYTHTV],[1],["Define to 1 if you want mythtv support"]) ++ fi + fi + AC_CHECK_HEADER([ass/ass.h],, AC_MSG_ERROR($missing_library)) + AC_CHECK_HEADER([mpeg2dec/mpeg2.h],, AC_MSG_ERROR($missing_library)) +@@ -2372,6 +2381,15 @@ else + final_message="$final_message\n MySQL:\tNo" + USE_MYSQL=0 + fi ++ ++if test "$use_mythtv" = "yes"; then ++ final_message="$final_message\n MythTV:\tYes" ++ USE_MYTHTV=1 ++else ++ final_message="$final_message\n MythTV:\tNo" ++ USE_MYTHTV=0 ++fi ++ + if test "$use_webserver" = "yes"; then + final_message="$final_message\n Webserver:\tYes" + USE_WEB_SERVER=1 +@@ -2675,6 +2693,7 @@ AC_SUBST(USE_LIBUDEV) + AC_SUBST(USE_LIBUSB) + AC_SUBST(USE_LIBCEC) + AC_SUBST(USE_MYSQL) ++AC_SUBST(USE_MYTHTV) + AC_SUBST(USE_WAYLAND) + diff --git a/media-tv/kodi/files/kodi-9999-texturepacker.patch b/media-tv/kodi/files/kodi-9999-texturepacker.patch new file mode 100644 index 00000000..fe3dcdcf --- /dev/null +++ b/media-tv/kodi/files/kodi-9999-texturepacker.patch @@ -0,0 +1,17 @@ +--- tools/depends/native/TexturePacker/Makefile.old 2015-03-17 22:29:18.880029509 +0100 ++++ tools/depends/native/TexturePacker/Makefile 2015-03-17 22:29:41.459671679 +0100 +@@ -9,14 +9,10 @@ + + ifeq ($(NATIVEPLATFORM),) + PLATFORM = native +- EXTRA_CONFIGURE = --enable-static + else + PLATFORM = $(NATIVEPLATFORM) + endif + +-ifeq ($(NATIVE_OS), linux) +- EXTRA_CONFIGURE = --enable-static +-endif + ifeq ($(NATIVE_OS), android) + EXTRA_CONFIGURE = --enable-static + endif diff --git a/media-tv/kodi/kodi-14.1.ebuild b/media-tv/kodi/kodi-14.1.ebuild new file mode 100644 index 00000000..11fbcb5b --- /dev/null +++ b/media-tv/kodi/kodi-14.1.ebuild @@ -0,0 +1,277 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" + +# Does not work with py3 here +# It might work with py:2.5 but I didn't test that +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" + +inherit eutils python-single-r1 multiprocessing autotools + +CODENAME="Helix" +case ${PV} in +9999) + EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" + inherit git-2 + ;; +*|*_p*) + MY_PV=${PV/_p/_r} + MY_P="${PN}-${MY_PV}" + SRC_URI="http://mirrors.kodi.tv/releases/source/${MY_PV}-${CODENAME}.tar.gz -> ${P}.tar.gz + http://mirrors.kodi.tv/releases/source/${MY_P}-generated-addons.tar.xz" + KEYWORDS="~amd64 ~x86" + + S=${WORKDIR}/xbmc-${PV}-${CODENAME} + ;; +esac + +DESCRIPTION="Kodi is a free and open source media-player and entertainment hub" +HOMEPAGE="http://kodi.tv/ http://kodi.wiki/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="airplay avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba sdl sftp test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X +xrandr" +REQUIRED_USE=" + pvr? ( mysql ) + rsxs? ( X ) + xrandr? ( X ) + joystick? ( sdl ) +" + +COMMON_DEPEND="${PYTHON_DEPS} + app-arch/bzip2 + app-arch/unzip + app-arch/zip + app-i18n/enca + airplay? ( app-pda/libplist ) + dev-libs/boost + dev-libs/expat + dev-libs/fribidi + dev-libs/libcdio[-minimal] + cec? ( >=dev-libs/libcec-2.2 ) + dev-libs/libpcre[cxx] + dev-libs/libxml2 + dev-libs/libxslt + >=dev-libs/lzo-2.04 + dev-libs/tinyxml[stl] + dev-libs/yajl + dev-python/simplejson[${PYTHON_USEDEP}] + media-fonts/corefonts + media-fonts/roboto + media-libs/alsa-lib + media-libs/flac + media-libs/fontconfig + media-libs/freetype + >=media-libs/glew-1.5.6 + media-libs/jasper + media-libs/jbigkit + >=media-libs/libass-0.9.7 + bluray? ( media-libs/libbluray ) + css? ( media-libs/libdvdcss ) + media-libs/libmad + media-libs/libmodplug + media-libs/libmpeg2 + media-libs/libogg + media-libs/libpng + projectm? ( media-libs/libprojectm ) + media-libs/libsamplerate + sdl? ( media-libs/libsdl2 ) + >=media-libs/taglib-1.8 + media-libs/libvorbis + media-libs/tiff + pulseaudio? ( media-sound/pulseaudio ) + media-sound/wavpack + rtmp? ( media-video/rtmpdump ) + avahi? ( net-dns/avahi ) + nfs? ( net-fs/libnfs ) + webserver? ( net-libs/libmicrohttpd[messages] ) + sftp? ( net-libs/libssh[sftp] ) + net-misc/curl + samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) + bluetooth? ( net-wireless/bluez ) + sys-apps/dbus + caps? ( sys-libs/libcap ) + sys-libs/zlib + virtual/jpeg + usb? ( virtual/libusb ) + mysql? ( virtual/mysql ) + opengl? ( + virtual/glu + virtual/opengl + ) + gles? ( + virtual/opengl + media-libs/mesa[gles2] + ) + vaapi? ( x11-libs/libva[opengl] ) + vdpau? ( + x11-libs/libvdpau + >=x11-drivers/nvidia-drivers-180.51 + ) + X? ( + x11-apps/xdpyinfo + x11-apps/mesa-progs + x11-libs/libXinerama + xrandr? ( x11-libs/libXrandr ) + x11-libs/libXrender + )" +RDEPEND="${COMMON_DEPEND} + !media-tv/xbmc + udisks? ( sys-fs/udisks:0 ) + upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + dev-lang/swig + dev-util/gperf + texturepacker? ( + media-libs/libsdl + media-libs/sdl-image + ) + sdl? ( media-libs/sdl-image ) + X? ( x11-proto/xineramaproto ) + dev-util/cmake + x86? ( dev-lang/nasm ) + java? ( virtual/jre ) + test? ( dev-cpp/gtest )" +# Force java for latest git version to avoid having to hand maintain the +# generated addons package. #488118 +[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre" + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_unpack() { + [[ ${PV} == "9999" ]] && git-2_src_unpack || default +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch + epatch "${FILESDIR}"/${P}-no-arm-flags.patch #400617 + epatch "${FILESDIR}"/${PN}-14.0-dvddemux-ffmpeg.patch #526992#36 + # The mythtv patch touches configure.ac, so force a regen + rm -f configure + + # some dirs ship generated autotools, some dont + multijob_init + local d + for d in $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do + [[ -e ${d} ]] && continue + pushd ${d/%configure/.} >/dev/null || die + AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \ + multijob_child_init eautoreconf + popd >/dev/null + done + multijob_finish + elibtoolize + + [[ ${PV} == "9999" ]] && emake -f codegenerator.mk + + # Disable internal func checks as our USE/DEPEND + # stuff handles this just fine already #408395 + export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes + + # Fix the final version string showing as "exported" + # instead of the SVN revision number. + export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported} + + # avoid long delays when powerkit isn't running #348580 + sed -i \ + -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ + xbmc/linux/*.cpp || die + + epatch_user #293109 + + # Tweak autotool timestamps to avoid regeneration + find . -type f -exec touch -r configure {} + +} + +src_configure() { + # Disable documentation generation + export ac_cv_path_LATEX=no + # Avoid help2man + export HELP2MAN=$(type -P help2man || echo true) + # No configure flage for this #403561 + export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth) + # Requiring java is asine #434662 + [[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true)) + + econf \ + --docdir=/usr/share/doc/${PF} \ + --disable-ccache \ + --disable-optimizations \ + --disable-external-ffmpeg \ + $(use_enable airplay) \ + $(use_enable avahi) \ + $(use_enable bluray libbluray) \ + $(use_enable caps libcap) \ + $(use_enable cec libcec) \ + $(use_enable css dvdcss) \ + $(use_enable debug) \ + $(use_enable fishbmc) \ + $(use_enable gles) \ + $(use_enable goom) \ + $(use_enable joystick) \ + $(use_enable midi mid) \ + $(use_enable mysql) \ + $(use_enable nfs) \ + $(use_enable opengl gl) \ + $(use_enable profile profiling) \ + $(use_enable projectm) \ + $(use_enable pulseaudio pulse) \ + $(use_enable pvr mythtv) \ + $(use_enable rsxs) \ + $(use_enable rtmp) \ + $(use_enable samba) \ + $(use_enable sdl) \ + $(use_enable sftp ssh) \ + $(use_enable usb libusb) \ + $(use_enable test gtest) \ + $(use_enable texturepacker) \ + $(use_enable upnp) \ + $(use_enable vaapi) \ + $(use_enable vdpau) \ + $(use_enable webserver) \ + $(use_enable X x11) \ + $(use_enable xrandr) +} + +src_install() { + default + rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* + + domenu tools/Linux/kodi.desktop + newicon media/icon48x48.png kodi.png + + # Remove optional addons (platform specific and disabled by USE flag). + local disabled_addons=( + repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org + visualization.dxspectrum + ) + use fishbmc || disabled_addons+=( visualization.fishbmc ) + use projectm || disabled_addons+=( visualization.{milkdrop,projectm} ) + use rsxs || disabled_addons+=( screensaver.rsxs.{euphoria,plasma,solarwinds} ) + rm -rf "${disabled_addons[@]/#/${ED}/usr/share/kodi/addons/}" + + # Remove fonconfig settings that are used only on MacOSX. + # Can't be patched upstream because they just find all files and install + # them into same structure like they have in git. + rm -rf "${ED}"/usr/share/kodi/system/players/dvdplayer/etc + + # Replace bundled fonts with system ones + # teletext.ttf: unknown + # bold-caps.ttf: unknown + # roboto: roboto-bold, roboto-regular + # arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514 + rm -rf "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* + dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \ + /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf + dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \ + /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Bold.ttf + + python_domodule tools/EventClients/lib/python/xbmcclient.py + python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send +} -- cgit v1.2.3 From 67cf6aefadfc7c8a867e36ae3cd5bb4c6b9e786f Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sun, 12 Apr 2015 19:25:10 +0300 Subject: [app-office/libreoffice-l10n-ro] fixed the syntaxes --- app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.2.5.ebuild | 2 +- app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.2.6.ebuild | 2 +- app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.4.1.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.2.5.ebuild b/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.2.5.ebuild index 716c9730..3fba8053 100644 --- a/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.2.5.ebuild +++ b/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.2.5.ebuild @@ -1,7 +1,7 @@ # Copyright 2004-2011 Sabayon Linux # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=5 HELPPACK_AVAIL="0" L10N_LANG="Romanian" diff --git a/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.2.6.ebuild b/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.2.6.ebuild index 716c9730..3fba8053 100644 --- a/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.2.6.ebuild +++ b/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.2.6.ebuild @@ -1,7 +1,7 @@ # Copyright 2004-2011 Sabayon Linux # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=5 HELPPACK_AVAIL="0" L10N_LANG="Romanian" diff --git a/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.4.1.ebuild b/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.4.1.ebuild index 716c9730..3fba8053 100644 --- a/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.4.1.ebuild +++ b/app-office/libreoffice-l10n-ro/libreoffice-l10n-ro-4.4.1.ebuild @@ -1,7 +1,7 @@ # Copyright 2004-2011 Sabayon Linux # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=5 HELPPACK_AVAIL="0" L10N_LANG="Romanian" -- cgit v1.2.3 From a7d46835589d6f8d584f40ac191c50edd11ebb96 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sun, 12 Apr 2015 19:25:42 +0300 Subject: [dev-python/pytox] fixed the syntax --- dev-python/pytox/pytox-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/pytox/pytox-9999.ebuild b/dev-python/pytox/pytox-9999.ebuild index 448efcc1..bd756139 100644 --- a/dev-python/pytox/pytox-9999.ebuild +++ b/dev-python/pytox/pytox-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="4" +EAPI="5" PYTHON_COMPAT=( python{2_7,3_3} ) inherit distutils-r1 eutils @@ -25,4 +25,4 @@ DEPEND="${RDEPEND}" src_prepare() { epatch_user -} \ No newline at end of file +} -- cgit v1.2.3 From 903ff82fb42eda2857f47657c37bdbb911986cbe Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sun, 12 Apr 2015 19:27:08 +0300 Subject: [eclass] fixed syntaxes from eclasses --- eclass/libreoffice-l10n-2.eclass | 68 ++++++++++++++++++++++++---------------- eclass/rogentos-artwork.eclass | 6 ++-- 2 files changed, 44 insertions(+), 30 deletions(-) diff --git a/eclass/libreoffice-l10n-2.eclass b/eclass/libreoffice-l10n-2.eclass index e57c83ce..cea31107 100644 --- a/eclass/libreoffice-l10n-2.eclass +++ b/eclass/libreoffice-l10n-2.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2012 Sabayon Linux +# Copyright 2004-2014 Sabayon Linux # Distributed under the terms of the GNU General Public License v2 # $ @@ -11,13 +11,13 @@ OO_EXTENSIONS=( "b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt" ) -inherit base rpm multilib versionator office-ext-r1 +inherit base rpm multilib versionator MY_LANG=${PN/libreoffice-l10n-/} MY_LANG=${MY_LANG/_/-} # export all the available functions here -EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_postinst pkg_prerm +EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install # @ECLASS-VARIABLE: L10N_LANG # @DESCRIPTION: @@ -36,22 +36,48 @@ LANGPACK_AVAIL="${LANGPACK_AVAIL:-1}" DESCRIPTION="LibreOffice.org ${L10N_LANG} localisation" HOMEPAGE="http://www.documentfoundation.org" -RESTRICT="nomirror" +RESTRICT="mirror" L10N_VER="$(get_version_component_range 1-3)" -L10N_RC_VERSION="rc2" +L10N_RC_VERSION="$(get_version_component_range 4)" LO_BRANCH=$(get_version_component_range 1-2) -BASE_SRC_URI="http://download.documentfoundation.org/libreoffice/stable/${L10N_VER}/rpm" +if [ -n "${L10N_RC_VERSION}" ]; then + # this is a RC, thus testing + BASE_SRC_URI="http://download.documentfoundation.org/libreoffice/testing/${L10N_VER}/rpm" + TARBALL_VERSION="${L10N_VER}.${L10N_RC_VERSION}" +else + BASE_SRC_URI="http://download.documentfoundation.org/libreoffice/stable/${L10N_VER}/rpm" + TARBALL_VERSION="${L10N_VER}" +fi SRC_URI="" +if [ "$(get_version_component_range 1)" = "3" ]; then + URI_PREFIX="LibO" + RPM_SUFFIX_LANG="langpack-rpm" + RPM_SUFFIX_HELP="helppack-rpm" +else + URI_PREFIX="LibreOffice" + RPM_SUFFIX_LANG="rpm_langpack" + RPM_SUFFIX_HELP="rpm_helppack" +fi + +# remove "name_part" when not needed +if [[ ${PV} = 4.2.6.* || ${PV} = 4.2.6 ]]; then + name_part=-secfix +else + name_part= +fi + # try guessing if [ "${LANGPACK_AVAIL}" = "1" ]; then - SRC_URI+="${BASE_SRC_URI}/x86/LibO_${L10N_VER}_Linux_x86_langpack-rpm_${MY_LANG}.tar.gz" + SRC_URI+="${BASE_SRC_URI}/x86/${URI_PREFIX}_${TARBALL_VERSION}${name_part}_Linux_x86_${RPM_SUFFIX_LANG}_${MY_LANG}.tar.gz" fi if [ "${HELPPACK_AVAIL}" = "1" ]; then - SRC_URI+=" ${BASE_SRC_URI}/x86/LibO_${L10N_VER}_Linux_x86_helppack-rpm_${MY_LANG}.tar.gz" + SRC_URI+=" ${BASE_SRC_URI}/x86/${URI_PREFIX}_${TARBALL_VERSION}${name_part}_Linux_x86_${RPM_SUFFIX_HELP}_${MY_LANG}.tar.gz" fi +unset name_part + IUSE="" EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice" @@ -83,22 +109,20 @@ libreoffice-l10n-2_src_unpack() { local dir=${lang/_/-} # for english we provide just helppack, as translation is always there if [[ "${LANGPACK_AVAIL}" == "1" ]]; then - rpmdir="LibO_${L10N_VER}${L10N_RC_VERSION}_Linux_x86_langpack-rpm_${dir}/RPMS/" - [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\"" + rpmdir="${URI_PREFIX}_${TARBALL_VERSION}"*"_Linux_x86_${RPM_SUFFIX_LANG}_${dir}/RPMS/" # First remove dictionaries, we want to use system ones. rm -rf "${S}/${rpmdir}/"*dict*.rpm einfo "Unpacking Langpack" - rpm_unpack "./${rpmdir}/"*.rpm + rpm_unpack ./${rpmdir}/*.rpm fi if [[ "${HELPPACK_AVAIL}" == "1" ]]; then - rpmdir="LibO_${L10N_VER}${L10N_RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPMS/" - [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\"" + rpmdir="${URI_PREFIX}_${TARBALL_VERSION}"*"_Linux_x86_${RPM_SUFFIX_HELP}_${dir}/RPMS/" einfo "Unpacking Helppack" - rpm_unpack ./"${rpmdir}/"*.rpm + rpm_unpack ./${rpmdir}/*.rpm fi if [[ -n "${TDEPEND}" ]]; then if use templates; then - for i in ${OO_EXTENSIONS[@]}; do + for i in "${OO_EXTENSIONS[@]}"; do if [[ ! -f "${S}/${i}" ]]; then cp -v "${DISTDIR}/${i}" "${S}" ooextused+=( "${i}" ) @@ -107,8 +131,8 @@ libreoffice-l10n-2_src_unpack() { fi fi OO_EXTENSIONS=() - for i in ${ooextused[@]}; do - OO_EXTENSIONS+=( ${i} ) + for i in "${ooextused[@]}"; do + OO_EXTENSIONS+=( "${i}" ) done } @@ -126,14 +150,4 @@ libreoffice-l10n-2_src_install() { fi # remove extensions that are in the l10n for some weird reason rm -rf "${ED}"/usr/$(get_libdir)/libreoffice/share/extensions/ - - echo "${OO_EXTENSIONS[@]}" - office-ext_src_install -} - -libreoffice-l10n-2_pkg_postinst() { - office-ext_pkg_postinst -} -libreoffice-l10n-2_pkg_prerm() { - office-ext_pkg_prerm } diff --git a/eclass/rogentos-artwork.eclass b/eclass/rogentos-artwork.eclass index 6a74a673..33a84601 100644 --- a/eclass/rogentos-artwork.eclass +++ b/eclass/rogentos-artwork.eclass @@ -44,14 +44,14 @@ update_kernel_initramfs_splash() { } -# @FUNCTION: update_sabayon_kernel_initramfs_splash -# @USAGE: update_sabayon_kernel_initramfs_splash +# @FUNCTION: _update_kogaionkernel_initramfs_splash +# @USAGE: _update_kogaionkernel_initramfs_splash # # @AUTHOR: # Fabio Erculiani # @MAINTAINER: # Brindusa Stefan Cristian -update_sabayon_kernel_initramfs_splash() { +_update_kogaionkernel_initramfs_splash() { local splash_name="${GFX_SPLASH_NAME}" local override_splash_file="${ROOT}etc/${splash_name}" if [ -f "${override_splash_file}" ]; then -- cgit v1.2.3 From 4724d0e2369227208e39652cd2635d5d8dc18fec Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 13 Apr 2015 15:50:16 +0100 Subject: this should remove circular deps between lightdm and lightdm-gtk-greeter --- x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild | 3 +-- x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild | 3 +-- x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.7.0.ebuild | 3 +-- x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.9.0.ebuild | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild index 9288f4b2..00b53ab8 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild @@ -14,8 +14,7 @@ KEYWORDS="amd64 arm ~ppc x86" IUSE="" # This ebuild needs custom Rogentos themes, thus it must depend on rogentos-artwork-core -DEPEND="x11-libs/gtk+:3 - >=x11-misc/lightdm-1.2.2" +DEPEND="x11-libs/gtk+:3" RDEPEND="app-eselect/eselect-lightdm x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild index 13eafaf6..c61d936e 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild @@ -14,8 +14,7 @@ KEYWORDS="amd64 ~arm ~ppc x86" IUSE="" # This ebuild needs custom Sabayon themes, thus it must depend on kogaion-artwork-core -DEPEND="x11-libs/gtk+:3 - >=x11-misc/lightdm-1.2.2" +DEPEND="x11-libs/gtk+:3" RDEPEND="app-eselect/eselect-lightdm x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.7.0.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.7.0.ebuild index a8aef2e6..1e3d327e 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.7.0.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.7.0.ebuild @@ -16,8 +16,7 @@ KEYWORDS="amd64 ~arm ~ppc x86" IUSE="" # This ebuild needs custom RogentOS themes, thus it must depend on rogentos-artwork-core -DEPEND="x11-libs/gtk+:3 - >=x11-misc/lightdm-1.2.2" +DEPEND="x11-libs/gtk+:3" RDEPEND="!! Date: Tue, 14 Apr 2015 23:33:07 +0300 Subject: [x11-misc/lightdm] upgrading lightdm ebuilds --- x11-misc/lightdm/lightdm-1.10.3.ebuild | 21 +++++++++++++++++++++ x11-misc/lightdm/lightdm-1.12.2.ebuild | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 x11-misc/lightdm/lightdm-1.10.3.ebuild create mode 100644 x11-misc/lightdm/lightdm-1.12.2.ebuild diff --git a/x11-misc/lightdm/lightdm-1.10.3.ebuild b/x11-misc/lightdm/lightdm-1.10.3.ebuild new file mode 100644 index 00000000..9eeeb7de --- /dev/null +++ b/x11-misc/lightdm/lightdm-1.10.3.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +DESCRIPTION="LightDM meta package" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="+gtk +introspection kde qt4" +REQUIRED_USE="|| ( gtk kde )" + +COMMON_DEPEND="~x11-misc/lightdm-base-${PV}[introspection=] + qt4? ( ~x11-misc/lightdm-qt4-${PV} )" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND} + gtk? ( x11-misc/lightdm-gtk-greeter ) + kde? ( x11-misc/lightdm-kde )" diff --git a/x11-misc/lightdm/lightdm-1.12.2.ebuild b/x11-misc/lightdm/lightdm-1.12.2.ebuild new file mode 100644 index 00000000..9eeeb7de --- /dev/null +++ b/x11-misc/lightdm/lightdm-1.12.2.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +DESCRIPTION="LightDM meta package" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="+gtk +introspection kde qt4" +REQUIRED_USE="|| ( gtk kde )" + +COMMON_DEPEND="~x11-misc/lightdm-base-${PV}[introspection=] + qt4? ( ~x11-misc/lightdm-qt4-${PV} )" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND} + gtk? ( x11-misc/lightdm-gtk-greeter ) + kde? ( x11-misc/lightdm-kde )" -- cgit v1.2.3 From 074ed875b74f3c34cc354b8e0deda21b55d13b6c Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 14 Apr 2015 23:34:11 +0300 Subject: [x11-misc/lightdm-base] upgrading lightdm-base ebuilds --- x11-misc/lightdm-base/Manifest | 1 + x11-misc/lightdm-base/lightdm-base-1.10.3.ebuild | 108 +++++++++++++++++++++++ x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild | 2 +- 3 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 x11-misc/lightdm-base/lightdm-base-1.10.3.ebuild diff --git a/x11-misc/lightdm-base/Manifest b/x11-misc/lightdm-base/Manifest index 743983d4..c9615fb7 100644 --- a/x11-misc/lightdm-base/Manifest +++ b/x11-misc/lightdm-base/Manifest @@ -1,4 +1,5 @@ DIST introspection-20110205.m4.tar.bz2 1220 SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be WHIRLPOOL 0765c0a72919b26d0c8c38714450eec578a347bfc1c59d4950b633b64b17aa1cde38dfb87fdcd6e2f364c98d6c0bd3dadaa9c2a9711bd1b5ac09a583b988f500 +DIST lightdm-1.10.3.tar.xz 469992 SHA256 1e31b99eba6626ed46b7940cd53cbd585fa53a433258371490ce74dbd047889c SHA512 95000ac3686ec81bc9925ca1dd5007422b8f7b74ae63c239af4e2fe16bfb75d778a26301897516da2d6792e0a8cf519dfbfb13bc9b531f9b7856a0c99c66b2a1 WHIRLPOOL 5b97c0090c60efc0a2edcc6f8d8788b089233f0630fcc418f3d5c2aaf58940c26e1b0b449f1ef7c9240c0f0ab300df28d8eb221aa46aa2c65487228740fd9a70 DIST lightdm-1.12.2.tar.xz 473360 SHA256 ce36bacef7a0ac5b720dc0f4aeb1c37aa56e7b72f7390e290a670fb1b8231736 SHA512 bf3a9ce659929fb628f869ce2d4570bf46d7ae5481df2423ba845c2b652f9d6ae7a0017c5a48ac4d1b72135163031e5382edead313a6f58613c7e8d3b5f449d1 WHIRLPOOL 9bf0f0c52ad8d4bd1537a907f3c438f9f91c28c0812f9c98792c35a0149d2f8fa2f08c5d9781f671292d1c29675d4c1eae5473b3b32f40cb23f8d06c81c586c3 DIST lightdm-1.4.0.tar.gz 660979 SHA256 3486a9f828864a78d452696cf6fef6e1dec2f4ef92a72e90ab37edf9a0824c43 SHA512 dedea48dbf2dde1a84c63691474b6452340b7ba5abd9793afb02f3ffcdb4d664432e3e4bbd6151bfb5861424c1063b42ca99989642b970b4a804ed8bfea6fb1e WHIRLPOOL 0def63f88e3f6ab810411bd51f53984d5cdb832faa81f33d0dd2243b774c06362d20d1c91d32c79f2630c8e543834ed3f5cf411c76843702ed997f60bad30212 DIST lightdm-1.8.5.tar.xz 449024 SHA256 c1a55800628c7a683a529e32646eae4be32295a09af049c9b15387acff0232a2 SHA512 a3941560abe402b07e5595a6fb6bcbd9df36f775b07ac23c526a14c25c1bc2e9ce4e2f912354446111f58499d9df92c650b44b05dbd1e49b5207722d5bf7985f WHIRLPOOL aabc3adf3412b92b235fc8c2674d6807d5bf5c0714a73ac62b558decf779f98a5fbf9151ec00498c4ef3032b153d7735ca216d9451fdd11924f72dab77e7f4ef diff --git a/x11-misc/lightdm-base/lightdm-base-1.10.3.ebuild b/x11-misc/lightdm-base/lightdm-base-1.10.3.ebuild new file mode 100644 index 00000000..ca1c16e7 --- /dev/null +++ b/x11-misc/lightdm-base/lightdm-base-1.10.3.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +inherit autotools eutils pam readme.gentoo systemd versionator + +TRUNK_VERSION="$(get_version_component_range 1-2)" +REAL_PN="${PN/-base}" +REAL_P="${P/-base}" +DESCRIPTION="A lightweight display manager, base libraries and programs" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM" +SRC_URI="http://launchpad.net/${REAL_PN}/${TRUNK_VERSION}/${PV}/+download/${REAL_P}.tar.xz + mirror://gentoo/introspection-20110205.m4.tar.bz2" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="+introspection" +S="${WORKDIR}/${REAL_P}" + +COMMON_DEPEND=">=dev-libs/glib-2.32.3:2 + dev-libs/libxml2 + sys-apps/accountsservice + virtual/pam + x11-libs/libX11 + >=x11-libs/libxklavier-5 + introspection? ( >=dev-libs/gobject-introspection-1 )" + +RDEPEND="${COMMON_DEPEND} + >=sys-auth/pambase-20101024-r2" +DEPEND="${COMMON_DEPEND} + dev-util/gtk-doc-am + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" +PDEPEND="app-eselect/eselect-lightdm" + +DOCS=( NEWS ) + +src_prepare() { + sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369 + sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die + + einfo "Fixing the session-wrapper variable in lightdm.conf" + sed -i -e \ + "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ + data/lightdm.conf || die "Failed to fix lightdm.conf" + + epatch_user + + # Remove bogus Makefile statement. This needs to go upstream + sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die + if has_version dev-libs/gobject-introspection; then + eautoreconf + else + AT_M4DIR=${WORKDIR} eautoreconf + fi +} + +src_configure() { + # Set default values if global vars unset + local _user + _user=${LIGHTDM_USER:=root} + # Let user know how lightdm is configured + einfo "Kogaion configuration" + einfo "Greeter user: ${_user}" + + # also disable tests because libsystem.c does not build. Tests are + # restricted so it does not matter anyway. + econf \ + --localstatedir=/var \ + --disable-static \ + --disable-tests \ + --disable-liblightdm-qt \ + --disable-liblightdm-qt5 \ + --with-greeter-user=${_user} \ + $(use_enable introspection) \ + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html +} + +src_install() { + default + + # Delete apparmor profiles because they only work with Ubuntu's + # apparmor package. Bug #494426 + if [[ -d ${D}/etc/apparmor.d ]]; then + rm -r "${D}/etc/apparmor.d" || die \ + "Failed to remove apparmor profiles" + fi + + insinto /etc/${REAL_PN} + doins data/{${REAL_PN},keys}.conf + doins "${FILESDIR}"/Xsession + fperms +x /etc/${REAL_PN}/Xsession + # /var/lib/lightdm-data could be useful. Bug #522228 + dodir /var/lib/lightdm-data + + prune_libtool_files --all + rm -rf "${ED}"/etc/init + + pamd_mimic system-local-login ${REAL_PN} auth account session #372229 + dopamd "${FILESDIR}"/${REAL_PN}-autologin #390863, #423163 + + readme.gentoo_create_doc + + systemd_dounit "${FILESDIR}/${REAL_PN}.service" +} diff --git a/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild b/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild index b8f2b642..ca1c16e7 100644 --- a/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild +++ b/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild @@ -63,7 +63,7 @@ src_configure() { local _user _user=${LIGHTDM_USER:=root} # Let user know how lightdm is configured - einfo "Sabayon configuration" + einfo "Kogaion configuration" einfo "Greeter user: ${_user}" # also disable tests because libsystem.c does not build. Tests are -- cgit v1.2.3 From f8a5f7af2d3a781693d943510bceab5f12200209 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 14 Apr 2015 23:35:03 +0300 Subject: [x11-misc/lightdm-gtk-greeter] upgrading gtk greeter --- x11-misc/lightdm-gtk-greeter/Manifest | 1 + .../lightdm-gtk-greeter-2.0.0.ebuild | 44 ++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.0.ebuild diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest index 9a1f15ea..4a28f915 100644 --- a/x11-misc/lightdm-gtk-greeter/Manifest +++ b/x11-misc/lightdm-gtk-greeter/Manifest @@ -2,3 +2,4 @@ DIST lightdm-gtk-greeter-1.3.1.tar.gz 374479 SHA256 a384b6413a52e6c6aeaf3242b242 DIST lightdm-gtk-greeter-1.6.1.tar.gz 391175 SHA256 1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9 SHA512 5137deb631b669db58731a6449ba8f8709666fb7b6affac56038355aafec73041e81a9a822035de7bed0d7164d124df50387a708addde4cf094fe0a977ea154a WHIRLPOOL 9eb4cec7f04d21c3c912f8bf42ae2110ce126006a15c860b21fd66fb41bcb0a517895eba6f017587576fb03be17601614ca3798147923a1690573a1d5e35e813 DIST lightdm-gtk-greeter-1.7.0.tar.gz 398438 SHA256 3f1086091ed2d892eadcd1550e2e7e1b255814735297fbb7068cd95ac7e8044d SHA512 c6ed54f4e291255b3c8802d517f9d0749be368a762e69c1d9c40254f240d32b6858f9169423ef18f0f1cae38c9851f0af58584d8a0d85f03a9e97a5ca0b302ee WHIRLPOOL 1191cc5bfea4aa1a7eeb2daecd215c90dd1a6399c33e0014e1e1f5449b0ed04862cce8f62c3a078430056da647a34d2eb24fb227349d41e988d10b1498968de2 DIST lightdm-gtk-greeter-1.9.0.tar.gz 451297 SHA256 a9103b4aa161feae99a2a62b716a157cde3817e93cee7f73cde2796a12396938 SHA512 759a0f3c8b1fcfc8a6926276243e66675762ae533e20ea95d10e0159023e2252f5b773bdfc65dda6a6a2285e2540a578c7fd2682b108c58791feac9ec8af6885 WHIRLPOOL f4de03e81eb4568f18ccab94222375a6f4d210b7f083506b0ce6e72697a0dc4fd9ed7a867469e101dfb9b47661fb9f5c88c36298a26083175909fbd1aa3be2f4 +DIST lightdm-gtk-greeter-2.0.0.tar.gz 453687 SHA256 4c0a0121d1ec82c85c8aed4ad80ebd48ddc56d9bace31da72423bfd330c26484 SHA512 0c6b61ed09d3edf870e8b4316c6a8b2ff2656cf61ca00dfd1a9c37b87e0f4f58f5e875fd7477e36f54f32ce2304ce870ecc46325fa5aeb20d82d0d6e25b0190c WHIRLPOOL b69f8a1e48968c403a0c2532dd306dfb7d09020c20a99e1ff817c10562f9f80fefa57400d4bdcfd8ee348324e89bc1c1320a4917542a2fe914fac5f3f2692dab diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.0.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.0.ebuild new file mode 100644 index 00000000..0ab4a261 --- /dev/null +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +inherit versionator + +DESCRIPTION="LightDM GTK+ Greeter" +HOMEPAGE="http://launchpad.net/lightdm-gtk-greeter" +SRC_URI="http://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="" + +# This ebuild needs custom Sabayon themes, thus it must depend on sabayon-artwork-core +DEPEND="x11-libs/gtk+:3" +RDEPEND="!!=x11-misc/lightdm-1.2.2 + x11-themes/gnome-themes-standard + x11-themes/gnome-icon-theme + x11-themes/sabayon-artwork-core" + +src_prepare() { + # Apply custom Sabayon theme + sed -i \ + -e 's:#background=.*:background=/usr/share/backgrounds/kgdm.png:' \ + -e 's:#xft-hintstyle=.*:xft-hintstyle=hintfull:' \ + -e 's:#xft-antialias=.*:xft-antialias=true:' \ + -e 's:#xft-rgba=.*:xft-rgba=rgb:' "data/${PN}.conf" || die +} + +pkg_postinst() { + # Make sure to have a greeter properly configured + eselect lightdm set lightdm-gtk-greeter --use-old +} + +pkg_postrm() { + eselect lightdm set 1 # hope some other greeter is installed +} -- cgit v1.2.3 From 9f2002406555f4d0a4673f1ccfb96172d8ba9c24 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 14 Apr 2015 23:35:59 +0300 Subject: [x11-misc/lightdm-qt4] upgrading lightdm for QT --- x11-misc/lightdm-qt4/Manifest | 1 + x11-misc/lightdm-qt4/lightdm-qt4-1.10.3.ebuild | 58 ++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 x11-misc/lightdm-qt4/lightdm-qt4-1.10.3.ebuild diff --git a/x11-misc/lightdm-qt4/Manifest b/x11-misc/lightdm-qt4/Manifest index 743983d4..c9615fb7 100644 --- a/x11-misc/lightdm-qt4/Manifest +++ b/x11-misc/lightdm-qt4/Manifest @@ -1,4 +1,5 @@ DIST introspection-20110205.m4.tar.bz2 1220 SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be WHIRLPOOL 0765c0a72919b26d0c8c38714450eec578a347bfc1c59d4950b633b64b17aa1cde38dfb87fdcd6e2f364c98d6c0bd3dadaa9c2a9711bd1b5ac09a583b988f500 +DIST lightdm-1.10.3.tar.xz 469992 SHA256 1e31b99eba6626ed46b7940cd53cbd585fa53a433258371490ce74dbd047889c SHA512 95000ac3686ec81bc9925ca1dd5007422b8f7b74ae63c239af4e2fe16bfb75d778a26301897516da2d6792e0a8cf519dfbfb13bc9b531f9b7856a0c99c66b2a1 WHIRLPOOL 5b97c0090c60efc0a2edcc6f8d8788b089233f0630fcc418f3d5c2aaf58940c26e1b0b449f1ef7c9240c0f0ab300df28d8eb221aa46aa2c65487228740fd9a70 DIST lightdm-1.12.2.tar.xz 473360 SHA256 ce36bacef7a0ac5b720dc0f4aeb1c37aa56e7b72f7390e290a670fb1b8231736 SHA512 bf3a9ce659929fb628f869ce2d4570bf46d7ae5481df2423ba845c2b652f9d6ae7a0017c5a48ac4d1b72135163031e5382edead313a6f58613c7e8d3b5f449d1 WHIRLPOOL 9bf0f0c52ad8d4bd1537a907f3c438f9f91c28c0812f9c98792c35a0149d2f8fa2f08c5d9781f671292d1c29675d4c1eae5473b3b32f40cb23f8d06c81c586c3 DIST lightdm-1.4.0.tar.gz 660979 SHA256 3486a9f828864a78d452696cf6fef6e1dec2f4ef92a72e90ab37edf9a0824c43 SHA512 dedea48dbf2dde1a84c63691474b6452340b7ba5abd9793afb02f3ffcdb4d664432e3e4bbd6151bfb5861424c1063b42ca99989642b970b4a804ed8bfea6fb1e WHIRLPOOL 0def63f88e3f6ab810411bd51f53984d5cdb832faa81f33d0dd2243b774c06362d20d1c91d32c79f2630c8e543834ed3f5cf411c76843702ed997f60bad30212 DIST lightdm-1.8.5.tar.xz 449024 SHA256 c1a55800628c7a683a529e32646eae4be32295a09af049c9b15387acff0232a2 SHA512 a3941560abe402b07e5595a6fb6bcbd9df36f775b07ac23c526a14c25c1bc2e9ce4e2f912354446111f58499d9df92c650b44b05dbd1e49b5207722d5bf7985f WHIRLPOOL aabc3adf3412b92b235fc8c2674d6807d5bf5c0714a73ac62b558decf779f98a5fbf9151ec00498c4ef3032b153d7735ca216d9451fdd11924f72dab77e7f4ef diff --git a/x11-misc/lightdm-qt4/lightdm-qt4-1.10.3.ebuild b/x11-misc/lightdm-qt4/lightdm-qt4-1.10.3.ebuild new file mode 100644 index 00000000..cf7dc90e --- /dev/null +++ b/x11-misc/lightdm-qt4/lightdm-qt4-1.10.3.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +inherit autotools eutils versionator + +TRUNK_VERSION="$(get_version_component_range 1-2)" +REAL_PN="${PN/-qt4}" +REAL_P="${P/-qt4}" +DESCRIPTION="Qt4 libraries for LightDM" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM" +SRC_URI="http://launchpad.net/${REAL_PN}/${TRUNK_VERSION}/${PV}/+download/${REAL_P}.tar.xz + mirror://gentoo/introspection-20110205.m4.tar.bz2" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +COMMON_DEPEND="~x11-misc/lightdm-base-${PV}" +RDEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND}" + +DOCS=( NEWS ) +S="${WORKDIR}/${REAL_P}" + +src_prepare() { + epatch_user + + # Remove bogus Makefile statement. This needs to go upstream + sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die + if has_version dev-libs/gobject-introspection; then + eautoreconf + else + AT_M4DIR=${WORKDIR} eautoreconf + fi +} + +src_configure() { + econf \ + --localstatedir=/var \ + --disable-static \ + --disable-tests \ + --disable-introspection \ + --enable-liblightdm-qt \ + --disable-liblightdm-qt5 +} + +src_compile() { + cd "${S}/liblightdm-qt" && \ + emake +} + +src_install() { + cd "${S}/liblightdm-qt" && \ + emake DESTDIR="${ED}" install +} -- cgit v1.2.3 From 09965fef059ad99de355454d1be4a94173808404 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 14 Apr 2015 23:38:45 +0300 Subject: [x11-misc/lightdm-kde] upgrade lightdm-kde --- x11-misc/lightdm-kde/Manifest | 1 + 1 file changed, 1 insertion(+) diff --git a/x11-misc/lightdm-kde/Manifest b/x11-misc/lightdm-kde/Manifest index 5a21b521..92ead536 100644 --- a/x11-misc/lightdm-kde/Manifest +++ b/x11-misc/lightdm-kde/Manifest @@ -1 +1,2 @@ +DIST lightdm-kde-0.3.1.tar.bz2 1367466 SHA256 855cffaccc6500e25016e104cd593189cad9aa88ee34f237b01964fce1bcfcf9 SHA512 e79fdbb112ad26dc84f2d25cd00cb6e8ba6a69ebe3e1f247af07b5bd66c9657570bc366a7c0e764b21deb5c67af426908d8600c2a1f68ee24240cbed6f1efbbc WHIRLPOOL a7bc0cdd344714afb52f1cc8c0b622b7826f869194e8374e2539599d4213b4f7539ad8ef4debc1a3adb77c20979baa1a858d8750d0f031f86e4225da507049cb DIST lightdm-kde-0.3.2.1.tar.bz2 1379085 SHA256 65b2a1bab2c88bf55a07e62cbe0eb8ac3660638636c5825e5925b28d03f12188 SHA512 e5a812d37d0906960b707ee0104a6d0c240c910149f64757521504483caa9363467bb21d446c74851db38024785486b5355e3627db3fca3d6f8f046c2e8cf0f1 WHIRLPOOL 13bcd945b5c84609397b16f087fe53da8560f6092fe857746fc7f6e8d7d3804289ef1cfc56d9696561d9301fa5c80a46c117cd1b8077fe793a0e71696107b131 -- cgit v1.2.3 From 971d309ede60db863a43abd88beceda9f1ff8e02 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Wed, 15 Apr 2015 00:42:02 +0300 Subject: [sys-apps/openrc] new version --- sys-apps/openrc/Manifest | 1 + .../openrc/files/openrc-kogaion-config-2.patch | 31 ++ sys-apps/openrc/files/openrc-kogaion-config.patch | 35 ++ .../openrc/files/openrc-sabayon-config-2.patch | 31 -- sys-apps/openrc/files/openrc-sabayon-config.patch | 35 -- sys-apps/openrc/openrc-0.10.5.ebuild | 2 +- sys-apps/openrc/openrc-0.11.8.ebuild | 2 +- sys-apps/openrc/openrc-0.12.4.ebuild | 2 +- sys-apps/openrc/openrc-0.12_pre1-r1.ebuild | 2 +- sys-apps/openrc/openrc-0.12_pre1-r2.ebuild | 2 +- sys-apps/openrc/openrc-0.12_pre1.ebuild | 2 +- sys-apps/openrc/openrc-0.13.11.ebuild | 356 +++++++++++++++++++++ sys-apps/openrc/openrc-0.8.2-r1.ebuild | 2 +- sys-apps/openrc/openrc-0.8.3-r1.ebuild | 2 +- sys-apps/openrc/openrc-0.9.8.1.ebuild | 2 +- sys-apps/openrc/openrc-0.9.9.3.ebuild | 2 +- 16 files changed, 433 insertions(+), 76 deletions(-) create mode 100644 sys-apps/openrc/files/openrc-kogaion-config-2.patch create mode 100644 sys-apps/openrc/files/openrc-kogaion-config.patch delete mode 100644 sys-apps/openrc/files/openrc-sabayon-config-2.patch delete mode 100644 sys-apps/openrc/files/openrc-sabayon-config.patch create mode 100644 sys-apps/openrc/openrc-0.13.11.ebuild diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index 06ab1adb..307aa969 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -1,6 +1,7 @@ DIST openrc-0.10.5.tar.bz2 171742 SHA256 27677142a7aa47a1c7e863fd4bce0d092aca7870012812e4f7a690a14f1e242c DIST openrc-0.11.8.tar.bz2 174860 SHA256 e1f7c5ed98a63178c20f3d023a7d35fe416e8e7db2f0cf78ff346a6d2f7949a9 SHA512 aaea9f1e1d08c367beb6d35bcc1d258eb9d7b71a659c05088f9027b0558aae068b2ad7c221cf8ff8b8950f5a4a5c187ee7b986ce2d475a9e3cccda74d040f780 WHIRLPOOL 69217f13dd05e9a443d906281ada167d6892615eb5db7c372ba535a3d4a21ac3111fad9d54ef06650c3b488b848180bbfe5257dbc83f62f5ecf60724dec2900c DIST openrc-0.12.4.tar.bz2 131914 SHA256 c4edda2fff4b613f50b9cc265bb457a9ab0170fbc1fe7c26eccd4a5d63b2625c SHA512 14e188e382dfe02037d3e4211fa3265152d5ec92ca491b1e86154c0615583ddfc0a2592ca849ab453068dd60000886e57e7da024036fa58d7474acdbb6b92208 WHIRLPOOL 7bdc2c310ee6e87a439574f377a3c1541a118b4122d098d727f6d4464e9f645e5a4d40bedfc82f401b53e640e78494f74fac94f9b6813eb202cc18d1c5391280 +DIST openrc-0.13.11.tar.bz2 150680 SHA256 30edffa8b39d5e68129ddd9e8cd8dfde8ca8cfafc8b470124d7323a32a4a443c SHA512 1dd9d86f5f2f13e196d2724b978c0aaabf7a73c487bf2f8f759d82c856faa754b612d5252dacedb042ba308ff7e9a745dea88b78654a693c39f5d720f0f92ada WHIRLPOOL 2849260c60811e88467b2d0916afa37bc4c7a6e2159abf70a2f5bad2cf97586b801993f45ed86145dfecbc93166298c6302a78602bbfe1957d2f159a3cde11dc DIST openrc-0.8.2.tar.bz2 161165 SHA256 5d603869f78692947b60528f12b3107372a9e4a469621be7bc47d3829c16f8a1 DIST openrc-0.8.3.tar.bz2 162474 SHA256 38ce2538bffe38c00055aadb85597f6f517b3e9f760dc1ed4a27ddf28cb9f4b4 DIST openrc-0.9.8.1.tar.bz2 166841 SHA256 ba83fd5409a4a1626f35adfd06e61675585f5ae29e14dadab958016e24d2a995 diff --git a/sys-apps/openrc/files/openrc-kogaion-config-2.patch b/sys-apps/openrc/files/openrc-kogaion-config-2.patch new file mode 100644 index 00000000..7e392460 --- /dev/null +++ b/sys-apps/openrc/files/openrc-kogaion-config-2.patch @@ -0,0 +1,31 @@ +diff -Nurp openrc-0.9.9.3.orig/conf.d/hwclock openrc-0.9.9.3/conf.d/hwclock +--- openrc-0.9.9.3.orig/conf.d/hwclock 2012-03-11 21:04:51.000000000 +0100 ++++ openrc-0.9.9.3/conf.d/hwclock 2012-04-19 18:50:12.000000000 +0200 +@@ -2,7 +2,7 @@ + # Greenwich Mean Time). If that clock is set to the local time, then + # set CLOCK to "local". Note that if you dual boot with Windows, then + # you should set it to "local". +-clock="UTC" ++clock="local" + + # If you want the hwclock script to set the system time (software clock) + # to match the current hardware clock during bootup, leave this +diff -Nurp openrc-0.9.9.3.orig/etc/rc.conf.in openrc-0.9.9.3/etc/rc.conf.in +--- openrc-0.9.9.3.orig/etc/rc.conf.in 2012-03-11 21:04:51.000000000 +0100 ++++ openrc-0.9.9.3/etc/rc.conf.in 2012-04-19 18:49:46.000000000 +0200 +@@ -39,13 +39,13 @@ + # This allows net.wlan and any service not matching net.* to be plugged. + # Example - rc_hotplug="*" + # This allows all services to be hotplugged +-#rc_hotplug="*" ++rc_hotplug="!net.*" + + # rc_logger launches a logging daemon to log the entire rc process to + # /var/log/rc.log + # NOTE: Linux systems require the devfs service to be started before + # logging can take place and as such cannot log the sysinit runlevel. +-#rc_logger="YES" ++rc_logger="YES" + + # Through rc_log_path you can specify a custom log file. + # The default value is: /var/log/rc.log diff --git a/sys-apps/openrc/files/openrc-kogaion-config.patch b/sys-apps/openrc/files/openrc-kogaion-config.patch new file mode 100644 index 00000000..440171f9 --- /dev/null +++ b/sys-apps/openrc/files/openrc-kogaion-config.patch @@ -0,0 +1,35 @@ +--- openrc-0.5.3.orig/conf.d/hwclock ++++ openrc-0.5.3/conf.d/hwclock +@@ -2,12 +2,12 @@ + # Greenwich Mean Time). If that clock is set to the local time, then + # set CLOCK to "local". Note that if you dual boot with Windows, then + # you should set it to "local". +-clock="UTC" ++clock="local" + + # If you want to set the Hardware Clock to the current System Time + # (software clock) during shutdown, then say "YES" here. + # You normally don't need to do this if you run a ntp daemon. +-clock_systohc="NO" ++clock_systohc="YES" + + # If you wish to pass any other arguments to hwclock during bootup, + # you may do so here. Alpha users may wish to use --arc or --srm here. +--- openrc-0.5.3.orig/etc/rc.conf.in ++++ openrc-0.5.3/etc/rc.conf.in +@@ -38,13 +38,13 @@ + # This allows net.wlan and any service not matching net.* to be plugged. + # Example - rc_hotplug="*" + # This allows all services to be hotplugged +-#rc_hotplug="*" ++rc_hotplug="!net.*" + + # rc_logger launches a logging daemon to log the entire rc process to + # /var/log/rc.log + # NOTE: Linux systems require the devfs service to be started before + # logging can take place and as such cannot log the sysinit runlevel. +-#rc_logger="YES" ++rc_logger="YES" + + # By default we filter the environment for our running scripts. To allow other + # variables through, add them here. Use a * to allow all variables through. diff --git a/sys-apps/openrc/files/openrc-sabayon-config-2.patch b/sys-apps/openrc/files/openrc-sabayon-config-2.patch deleted file mode 100644 index 7e392460..00000000 --- a/sys-apps/openrc/files/openrc-sabayon-config-2.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Nurp openrc-0.9.9.3.orig/conf.d/hwclock openrc-0.9.9.3/conf.d/hwclock ---- openrc-0.9.9.3.orig/conf.d/hwclock 2012-03-11 21:04:51.000000000 +0100 -+++ openrc-0.9.9.3/conf.d/hwclock 2012-04-19 18:50:12.000000000 +0200 -@@ -2,7 +2,7 @@ - # Greenwich Mean Time). If that clock is set to the local time, then - # set CLOCK to "local". Note that if you dual boot with Windows, then - # you should set it to "local". --clock="UTC" -+clock="local" - - # If you want the hwclock script to set the system time (software clock) - # to match the current hardware clock during bootup, leave this -diff -Nurp openrc-0.9.9.3.orig/etc/rc.conf.in openrc-0.9.9.3/etc/rc.conf.in ---- openrc-0.9.9.3.orig/etc/rc.conf.in 2012-03-11 21:04:51.000000000 +0100 -+++ openrc-0.9.9.3/etc/rc.conf.in 2012-04-19 18:49:46.000000000 +0200 -@@ -39,13 +39,13 @@ - # This allows net.wlan and any service not matching net.* to be plugged. - # Example - rc_hotplug="*" - # This allows all services to be hotplugged --#rc_hotplug="*" -+rc_hotplug="!net.*" - - # rc_logger launches a logging daemon to log the entire rc process to - # /var/log/rc.log - # NOTE: Linux systems require the devfs service to be started before - # logging can take place and as such cannot log the sysinit runlevel. --#rc_logger="YES" -+rc_logger="YES" - - # Through rc_log_path you can specify a custom log file. - # The default value is: /var/log/rc.log diff --git a/sys-apps/openrc/files/openrc-sabayon-config.patch b/sys-apps/openrc/files/openrc-sabayon-config.patch deleted file mode 100644 index 440171f9..00000000 --- a/sys-apps/openrc/files/openrc-sabayon-config.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- openrc-0.5.3.orig/conf.d/hwclock -+++ openrc-0.5.3/conf.d/hwclock -@@ -2,12 +2,12 @@ - # Greenwich Mean Time). If that clock is set to the local time, then - # set CLOCK to "local". Note that if you dual boot with Windows, then - # you should set it to "local". --clock="UTC" -+clock="local" - - # If you want to set the Hardware Clock to the current System Time - # (software clock) during shutdown, then say "YES" here. - # You normally don't need to do this if you run a ntp daemon. --clock_systohc="NO" -+clock_systohc="YES" - - # If you wish to pass any other arguments to hwclock during bootup, - # you may do so here. Alpha users may wish to use --arc or --srm here. ---- openrc-0.5.3.orig/etc/rc.conf.in -+++ openrc-0.5.3/etc/rc.conf.in -@@ -38,13 +38,13 @@ - # This allows net.wlan and any service not matching net.* to be plugged. - # Example - rc_hotplug="*" - # This allows all services to be hotplugged --#rc_hotplug="*" -+rc_hotplug="!net.*" - - # rc_logger launches a logging daemon to log the entire rc process to - # /var/log/rc.log - # NOTE: Linux systems require the devfs service to be started before - # logging can take place and as such cannot log the sysinit runlevel. --#rc_logger="YES" -+rc_logger="YES" - - # By default we filter the environment for our running scripts. To allow other - # variables through, add them here. Use a * to allow all variables through. diff --git a/sys-apps/openrc/openrc-0.10.5.ebuild b/sys-apps/openrc/openrc-0.10.5.ebuild index a48cb922..2feea414 100644 --- a/sys-apps/openrc/openrc-0.10.5.ebuild +++ b/sys-apps/openrc/openrc-0.10.5.ebuild @@ -74,7 +74,7 @@ src_prepare() { epatch_user # Rogentos custom config - epatch "${FILESDIR}/${PN}-sabayon-config-2.patch" + epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch epatch "${FILESDIR}/${PN}-netmount-fix.patch" epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" diff --git a/sys-apps/openrc/openrc-0.11.8.ebuild b/sys-apps/openrc/openrc-0.11.8.ebuild index fb5daebd..af2bf2fc 100644 --- a/sys-apps/openrc/openrc-0.11.8.ebuild +++ b/sys-apps/openrc/openrc-0.11.8.ebuild @@ -49,7 +49,7 @@ src_prepare() { epatch_user # Rogentos custom config - epatch "${FILESDIR}/${PN}-sabayon-config-2.patch" + epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch epatch "${FILESDIR}/${PN}-netmount-fix.patch" epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" diff --git a/sys-apps/openrc/openrc-0.12.4.ebuild b/sys-apps/openrc/openrc-0.12.4.ebuild index 0bc61a82..b45a43ef 100644 --- a/sys-apps/openrc/openrc-0.12.4.ebuild +++ b/sys-apps/openrc/openrc-0.12.4.ebuild @@ -57,7 +57,7 @@ src_prepare() { epatch_user # RogentOS custom config - epatch "${FILESDIR}/${PN}-sabayon-config-2.patch" + epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch epatch "${FILESDIR}/${PN}-netmount-fix.patch" epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" diff --git a/sys-apps/openrc/openrc-0.12_pre1-r1.ebuild b/sys-apps/openrc/openrc-0.12_pre1-r1.ebuild index cc6b258a..fa0f18af 100644 --- a/sys-apps/openrc/openrc-0.12_pre1-r1.ebuild +++ b/sys-apps/openrc/openrc-0.12_pre1-r1.ebuild @@ -51,7 +51,7 @@ src_prepare() { epatch_user # RogentOS custom config - epatch "${FILESDIR}/${PN}-sabayon-config-2.patch" + epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch epatch "${FILESDIR}/${PN}-netmount-fix.patch" epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" diff --git a/sys-apps/openrc/openrc-0.12_pre1-r2.ebuild b/sys-apps/openrc/openrc-0.12_pre1-r2.ebuild index f8cd6271..94f81aa7 100644 --- a/sys-apps/openrc/openrc-0.12_pre1-r2.ebuild +++ b/sys-apps/openrc/openrc-0.12_pre1-r2.ebuild @@ -50,7 +50,7 @@ src_prepare() { epatch_user # RogentOS/Argent custom config - epatch "${FILESDIR}/${PN}-sabayon-config-2.patch" + epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch epatch "${FILESDIR}/${PN}-netmount-fix.patch" epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" diff --git a/sys-apps/openrc/openrc-0.12_pre1.ebuild b/sys-apps/openrc/openrc-0.12_pre1.ebuild index 731eb5a2..fb70c08e 100644 --- a/sys-apps/openrc/openrc-0.12_pre1.ebuild +++ b/sys-apps/openrc/openrc-0.12_pre1.ebuild @@ -51,7 +51,7 @@ src_prepare() { epatch_user # RogentOS custom config - epatch "${FILESDIR}/${PN}-sabayon-config-2.patch" + epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch epatch "${FILESDIR}/${PN}-netmount-fix.patch" epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" diff --git a/sys-apps/openrc/openrc-0.13.11.ebuild b/sys-apps/openrc/openrc-0.13.11.ebuild new file mode 100644 index 00000000..b45a43ef --- /dev/null +++ b/sys-apps/openrc/openrc-0.13.11.ebuild @@ -0,0 +1,356 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit eutils flag-o-matic multilib pam toolchain-funcs + +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" +HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="git://github.com/OpenRC/${PN}.git" + inherit git-2 +else + SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +fi + +LICENSE="BSD-2" +SLOT="0" +IUSE="debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs + tools unicode kernel_linux kernel_FreeBSD" + +COMMON_DEPEND=">=sys-apps/baselayout-2.1-r1 + kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) + elibc_glibc? ( >=sys-libs/glibc-2.5 ) + ncurses? ( sys-libs/ncurses ) + pam? ( sys-auth/pambase ) + tools? ( dev-lang/perl ) + kernel_linux? ( + sys-process/psmisc + ) + selinux? ( sec-policy/selinux-openrc ) + !