diff options
61 files changed, 5718 insertions, 4 deletions
diff --git a/media-fonts/font-adobe-100dpi/Manifest b/media-fonts/font-adobe-100dpi/Manifest new file mode 100644 index 0000000..e13dee2 --- /dev/null +++ b/media-fonts/font-adobe-100dpi/Manifest @@ -0,0 +1,2 @@ +DIST font-adobe-100dpi-1.0.0.tar.bz2 1064316 RMD160 34a3af933a71062f27d1b6b305a497e9e9f2606d SHA1 d50be15033c29f2d6222e8707f5eb6783e7b2bd9 SHA256 f16c1b3a1625c9a225aff2ac12067bd3907d157b0c60625689a5080f092e9a19 +EBUILD font-adobe-100dpi-1.0.0.ebuild 582 RMD160 1ceee07eb5c2cd381c6aa2631a617456eb0ad6cb SHA1 3af405bc74cc845db37be9819679573a32a725fb SHA256 dad659c665cb72194c3c874462e7b58ed8c74f820a0a805f40256c47859f8768 diff --git a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.0.ebuild b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.0.ebuild new file mode 100644 index 0000000..3102e94 --- /dev/null +++ b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.0.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.0.ebuild,v 1.18 2007/07/15 05:13:09 mr_bones_ Exp $ + +# Must be before x-modular eclass is inherited +#SNAPSHOT="yes" + +inherit x-modular + +DESCRIPTION="X.Org Adobe bitmap fonts" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +RDEPEND="media-fonts/font-util" +DEPEND="${RDEPEND} + x11-apps/bdftopcf" + +CONFIGURE_OPTIONS="--with-mapfiles=${XDIR}/share/fonts/util" diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest new file mode 100644 index 0000000..7366c12 --- /dev/null +++ b/media-libs/alsa-lib/Manifest @@ -0,0 +1,3 @@ +AUX alsa-lib-exec_prefix-fix.patch 364 RMD160 e120c380bbcee9a61de5b2dc15b18a19b93ae203 SHA1 8bcae36901a8c0c4f45b8ba62b14cd8b516b8c50 SHA256 112f05640753463efd8aac5febae9e2c5c11a380e5c3937fb1e242f9b7c9f378 +DIST alsa-lib-1.0.16.tar.bz2 782235 RMD160 828e1d101e0cc2814db2276e08c26ecb9aa0f94d SHA1 9cca050bf3fb18bf87aeeabe205415431d4d8653 SHA256 ae19b33f109e9185c4df709fcab7f6cbbacce82565c5025ba4ebc0e2beca26cd +EBUILD alsa-lib-1.0.16-r1.ebuild 3136 RMD160 20c5e43a0d0b877cc339da6af04449175de349ff SHA1 da0507da03a40649601ab77a94d66b98c19004f2 SHA256 24eba915a93e36e864be175a1ff19127d83b8d8c82a2217dabde5fe048bea8b3 diff --git a/media-libs/alsa-lib/alsa-lib-1.0.16-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.16-r1.ebuild new file mode 100644 index 0000000..035c321 --- /dev/null +++ b/media-libs/alsa-lib/alsa-lib-1.0.16-r1.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.16-r1.ebuild,v 1.1 2008/05/13 14:40:14 beandog Exp $ + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="1.9" + +inherit eutils autotools libtool + +MY_P="${P/_rc/rc}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Advanced Linux Sound Architecture Library" +HOMEPAGE="http://www.alsa-project.org/" +SRC_URI="mirror://alsaproject/lib/${MY_P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="doc debug alisp midi python" + +RDEPEND="python? ( dev-lang/python )" +DEPEND="${RDEPEND} + >=media-sound/alsa-headers-${PV} + doc? ( >=app-doc/doxygen-1.2.6 )" + +IUSE_PCM_PLUGIN="copy linear route mulaw alaw adpcm rate plug multi shm file null empty share meter hooks lfloat ladspa dmix dshare dsnoop asym iec958 +softvol extplug ioplug" + +for plugin in ${IUSE_PCM_PLUGIN}; do + IUSE="${IUSE} alsa_pcm_plugins_${plugin}" +done + +pkg_setup() { + if [ -z "${ALSA_PCM_PLUGINS}" ] ; then + ewarn "You haven't selected _any_ PCM plugins. Either you set it to something like the default" + ewarn "(which is being set in the profile UNLESS you unset them) or alsa based applications" + ewarn "are going to *misbehave* !" + epause 5 + fi +} + +src_unpack() { + unpack ${A} + + cd "${S}" + + # Fix the exec_prefix later used in the .pc file. + # We need to call autoconf afterwards, because the patch touches configure.in + epatch "${FILESDIR}/alsa-lib-exec_prefix-fix.patch" + + eautoreconf || die 'autoreconf failed' + + #elibtoolize + epunt_cxx +} + +src_compile() { + local myconf + use elibc_uclibc && myconf="--without-versioned" + + # needed to avoid gcc looping internaly + use hppa && export CFLAGS="-O1 -pipe" + + econf \ + --enable-static \ + --enable-shared \ + --disable-resmgr \ + $(use_with debug) \ + $(use_enable alisp) \ + $(use_enable python) \ + $(use_enable midi instr) \ + $(use_enable midi seq) $(use_enable midi aload) \ + --with-pcm-plugins="${ALSA_PCM_PLUGINS}" \ + --disable-dependency-tracking \ + ${myconf} \ + || die "configure failed" + + emake || die "make failed" + + if use doc; then + emake doc || die "failed to generate docs" + fgrep -Zrl "${S}" "${S}/doc/doxygen/html" | \ + xargs -0 sed -i -e "s:${S}::" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + dodoc ChangeLog TODO + use doc && dohtml -r doc/doxygen/html/* +} + +pkg_postinst() { + ewarn "Starting from alsa 1.0.11_rc3 the configuration for dmix is changed." + ewarn "Leaving around old asound.conf or ~/.asoundrc might make all apps" + ewarn "using ALSA output crash." + ewarn "Note that dmix output is enabled by default on the 'default' device" + ewarn "since ALSA 1.0.9." + elog "" + elog "Please try in-kernel ALSA drivers instead of the alsa-drivers ebuild." + elog "If alsa-drivers works for you where a recent kernel does not, we want " + elog "to know about this. Our e-mail address is alsa-bugs@gentoo.org" + elog "However, if you notice no sound output or instability, please try to " + elog "upgrade your kernel to a newer version first." +} diff --git a/media-libs/alsa-lib/files/alsa-lib-exec_prefix-fix.patch b/media-libs/alsa-lib/files/alsa-lib-exec_prefix-fix.patch new file mode 100644 index 0000000..55eccaa --- /dev/null +++ b/media-libs/alsa-lib/files/alsa-lib-exec_prefix-fix.patch @@ -0,0 +1,11 @@ +--- configure.in 2008-12-14 14:36:12.000000000 +0100 ++++ configure.in.new 2008-12-14 14:45:18.000000000 +0100 +@@ -79,7 +79,7 @@ + AC_SUBST(ALSA_CONFIG_DIR) + + dnl ALSA plugin directory +-test "x$exec_prefix" = xNONE && exec_prefix=$prefix ++test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + + AC_ARG_WITH(plugindir, + AS_HELP_STRING([--with-plugindir=dir], diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog new file mode 100644 index 0000000..0dc8c5a --- /dev/null +++ b/sys-apps/coreutils/ChangeLog @@ -0,0 +1,916 @@ +# ChangeLog for sys-apps/coreutils +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.237 2008/07/27 19:39:23 loki_val Exp $ + +*coreutils-6.12-r1 (27 Jul 2008) + + 27 Jul 2008; Peter Alfredsen <loki_val@gentoo.org> + +files/gnulib-utimens-update.patch, -coreutils-6.12.ebuild, + +coreutils-6.12-r1.ebuild: + Fix for bug #224483. People with old kernels can use this once more. + +*coreutils-6.12 (01 Jun 2008) + + 01 Jun 2008; Mike Frysinger <vapier@gentoo.org> +coreutils-6.12.ebuild: + Version bump. + + 29 Apr 2008; Brent Baude <ranger@gentoo.org> coreutils-6.10-r2.ebuild: + stable ppc, bug 218927 + + 24 Apr 2008; Jeroen Roovers <jer@gentoo.org> coreutils-6.10-r2.ebuild: + Stable for HPPA (bug #218927). + + 24 Apr 2008; Markus Rothe <corsair@gentoo.org> coreutils-6.10-r2.ebuild: + Stable on ppc64; bug #218927 + + 24 Apr 2008; <welp@gentoo.org> coreutils-6.10-r2.ebuild: + Stable on amd64; bug 218927 + + 24 Apr 2008; Raúl Porcel <armin76@gentoo.org> coreutils-6.10-r2.ebuild: + alpha/ia64/sparc/x86 stable wrt #218927 + +*coreutils-6.11 (19 Apr 2008) + + 19 Apr 2008; Mike Frysinger <vapier@gentoo.org> +coreutils-6.11.ebuild: + Version bump. + + 17 Apr 2008; nixnut <nixnut@gentoo.org> coreutils-6.10-r1.ebuild: + Stable on ppc wrt bug 217239 + + 14 Apr 2008; Jeroen Roovers <jer@gentoo.org> coreutils-6.10-r1.ebuild: + Stable for HPPA (bug #217239). + + 14 Apr 2008; Markus Rothe <corsair@gentoo.org> coreutils-6.10-r1.ebuild: + Stable on ppc64; bug #217239 + + 14 Apr 2008; Raúl Porcel <armin76@gentoo.org> coreutils-6.10-r1.ebuild: + alpha/ia64/sparc stable wrt #217239 + + 13 Apr 2008; Mike Frysinger <vapier@gentoo.org> coreutils-6.10-r1.ebuild, + coreutils-6.10-r2.ebuild: + Add support for USE=vanilla. + + 13 Apr 2008; Mike Frysinger <vapier@gentoo.org> coreutils-6.10-r1.ebuild, + coreutils-6.10-r2.ebuild: + Drop unneeded selinux configure options. + + 13 Apr 2008; Mike Frysinger <vapier@gentoo.org> coreutils-6.10-r1.ebuild, + coreutils-6.10-r2.ebuild: + Block older versions of util-linux for the lazy who havent updated in a + while #217482. + + 13 Apr 2008; Benedikt Böhm <hollow@gentoo.org> coreutils-6.10-r1.ebuild: + amd64 stable wrt #217239 + + 12 Apr 2008; Dawid Węgliński <cla@gentoo.org> coreutils-6.10-r1.ebuild: + Stable on x86 (bug #217239) + +*coreutils-6.10-r2 (12 Apr 2008) + + 12 Apr 2008; Mike Frysinger <vapier@gentoo.org> +coreutils-6.10-r2.ebuild: + Add i18n patch from Fedora and some fixes from upstream for #210133. + + 23 Feb 2008; Mike Frysinger <vapier@gentoo.org> coreutils-6.9-r1.ebuild: + Fix build error on some systems #206841 by Markus Duft. + +*coreutils-6.10-r1 (23 Jan 2008) + + 23 Jan 2008; Mike Frysinger <vapier@gentoo.org> +coreutils-6.10-r1.ebuild: + As Cardoe points out, mktemp has been integrated into this version, so we + need to block the mktemp package and put the binary in the right place. + +*coreutils-6.10 (23 Jan 2008) + + 23 Jan 2008; Mike Frysinger <vapier@gentoo.org> +coreutils-6.10.ebuild: + Version bump. + + 15 Sep 2007; Mike Frysinger <vapier@gentoo.org> coreutils-6.9-r1.ebuild: + Break sys-apps/attr out of USE=acl and into USE=xattr #192023. + + 24 Jul 2007; Mike Frysinger <vapier@gentoo.org> coreutils-6.9-r1.ebuild: + Punt forced man-pages depend as most people should have seen a smooth + upgrade cycle by now. + + 07 Jul 2007; Mike Frysinger <vapier@gentoo.org> + +files/gnulib-futimens-rename.patch, coreutils-6.9-r1.ebuild: + Fix from upstream gnulib for futimens handling with newer glibc #180764. + + 02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> coreutils-6.4.ebuild, + coreutils-6.7.ebuild, coreutils-6.7-r1.ebuild, coreutils-6.9.ebuild, + coreutils-6.9-r1.ebuild: + (QA) RESTRICT clean up. + + 13 Jun 2007; Christoph Mende <angelos@gentoo.org> coreutils-6.9-r1.ebuild: + Stable on amd64 wrt bug 181624 + + 13 Jun 2007; Mike Frysinger <vapier@gentoo.org> coreutils-6.9-r1.ebuild: + Add /usr/bin/uname symlink for autotools. + + 12 Jun 2007; Raúl Porcel <armin76@gentoo.org> coreutils-6.9-r1.ebuild: + ia64 stable wrt #181624 + + 11 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org> + coreutils-6.9-r1.ebuild: + Stable on sparc wrt #181624 + + 11 Jun 2007; Markus Rothe <corsair@gentoo.org> coreutils-6.9-r1.ebuild: + Stable on ppc64; bug #181624 + + 11 Jun 2007; Raúl Porcel <armin76@gentoo.org> coreutils-6.9-r1.ebuild: + alpha/x86 stable wrt #181624 + + 11 Jun 2007; nixnut <nixnut@gentoo.org> coreutils-6.9-r1.ebuild: + Stable on ppc wrt bug 181624 + + 11 Jun 2007; Jeroen Roovers <jer@gentoo.org> coreutils-6.9-r1.ebuild: + Fixed permissions for tests/ls/x-option. Stable for HPPA (bug #181624). + + 11 Jun 2007; Joshua Kinard <kumba@gentoo.org> coreutils-6.9-r1.ebuild: + Stable on mips, per #181624. + +*coreutils-6.9-r1 (30 Apr 2007) + + 30 Apr 2007; Mike Frysinger <vapier@gentoo.org> +coreutils-6.9-r1.ebuild: + Fix ls -x error #173032 and install man pages #105188. + + 24 Apr 2007; Bryan Østergaard <kloeri@gentoo.org> + coreutils-6.7-r1.ebuild: + Stable on Mips, bug 172003. + + 06 Apr 2007; Christian Faulhammer <opfer@gentoo.org> + coreutils-6.7-r1.ebuild: + stable amd64, bug 172003 + + 04 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> + coreutils-6.7-r1.ebuild: + Stable on sparc wrt #172003 + + 29 Mar 2007; Chris PeBenito <pebenito@gentoo.org> coreutils-6.9.ebuild: + Re-add SELinux support. + + 26 Mar 2007; Jeroen Roovers <jer@gentoo.org> coreutils-6.7-r1.ebuild: + Stable for HPPA (bug #172003). + + 25 Mar 2007; Tobias Scherbaum <dertobi123@gentoo.org> + coreutils-6.7-r1.ebuild: + Stable on ppc wrt bug #172003. + + 25 Mar 2007; Markus Rothe <corsair@gentoo.org> coreutils-6.7-r1.ebuild: + Stable on ppc64 - now really.. /bin/install missing is no regression. + + 24 Mar 2007; Seemant Kulleen <seemant@gentoo.org> + files/digest-coreutils-6.9, Manifest: + upload the patchball, but I had to generate it myself, hence the need to + redigest + + 24 Mar 2007; Andrej Kacian <ticho@gentoo.org> coreutils-6.7-r1.ebuild: + Stable on x86, bug #172003. + + 24 Mar 2007; Markus Rothe <corsair@gentoo.org> coreutils-6.7-r1.ebuild: + Back to ~ppc64 + + 24 Mar 2007; Markus Rothe <corsair@gentoo.org> coreutils-6.7-r1.ebuild: + Stable on ppc64; bug #172003 + +*coreutils-6.9 (24 Mar 2007) + + 24 Mar 2007; Mike Frysinger <vapier@gentoo.org> +coreutils-6.9.ebuild: + Version bump. + + 13 Feb 2007; Bryan Østergaard <kloeri@gentoo.org> + coreutils-6.7-r1.ebuild: + Stable on Alpha. + + 22 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> + coreutils-6.7-r1.ebuild: + Stable on IA64. + +*coreutils-6.7-r1 (02 Jan 2007) + + 02 Jan 2007; Mike Frysinger <vapier@gentoo.org> +coreutils-6.7-r1.ebuild: + Move binaries not really needed into /usr. + +*coreutils-6.7 (08 Dec 2006) + + 08 Dec 2006; Mike Frysinger <vapier@gentoo.org> +coreutils-6.7.ebuild: + Version bump. + + 01 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org> + coreutils-6.4.ebuild: + ppc stable, bug #144467 + +*coreutils-6.6 (26 Nov 2006) + + 26 Nov 2006; Mike Frysinger <vapier@gentoo.org> +coreutils-6.6.ebuild: + Version bump. + + 24 Nov 2006; Markus Rothe <corsair@gentoo.org> coreutils-6.4.ebuild: + Stable on ppc64; bug #144467 + + 07 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org> coreutils-6.4.ebuild: + Stable on sparc wrt #144467 + + 04 Nov 2006; Jeroen Roovers <jer@gentoo.org> coreutils-6.4.ebuild: + Stable for HPPA (bug #144467). + + 01 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org> coreutils-6.4.ebuild: + Stable on amd64/x86 wrt bug #144467. + +*coreutils-6.4 (23 Oct 2006) + + 23 Oct 2006; Mike Frysinger <vapier@gentoo.org> +coreutils-6.4.ebuild: + Version bump. + +*coreutils-6.3 (30 Sep 2006) + + 30 Sep 2006; Mike Frysinger <vapier@gentoo.org> +coreutils-6.3.ebuild: + Version bump. + +*coreutils-6.2 (18 Sep 2006) + + 18 Sep 2006; Mike Frysinger <vapier@gentoo.org> +coreutils-6.2.ebuild: + Version bump. + + 04 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> coreutils-5.97.ebuild, + coreutils-6.1.ebuild: + Backport the kernel_linux fix to 5.97 and drop keyword from 6.1 as it + doesn't build right now. + + 04 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> coreutils-6.1.ebuild: + Remove kernel_linux conditional for acl and attr, acl can be use.masked for + this package on non-linux profiles now. + +*coreutils-6.1 (20 Aug 2006) + + 20 Aug 2006; Mike Frysinger <vapier@gentoo.org> +coreutils-6.1.ebuild: + Version bump. + + 06 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> coreutils-5.96.ebuild, + coreutils-5.97.ebuild: + Drop keyword from old version, and make acl deps being actual dep only on + Linux. *BSD does not require those deps although acl works fine. + +*coreutils-5.97 (25 Jun 2006) + + 25 Jun 2006; Mike Frysinger <vapier@gentoo.org> +coreutils-5.97.ebuild: + Version bump. + + 01 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> coreutils-5.96.ebuild: + Restrict confcache as per bug #134459. + + 23 May 2006; Diego Pettenò <flameeyes@gentoo.org> coreutils-5.96.ebuild: + Add ~x86-fbsd keyword. Change strategy for non-GNU userlands, instead of + prefixing with 'g' (that might collide with other binaries as in FreeBSD), + install in /usr/libexec/gnu. Don't force external regex on + non-glibc/non-uclibc systems. Remove man pages when on non-GNU userland as + they would collide with system's manpages. + +*coreutils-5.96 (22 May 2006) + + 22 May 2006; Mike Frysinger <vapier@gentoo.org> +coreutils-5.96.ebuild: + Version bump. + +*coreutils-5.95 (13 May 2006) + + 13 May 2006; Mike Frysinger <vapier@gentoo.org> +coreutils-5.95.ebuild: + Version bump. + +*coreutils-5.94-r3 (07 May 2006) + + 07 May 2006; Mike Frysinger <vapier@gentoo.org> +coreutils-5.94-r3.ebuild: + Cleanup the progress bar patch, fix the cs.po date translation, and add fix + from upstream for `pwd` bugs in bind mounts. + + 02 May 2006; Mike Doty <kingtaco@gentoo.org> coreutils-5.94-r2.ebuild: + mirroring coreutils-5.94-patches-1.4.tar.bz2 at + http://dev.gentoo.org/~kingtaco/mirror/ bug 131808 + + 29 Apr 2006; Joshua Kinard <kumba@gentoo.org> coreutils-5.94-r1.ebuild: + Marked stable on mips. + + 17 Apr 2006; Markus Rothe <corsair@gentoo.org> coreutils-5.94-r1.ebuild: + Stable on ppc64; bug #129546 + + 12 Apr 2006; Joseph Jezak <josejx@gentoo.org> coreutils-5.94-r1.ebuild: + Marked ppc stable for bug #129546. + + 12 Apr 2006; Bryan Østergaard <kloeri@gentoo.org + coreutils-5.94-r1.ebuild: + Stable on alpha, bug 129546. + + 11 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org> + coreutils-5.94-r1.ebuild: + Stable on sparc wrt #129546 + + 11 Apr 2006; Daniel Gryniewicz <dang@gentoo.org> coreutils-5.94-r1.ebuild: + Marked stable on amd64 Per bug# 129546 + + 11 Apr 2006; Andrej Kacian <ticho@gentoo.org> coreutils-5.94-r1.ebuild: + Stable on x86, bug #129546. + +*coreutils-5.94-r2 (11 Apr 2006) + + 11 Apr 2006; Mike Frysinger <vapier@gentoo.org> +coreutils-5.94-r2.ebuild: + Re-enable support for system regex #128040 by Emanuele Giaquinta. + + 04 Mar 2006; Luca Barbato <lu_zero@gentoo.org> coreutils-5.94-r1.ebuild: + Missing acl logic + +*coreutils-5.94-r1 (20 Feb 2006) + + 20 Feb 2006; Mike Frysinger <vapier@gentoo.org> +coreutils-5.94-r1.ebuild: + Drop the --without-included-regex since it just makes things crash atm #123342. + + 17 Feb 2006; Mike Frysinger <vapier@gentoo.org> coreutils-5.2.1-r6.ebuild, + coreutils-5.2.1-r7.ebuild, coreutils-5.3.0-r1.ebuild, + coreutils-5.3.0-r2.ebuild, coreutils-5.93.ebuild, coreutils-5.94.ebuild: + Make sure $WORKDIR is go-w before giving everyone read access #122951 by + Joshua Pettett. + + 17 Feb 2006; Chris PeBenito <pebenito@gentoo.org> coreutils-5.94.ebuild: + Fix up SELinux patch. + +*coreutils-5.94 (15 Feb 2006) + + 15 Feb 2006; Mike Frysinger <vapier@gentoo.org> +coreutils-5.94.ebuild: + Version bump. + + 09 Feb 2006; Joshua Kinard <kumba@gentoo.org> coreutils-5.2.1-r7.ebuild: + Marked stable on mips for Bug #120125. + + 29 Jan 2006; Chris PeBenito <pebenito@gentoo.org> coreutils-5.93.ebuild: + Update SELinux patch for 5.93, fixes bug #120254. + + 27 Jan 2006; Simon Stelling <blubb@gentoo.org> coreutils-5.2.1-r7.ebuild: + stable on amd64 + +*coreutils-5.93 (25 Jan 2006) + + 25 Jan 2006; Mike Frysinger <vapier@gentoo.org> +coreutils-5.93.ebuild: + Version bump #119794 by Daniel Drake. + + 25 Jan 2006; Jose Luis Rivero <yoswink@gentoo.org> + coreutils-5.2.1-r7.ebuild: + Stable on alpha wrt #120125 + + 24 Jan 2006; Joseph Jezak <josejx@gentoo.org> coreutils-5.2.1-r7.ebuild: + Marked ppc stable for bug #120125. + + 24 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org> + coreutils-5.2.1-r7.ebuild: + Stable on sparc wrt #120125 + + 24 Jan 2006; Chris White <chriswhite@gentoo.org> + coreutils-5.2.1-r7.ebuild: + x86 stable per bug #120125. + + 24 Jan 2006; Markus Rothe <corsair@gentoo.org> coreutils-5.2.1-r7.ebuild: + Stable on ppc64; bug #120125 + +*coreutils-5.3.0-r2 (05 Oct 2005) + + 05 Oct 2005; Mike Frysinger <vapier@gentoo.org> + +coreutils-5.3.0-r2.ebuild: + Fix uname parsing of cpuinfo on alpha/ia64 and use timestyle patch from + upstream. + + 13 Sep 2005; Mike Frysinger <vapier@gentoo.org> coreutils-5.3.0-r1.ebuild: + Fix off-by-one issue #105639 by Michal Januszewski. + +*coreutils-5.3.0-r1 (30 Aug 2005) + + 30 Aug 2005; Mike Frysinger <vapier@gentoo.org> + +coreutils-5.3.0-r1.ebuild: + Update the i18n patch to fix cut again as well as expand #104286 by peteru. + + 30 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> coreutils-5.3.0.ebuild: + Remove charset.alias if it's present, only libiconv should install it. + +*coreutils-5.3.0 (30 Aug 2005) + + 30 Aug 2005; Mike Frysinger <vapier@gentoo.org> files/DIR_COLORS, + +coreutils-5.3.0.ebuild: + Version bump. + +*coreutils-5.2.1-r7 (30 Aug 2005) + + 30 Aug 2005; Mike Frysinger <vapier@gentoo.org> files/DIR_COLORS, + +coreutils-5.2.1-r7.ebuild: + Fix memleak in chmod #87490 and update DIR_COLORS with stuff from Fedora and + #104087. + + 18 Aug 2005; Mike Frysinger <vapier@gentoo.org> coreutils-5.2.1-r6.ebuild: + Merge support for using coreutils on non-GNU systems by Diego Pettenò + #101218. + + 28 Jun 2005; Joshua Kinard <kumba@gentoo.org> coreutils-5.2.1-r6.ebuild: + Marked stable on mips. + + 06 Jun 2005; Markus Rothe <corsair@gentoo.org> coreutils-5.2.1-r6.ebuild: + Stable on ppc64 + + 30 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> + coreutils-5.2.1-r6.ebuild: + Stable on sparc + + 29 May 2005; <solar@gentoo.org> coreutils-5.2.1-r2.ebuild, + coreutils-5.2.1-r5.ebuild, coreutils-5.2.1-r6.ebuild: + - update coreutils to use libc expanded variable elibc_uclibc vs uclibc so + USE=-* works + + 29 May 2005; Joseph Jezak <josejx@gentoo.org> coreutils-5.2.1-r6.ebuild: + Marked ppc stable. + +*coreutils-5.2.1-r6 (02 Apr 2005) + + 02 Apr 2005; Mike Frysinger <vapier@gentoo.org> + +coreutils-5.2.1-r6.ebuild: + Update i18n patch to the redhat version #87429 and include the tty utf8 fix + #77633. + +*coreutils-5.2.1-r5 (14 Mar 2005) + + 14 Mar 2005; Martin Schlemmer <azarah@gentoo.org> + +coreutils-5.2.1-r5.ebuild: + Add fix for bug #84564. + + 03 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> + coreutils-5.2.1-r3.ebuild, coreutils-5.2.1-r4.ebuild: + Dependency update: sys-apps/at -> sys-process/at. + +*coreutils-5.2.1-r4 (09 Jan 2005) + + 09 Jan 2005; Mike Frysinger <vapier@gentoo.org> + +coreutils-5.2.1-r4.ebuild: + Fix tail -f behavior #57477 by rob holland. Have the progress bar use normal + spaces #76903 by Nikolai Weibull. Fix chown --dereference #53750 by Georgi + Georgiev. Fix test running #75932 / #76089. + +*coreutils-5.2.1-r3 (21 Dec 2004) + + 21 Dec 2004; Mike Frysinger <vapier@gentoo.org> + +coreutils-5.2.1-r3.ebuild: + Remove i686-specific asm code on i486 systems #32429. Fix tail +# syntax + #66713. Move [ to same place as test #65296. Fix man-page tests #69216. Fix + autotool code #74210. Fix @echo in man/Makefile #53881. Use DESTDIR instead + of einstall. Make symlinks absolute #55620. + + 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + coreutils-5.2.1-r1.ebuild, coreutils-5.2.1-r2.ebuild, + coreutils-5.2.1.ebuild: + Masked coreutils-5.2.1.ebuild stable for ppc + + 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + coreutils-5.2.1-r1.ebuild, coreutils-5.2.1-r2.ebuild: + Masked coreutils-5.2.1-r2.ebuild stable for ppc + + 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + coreutils-5.2.1-r1.ebuild: + Masked coreutils-5.2.1-r1.ebuild stable for ppc + + 26 Aug 2004; Ciaran McCreesh <ciaranm@gentoo.org> files/DIR_COLORS: + Added rxvt-unicode to the DIR_COLORS supported terminal list + + 26 Aug 2004; Tom Gall <tgall@gentoo.org> coreutils-5.2.1.ebuild: + fix ppc64 and s390, bug #61735 + +*coreutils-5.2.1-r2 (25 Aug 2004) + + 25 Aug 2004; Seemant Kulleen <seemant@gentoo.org> + +coreutils-5.2.1-r2.ebuild: + Version bump to incorporate two fixes. First, the uname patch is made to work + on amd64 architecture (fixing bug #59774 by Danny van Dyk + <kugelfang@gentoo.org>), and the second is a fix to sort on large files + reported by: qube99@hotmail.com in bug #39515, and fixed by: Sven Wegener + <swegener@gentoo.org> + + 15 Aug 2004; Travis Tilley <lv@gentoo.org> + +files/003_all_coreutils-gentoo-uname.patch, coreutils-5.2.1-r1.ebuild, + coreutils-5.2.1.ebuild: + fixed uname -p on amd64 + + 23 Jul 2004; Seemant Kulleen <seemant@gentoo.org> coreutils-5.2.0-r2.ebuild, + coreutils-5.2.1-r1.ebuild: + put a hacky fix for bug #46593 while the sparc team figures out what the + actual fix is + + 13 Jul 2004; Seemant Kulleen <seemant@gentoo.org> coreutils-5.2.1-r1.ebuild: + fix b0rked uname patch, closes bug #56866 by Doug Goldstein <cardoe@cardoe.com> + +*coreutils-5.2.1-r1 (12 Jul 2004) + + 12 Jul 2004; Seemant Kulleen <seemant@gentoo.org> + -coreutils-5.0.91-r3.ebuild, +coreutils-5.2.1-r1.ebuild: + Fix the sort -M deal, thanks to Sven Wegener <swegener@gentoo.org> in + #gentoo-bugs and also bartron@gmx.dein bug #54765 by + Thomas Petersen <mendocino@mendo.dk>. Also, fix the s390 stuff as reported in + bug #52581 by jochen <jochen.eisinger@gmx.de>. Added the ppc64 stuff into the + regular uname patch. Finally, fix the selinux-noacl patch, thanks to Chris + PeBenito <pebenito@gentoo.org> via e-mail. + + 25 Jun 2004; Aron Griffis <agriffis@gentoo.org> coreutils-5.0-r6.ebuild, + coreutils-5.0.91-r3.ebuild, coreutils-5.0.91-r4.ebuild: + QA - fix use invocation + + 16 Jun 2004; Daniel Black <dragonheart@gentoo.org> coreutils-5.0-r6.ebuild, + coreutils-5.0.91-r3.ebuild, coreutils-5.0.91-r4.ebuild, + coreutils-5.2.0-r2.ebuild, coreutils-5.2.1.ebuild: + uclibc not dependant on sys-apps/help2man thanks to Peter S. Mazinger + <ps.m@gmx.net>. Changed dev.gentoo.org SRC_URI to mirror://gentoo/. + + 31 May 2004; Tom Gall <tgall@gentoo.org> coreutils-5.0.91-r4.ebuild: + added coreutils-5.0.91-ppc64-1.patch which fixes bug #52617 + + 17 May 2004; Mike Frysinger <vapier@gentoo.org> coreutils-5.2.1.ebuild: + Fixes for uname: no more segfaults for unknown archs #36190, integrate the + broken out s390 patch, and add support arm support. + + 16 May 2004; Seemant Kulleen <seemant@gentoo.org> coreutils-5.2.1.ebuild: + fixed the progress bar patch for acl enabled coreutils. Thanks to: Aaron + Peterson <alpeterson@wsu.edu> in bug #51244 for pointing it out. + +*coreutils-5.2.1 (16 May 2004) + + 16 May 2004; Seemant Kulleen <seemant@gentoo.org> -coreutils-5.0-r5.ebuild, + -coreutils-5.0.91-r2.ebuild, -coreutils-5.2.0-r1.ebuild, + -coreutils-5.2.0.ebuild, +coreutils-5.2.1.ebuild: + version bump to latest upstream. This one adds a patch from Sunil + <funtoos@yahoo.com> in bug #44403 which allows compilation if MBRTOWC is *not* + set. + + 16 May 2004; Seemant Kulleen <seemant@gentoo.org> coreutils-5.2.0-r2.ebuild: + Change dependency to autoconf-2.58 or above. This finally fixes the reconf bug + #49137 + + 12 May 2004; Seemant Kulleen <seemant@gentoo.org> coreutils-5.2.0-r2.ebuild: + set autoconf explicitly to 2.5. Should solve bug #49137 by Matt Davis + <mdavis2173@comporium.net> + + 11 May 2004; Gustavo Zacarias <gustavoz@gentoo.org> + coreutils-5.2.0-r2.ebuild: + Stable on sparc wrt #50400 + +*coreutils-5.2.0-r2 (07 May 2004) + + 07 May 2004; Seemant Kulleen <seemant@gentoo.org> + +coreutils-5.2.0-r2.ebuild: + version bump, to install /etc/DIR_COLORS. Thanks to Weeve for noticing on + sparc, and to SPANKY for being SPANKY. + + 22 Apr 2004; Martin Holzer <mholzer@gentoo.org> coreutils-5.2.0-r1.ebuild, + coreutils-5.2.0.ebuild: + changing src_uri. + +*coreutils-5.2.0-r1 (18 Apr 2004) + + 18 Apr 2004; Michael McCabe <randy@gentoo.org> +coreutils-5.2.0-r1.ebuild: + Adding s390 specific fixes to close bug 47965 + + 05 Mar 2004; Seemant Kulleen <seemant@gentoo.org> coreutils-5.2.0.ebuild: + added a don't worry blurb to the reconf section + +*coreutils-5.2.0 (05 Mar 2004) + + 05 Mar 2004; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r5.ebuild, + coreutils-5.0-r6.ebuild, coreutils-5.0.91-r2.ebuild, + coreutils-5.0.91-r3.ebuild, coreutils-5.0.91-r4.ebuild, + coreutils-5.2.0.ebuild: + version bump, should close bug #39632 by SpanKY <vapier@gentoo.org>, who came + up with the fixes anyway, and that bug is related to bug #36337 by Robin + Johnson <robbat2@gentoo.org>. Also, added attr to the explicit deps, per bug + #41641 by toon <toon@hout.vanvergehaald.nl>. Just in case, we're affected by: + bug #43655 by Rajiv Manglani <rajiv@gentoo.org>, this release should fix it. + + 17 Feb 2004; Tom Gall <tgall@gentoo.org> + coreutils-5.0.91-r4.ebuild: + Added ppc64 stable keyword + + 03 Feb 2004; Daniel Robbins <drobbins@gentoo.org> coreutils-5.0.91*.ebuild: + removed unnecessary append-flags -fPIC from ebuilds. + + 17 Jan 2004; Christian Birchinger <joker@gentoo.org> + coreutils-5.0.91-r4.ebuild: + Added sparc stable keyword + + 15 Jan 2004; Seemant Kulleen <seemant@gentoo.org> + coreutils-5.0.91-r4.ebuild : + symlink bin/install to usr/bin/install for Brad House + + 14 Jan 2004; Guy Martin <gmsoft@gentoo.org> coreutils-5.0.91-r4.ebuild : + Marked stable on hppa to have a working g++ again. + + 11 Jan 2004; Seemant Kulleen <seemant@gentoo.org> + coreutils-5.0.91-r4.ebuild: + Applied the 64 bit fixes from MDK's newest src.rpm, which seems to solve the + segfaults. In my defense, I did do some preliminary testing on -r4 with the + previous patchset, and it didn't segfault -- this time, I checked an ls -R / + output on both ia64 and amd64 boxes, so this should be sorted finally (bug + #37891 by E. Papegaaij <e.papegaaij@student.utwente.nl>). Also, it now links + against ncurses-5.3-r5 and greater for building and running. So, we finally + get rid of the termcap cruft, thanks to Azarah for that (bug #37026). + + 11 Jan 2004; Brad House <brad_mssw@gentoo.org> coreutils-5.0.91-r4.ebuild: + coreutils -r4 is not stable on amd64. or at least ls is not. seemant broke it + again :/ + + 09 Jan 2004; Seemant Kulleen <seemant@gentoo.org> + coreutils-5.0.91-r4.ebuild: + uniq and split are moved back to /bin because they are needed by the + bootscripts (checkroot and functions.sh respectively). Thanks to Norberto + Bensa <nbensa@gmx.net> in bug #36453 + + 09 Jan 2004; Seemant Kulleen <seemant@gentoo.org> + coreutils-5.0.91-r4.ebuild: + The ACL patches failed with nls in USE because it was still linking to + termcap. Thanks to: Paul Giordano <giordano@covad.net> in bug #37682 opened + by: Paul de Vrieze <pauldv@gentoo.org> + +*coreutils-5.0.91-r4 (09 Jan 2004) + + 09 Jan 2004; Seemant Kulleen <seemant@gentoo.org> + coreutils-5.0.91-r4.ebuild: + the patches link against ncurses rather than libtermcap, closing bug #37026 by + Martin Flugeldufel <martin_flugeldufel@yahoo.com>. Additionally, some of the + non-critical binaries (those not needed for bootup) have been moved to + /usr/bin, which partially sorts out bug #36453, also by Martin Flugedufel + + 31 Dec 2003; Seemant Kulleen <seemant@gentoo.org> + coreutils-5.0.91-r3.ebuild: + make sure to depend on the newest libtermcap stuff + + 30 Dec 2003; Seemant Kulleen <seemant@gentoo.org> + coreutils-5.0.91-r2.ebuild, coreutils-5.0.91-r3.ebuild: + Added acl, gettext and libtermcap-compat to RDEPEND as well, otherwise that + leads to b0rked tbz2's. Thanks to Donny Davies <woodchip@gentoo.org> :) + + 30 Dec 2003; Seemant Kulleen <seemant@gentoo.org> + coreutils-5.0.91-r3.ebuild: + the lsw patch from mandrake has issues for us on amd64 and ia64, so we don't + use it. Thanks to Brad House <brad_mssw@gentoo.org> for noticing + + 30 Dec 2003; Brad House <brad_mssw@gentoo.org> coreutils-5.0.91-r3.ebuild: + coreutils -r3 is broken bad! See note above KEYWORDS=, marking -* + + 29 Dec 2003; Seemant Kulleen <seemant@gentoo.org> + coreutils-5.0.91-r3.ebuild: + Added libtermcap-compat to DEPEND string, thanks to rommel in #gentoo-ppc + +*coreutils-5.0.91-r3 (29 Dec 2003) + + 29 Dec 2003; Seemant Kulleen <seemant@gentoo.org> + coreutils-5.0.91-r3.ebuild: + several changes to this. First, we're using most of Mandrake's patchset with + fixes, which adds some option to touch -- to make the timestamp move forwards + or backwards. I need some input on whether we should keep this. Additionally, + there is a patch to restore chown's behaviour to the old way. And another + patch to allow old options for several of the utilities here. Additionally, + we're using openi18n.org's patches for coreutils, which should sort (no pun + intended) out bug #29136 by Sven Sternberger <sven.sternberger@desy.de> + + 27 Dec 2003; Seemant Kulleen <seemant@gentoo.org> : + fix uname output for hppa and ppc. Patch by Guy Martin <gmsoft@gentoo.org>. + Closes bug #36190 + + 14 Dec 2003; Lars Weiler <pylon@gentoo.org> coreutils-5.0.91-r2.ebuild: + Added dependency ppc? ( >=sys-devel/m4-1.4-r1 ). See bug #35759 + + 10 Dec 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r5.ebuild, + coreutils-5.0-r6.ebuild, coreutils-5.0.91-r2.ebuild: + Bartron pointed out the dangers of filtering the flag in the same bug report. + So yanking that. USe dangerous flags at your risk, not mine :P + + 10 Dec 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r5.ebuild, + coreutils-5.0-r6.ebuild, coreutils-5.0.91-r2.ebuild: + filter out the malign-double flag, closing bug #35411 + + 09 Dec 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r5.ebuild, + coreutils-5.0-r6.ebuild, coreutils-5.0.91-r2.ebuild: + patch added to prevent the installation of the following inferior man pages: + chgrp, chmod, chown, cp, dd, df, dir, dircolors, du, install, ln, ls, mkdir, + mkfifo, mknod, mv, rm, rmdir, touch and vdir. Those man pages will be supplied + by the man-pages package instead. This should close most of bug #32096 + by Radek Podgorny <radek@podgorny.cz> + + 09 Dec 2003; Seemant Kulleen <seemant@gentoo.org> + coreutils-5.0.91-r2.ebuild: + make sure it uses automake-1.7 -- closing bug #35425 by Marc Bevand + <bevand_m@epita.fr> + +*coreutils-5.0-r6 (08 Dec 2003) +*coreutils-5.0-r5 (08 Dec 2003) +*coreutils-5.0.91-r2 (08 Dec 2003) + + 08 Dec 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r3.ebuild, + coreutils-5.0-r4.ebuild, coreutils-5.0-r5.ebuild, coreutils-5.0-r6.ebuild, + coreutils-5.0.91-r1.ebuild, coreutils-5.0.91-r2.ebuild, + coreutils-5.0.91.ebuild: + coreutils will now not compile the following: su, groups (both from shadow), + uptime, kill (both from procps), and hostname (from net-tools). This + closes bug #18181 by Jon Portnoy <avenj@gentoo.org>. Also, the groups + thing was bug in #27071 by Marcin Wisnicki <wisnia21@freeshell.org> + + 06 Dec 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r1.ebuild, + coreutils-5.0-r2.ebuild, coreutils-5.0-r3.ebuild: + moved -r3 to stable mips and removed crufty older ebuilds + + 19 Nov 2003; Martin Holzer <mholzer@gentoo.org> coreutils-5.0.91-r1.ebuild, + coreutils-5.0.91.ebuild: + adding version number to automake. Closes #33836. + +*coreutils-5.0.91-r1 (18 Nov 2003) + + 23 Nov 2003; Guy Martin <gmsoft@gentoo.org> coreutils-5.0.91-r1.ebuild : + The uname patch now works on hppa. + + 18 Nov 2003; Chris PeBenito <pebenito@gentoo.org> + coreutils-5.0.91-r1.ebuild: + Bump to update SELinux patch. The old patch had a rare segfault/hang problem + in ls. Otherwise, same as -r0. + + 03 Nov 2003; Daniel Robbins <drobbins@gentoo.org> all of 'em: added missing + RDEPEND so they don't default to DEPEND. + + 02 Nov 2003; Chris PeBenito <pebenito@gentoo.org> coreutils-5.0-r4.ebuild: + Missed removing SELinux patch from 5.0-r4 + + 28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> coreutils-5.0-r1.ebuild, + coreutils-5.0-r2.ebuild, coreutils-5.0-r3.ebuild, coreutils-5.0.91.ebuild: + Switch SELinux patch from old API to new API. + + 01 Oct 2003; Tavis Ormandy <taviso@gentoo.org> coreutils-5.0.91.ebuild: + missing help2man dependency + + 28 Sep 2003; Chris PeBenito <pebenito@gentoo.org> coreutils-5.0.91.ebuild: + Fix selinux patch for 5.0.91. + +*coreutils-5.0.91 (28 Sep 2003) + + 28 Sep 2003; Martin Schlemmer <azarah@gentoo.org> coreutils-5.0.91.ebuild: + Update version. I ported the ACL patches, except for the i18n one, as it gets + messy, and there are a lot of Makefile breakage, and also what might be + upstream fixes for the same thing. I thus rather think somebody that know a + bit more about locale and such that can test it should do this. Same thing for + the SELINUX patch - its a lot of small breakages and is tedious - I thought + getting this in so far should motivate somebody with more time than me :) + + 26 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> coreutils-5.0-r4.ebuild: + set ppc in keywords + +*coreutils-4.5.11-r1 (24 Sep 2003) + + 24 Sep 2003; Seemant Kulleen <seemant@gentoo.org> + coreutils-4.5.11-r1.ebuild, coreutils-5.0-r1.ebuild, + coreutils-5.0-r2.ebuild, coreutils-5.0-r3.ebuild, coreutils-5.0-r4.ebuild: + added static to IUSE, closing bug #29186 by Sascha Silbe + <sascha-gentoo-bugzilla@silbe.org> + + 24 Sep 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r1.ebuild, + coreutils-5.0-r2.ebuild, coreutils-5.0-r3.ebuild, coreutils-5.0-r4.ebuild: + add automake to depends, because it provides aclocal, which is needed to build + coreutils. Thanks to Jared Hudso <jhhudso@gentoo.org> + + 22 Sep 2003; Martin Schlemmer <azarah@gentoo.org> coreutils-5.0-r4.ebuild: + Ok, was on crack there for a moment - the test for cvs was inverted, should be + fixed now. + + 22 Sep 2003; Martin Schlemmer <azarah@gentoo.org> coreutils-5.0-r4.ebuild: + Fix issues with gettext's autopoint if cvs is not installed (bug #28920). + + 19 Sep 2003; Christian Birchinger <joker@gentoo.org> + coreutils-5.0-r3.ebuild: + Added sparc stable keyword + + 17 Sep 2003; Jon Portnoy <avenj@gentoo.org> coreutils-5.0-r4.ebuild : + IA64 keywords. And don't believe Seemant - he really isn't an idiot. :) + + 14 Sep 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r4.ebuild: + I'm an idiot sometimes. The progress bar patch was being moved out of the way. + Thanks pebenito, and sorry :( + + 13 Sep 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r4.ebuild: + Luca Barbato <lu_zero@gentoo.org> fixed the acl patch to compile with NLS + disabled. This should close the NULL not found errors, as reported in bug + #18151 by shadow. + + 12 Sep 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r3.ebuild: + Added message about removing fileutils, textutils and sh-utils in + pkg_postinst. Closes bug #25019 by Chuck Brewer <cbrewer@stealthaccess.net> + +*coreutils-5.0-r4 (12 Sep 2003) + + 12 Sep 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r4.ebuild: + ACL patches _finally_ added into coreutils. A note about this. If "acl" + and "selinux" are both in USE, then "selinux" will be preferred and "acl" + discarded. Also, the progress-bar patch has been modified to work with + the acl stuff. This modification was done by: Marcin Wisnicki + <wisnia21@freeshell.org> in bug #18151. What I have done is put the acl + patches into the gentoo patch tarball and changed the layout. Patches are + numbered to work with epatch's directory patching functionality, and if + acl is used, then the original progresspatch is discarded. Marked -r3 + stable on x86. Bug #18151 by: shadow@ines.ro is now closed. + +*coreutils-5.0-r3 (26 Aug 2003) + + 26 Aug 2003; Martin Schlemmer <azarah@gentoo.org> Manifest, + coreutils-5.0-r3.ebuild: + Fix issues with gcc-2.95.3, bug #27329, thanks to patch from TGL + <degrenier@easyconnect.fr>. + + 25 Aug 2003; Chris PeBenito <pebenito@gentoo.org> coreutils-5.0-r2.ebuild: + Fix selinux patch, as the old patch fails to apply when the progress bar patch + is applied. + +*coreutils-5.0-r2 (24 Aug 2003) + + 24 Aug 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r2.ebuild: + adds a patch to display a progress bar for mv and cp (when invoked with the -g + option). Thanks to Haukkari in #gentoo for passing this on to us. The patch + was authored by: Miika Pekkarinen <miipekk@ihme.org> + + 03 Aug 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r1.ebuild, + coreutils-5.0.ebuild, files/coreutils-5.0-confdir3.patch: + gentoo patch updated to query mips properly for the uname info -- thanks to + Kumba + + 02 Aug 2003; Martin Schlemmer <azarah@gentoo.org> coreutils-5.0-r1.ebuild: + Remove confdir3 patch for now. + + 02 Aug 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r1.ebuild, + coreutils-5.0.ebuild: + Azarah's brilliance again :) sandbox is disabled for coreutils while + portage-2.0.49 has not come out + + 01 Aug 2003; Aron Griffis <agriffis@gentoo.org> coreutils-5.0-r1.ebuild, + files/coreutils-5.0-confdir3.patch: + Fix bug 25702 by refraining from cleaning up PATH_MAX test + +*coreutils-5.0-r1 (28 Jul 2003) + + 28 Jul 2003; Martin Schlemmer <azarah@gentoo.org> coreutils-5.0-r1.ebuild: + Do not include su infopage, as it is not valid for the su from sys-apps/shadow + that we are using (bug #23711). + +*coreutils-5.0 (04 Apr 2003) + + 04 Apr 2003; Joshua Brindle <method@gentoo.org> coreutils-5.0.ebuild: + bumped to upstream stable release version + +*coreutils-4.5.11 (20 Mar 2003) + + 20 Mar 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-4.5.10.ebuild, + coreutils-4.5.11.ebuild, files/coreutils-4.5.10-gentoo-rms.diff, + files/coreutils-4.5.10-gentoo-uname.diff, + files/coreutils-4.5.9-gentoo-rms.diff, + files/coreutils-4.5.9-gentoo-uname.diff: + version bump, and moved patches to mirrors + +*coreutils-4.5.10 (14 Mar 2003) + + 20 Mar 2003; Joshua Brindle <method@gentoo.org> coreutils-4.5.10.ebuild: + fixed selinux dependancy + + 20 Mar 2003; Seemant Kulleen <seemant@gentoo.org> + coreutils-4.5.10.ebuild : + + Patched to add selinux, thanks to sindian. Note, I removed the -r1 + revision bump as it was unnecessary. + + 14 Mar 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-4.5.10.ebuild: + version bump thanks to drobbins on -core + +*coreutils-4.5.9-r1 (11 Mar 2003) + + 11 Mar 2003; Martin Schlemmer <azarah@gentoo.org> coreutils-4.5.9-r1.ebuild : + Fix overwriting /bin/hostname, and causing /bin/domainname (symlink to + /bin/hostname) to set the hostname instead of the domainname. We use + hostname from net-tools after all. Ditto for /bin/uptime. + + 11 Mar 2003; Martin Schlemmer <azarah@gentoo.org> coreutils-4.5.9.ebuild : + OK, I am dense. Seems when I did previous fix, I changed the: + + rm ${D}/usr/share/man/man1/su + + to: + + rm ${D}/usr/share/man/man1/su* + + Fixed this to fix the sum problem. + + 11 Mar 2003; Martin Schlemmer <azarah@gentoo.org> coreutils-4.5.9.ebuild : + Move symlink stuff till after we remove stuff we do not use, else we have + invalid symlinks. Change einstall to 'make DESTDIR=$D install', else it + do not install all the manpages. + + Fix manpages again by manually installing. + +*coreutils-4.5.9 (06 Mar 2003) + + 11 Mar 2003; Zach Welch <zwelch@gentoo.org> coreutils-4.5.9-r1.ebuild, + coreutils-4.5.9.ebuild: + add arm keyword + + 06 Mar 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-4.5.9.ebuild + ChangeLog files/digest-coreutils-4.5.9 : + + New package -- this will replace fileutils text-utils and sh-utils, when + it gets unmasked. diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest new file mode 100644 index 0000000..1f8bf75 --- /dev/null +++ b/sys-apps/coreutils/Manifest @@ -0,0 +1,8 @@ +AUX coreutils-6.10-selinux-opt.patch 1327 RMD160 b9db461ed7602e7098f91e6d2f80243fdf737338 SHA1 bd51347adbf88a764b863e1fdb61340e7fb69901 SHA256 47e233b4214a527131c84eaad7f1e998aa270087dda03cdc57ad88ea2f0b3b6f +AUX coreutils-6.12-ginstall.patch 1037 RMD160 365020dd233c1bb4a058bb307fd23fa2dd5ed800 SHA1 42158cd22a1f39d1c490f2915be821269321bb19 SHA256 872d987c1a1b6a48ab3aa8ea7192eb257f85608fb3b2ffb159555097de5f5d78 +AUX gnulib-utimens-update.patch 3023 RMD160 92ec648720090636366c3e03ba3f173e4b48c1c9 SHA1 963617be45ab53df762a61ee09608771bf6d67c0 SHA256 e2653050dff4bf86e533205b30001575e113e9e32dacb5169b17e6729c0079e2 +DIST coreutils-6.12-patches-1.0.tar.lzma 9758 RMD160 cfef9541194e4c0c7fdab2d342d5c1d75df75984 SHA1 2b29f48c24fb297174d4da5993bf3f8d9a81db94 SHA256 aa29b8d7790c87517c48fc44fb9d5abba700796d76f81ad080c3d0312ae7e758 +DIST coreutils-6.12.tar.lzma 3743740 RMD160 cf561826da0af4be7585f65c3b284563ddcdf382 SHA1 77aaa268371c015d5cb4307216608b9a383432f4 SHA256 4c9106a97c00cdc9e41c4c91427d2066130dd3dccd8e1643697b2963fff0546e +EBUILD coreutils-6.12-r2.ebuild 5032 RMD160 dd08c1186b9f33210eeb951dcef3e90f5f7dcf2a SHA1 8cd0fb67d6d3f9cbcd0e5d8dcd67b1595070bb47 SHA256 a9f4b012d8b4ad8d3fe332b554b4a5dd785bf0bf2d0db96af1ce4c7eb360afb5 +MISC ChangeLog 35727 RMD160 383d5c563411c734d555aeea5ade42110b8ce69a SHA1 70318339f09caabe8c13b73d9e48e3c358f8ed2f SHA256 919908520d71467907403dfe39914f2cec43546b653388e12ce810044f72e451 +MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 diff --git a/sys-apps/coreutils/coreutils-6.12-r2.ebuild b/sys-apps/coreutils/coreutils-6.12-r2.ebuild new file mode 100644 index 0000000..c2bbf1b --- /dev/null +++ b/sys-apps/coreutils/coreutils-6.12-r2.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.12-r2.ebuild,v 1.1 2008/10/16 03:06:16 robbat2 Exp $ + +inherit eutils flag-o-matic toolchain-funcs autotools + +PATCH_VER="1.0" +DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)" +HOMEPAGE="http://www.gnu.org/software/coreutils/" +SRC_URI="ftp://alpha.gnu.org/gnu/coreutils/${P}.tar.lzma + mirror://gnu/${PN}/${P}.tar.lzma + mirror://gentoo/${P}.tar.lzma + mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma + http://dev.gentoo.org/~vapier/dist/${P}-patches-${PATCH_VER}.tar.lzma" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="acl nls selinux static xattr vanilla" + +RDEPEND="selinux? ( sys-libs/libselinux ) + acl? ( sys-apps/acl ) + xattr? ( sys-apps/attr ) + nls? ( >=sys-devel/gettext-0.15 ) + !<sys-apps/util-linux-2.13 + !net-mail/base64 + !sys-apps/mktemp + >=sys-libs/ncurses-5.3-r5" +DEPEND="${RDEPEND} + app-arch/lzma-utils + >=sys-devel/automake-1.10.1 + >=sys-devel/autoconf-2.61 + >=sys-devel/m4-1.4-r1" + +pkg_setup() { + # fixup expr for #123342 + if [[ $(/bin/expr a : '\(a\)') != "a" ]] ; then + if [[ -x /bin/busybox ]] ; then + ln -sf /bin/busybox /bin/expr + else + eerror "Your expr binary appears to be broken, please fix it." + eerror "For more info, see http://bugs.gentoo.org/123342" + die "your expr is broke" + fi + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + if ! use vanilla ; then + EPATCH_SUFFIX="patch" \ + PATCHDIR="${WORKDIR}/patch" \ + EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \ + epatch + fi + + #Fix bug 224483 + #sys-apps/coreutils-6.12 - touch uses unknown system call utimensat + epatch "${FILESDIR}"/gnulib-utimens-update.patch + + #Fix bug 230073 + # Do not blindly include libselinux + epatch "${FILESDIR}/${PN}"-6.10-selinux-opt.patch + + if tc-is-cross-compiler; then + epatch "${FILESDIR}"/coreutils-6.12-ginstall.patch + fi + + # Since we've patched many .c files, the make process will try to + # re-build the manpages by running `./bin --help`. When doing a + # cross-compile, we can't do that since 'bin' isn't a native bin. + # Also, it's not like we changed the usage on any of these things, + # so let's just update the timestamps and skip the help2man step. + touch man/*.1 + # There's no reason for this crap to use the private version + sed -i 's:__mempcpy:mempcpy:g' lib/*.c + + use vanilla || AT_M4DIR="m4" eautoreconf +} + +src_compile() { + if ! type -p cvs > /dev/null ; then + # Fix issues with gettext's autopoint if cvs is not installed, + # bug #28920. + export AUTOPOINT="/bin/true" + fi + + local myconf="" + [[ ${USERLAND} == "GNU" ]] || myconf="${myconf} --bindir=/usr/libexec/gnu" + if echo "#include <regex.h>" | $(tc-getCPP) > /dev/null ; then + myconf="${myconf} --without-included-regex" + fi + + # cross-compile workaround #177061 + [[ ${CHOST} == *-linux* ]] && export fu_cv_sys_stat_statvfs=yes + + use static && append-ldflags -static + # kill/uptime - procps + # groups/su - shadow + # hostname - net-tools + econf \ + --enable-install-program="arch" \ + --enable-no-install-program="groups,hostname,kill,su,uptime" \ + --enable-largefile \ + $(use_enable nls) \ + $(use_enable acl) \ + $(use_enable xattr) \ + $(use_enable selinux) \ + ${myconf} \ + || die "econf" + if tc-is-cross-compiler; then + sed -i -e "s|SUBDIRS = lib src doc man po tests gnulib-tests|SUBDIRS = lib src doc po tests gnulib-tests|" Makefile + fi + emake || die "emake" +} + +src_test() { + # Non-root tests will fail if the full path isnt + # accessible to non-root users + chmod -R go-w "${WORKDIR}" + chmod a+rx "${WORKDIR}" + addwrite /dev/full + export RUN_EXPENSIVE_TESTS="yes" + #export FETISH_GROUPS="portage wheel" + make -k check || die "make check failed" +} + +src_install() { + emake install DESTDIR="${D}" || die + rm -f "${D}"/usr/lib/charset.alias + dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO + + insinto /etc + newins src/dircolors.hin DIR_COLORS || die + + if [[ ${USERLAND} == "GNU" ]] ; then + cd "${D}"/usr/bin + dodir /bin + # move critical binaries into /bin (required by FHS) + local fhs="cat chgrp chmod chown cp date dd df echo false ln ls + mkdir mknod mv pwd rm rmdir stty sync true uname" + mv ${fhs} ../../bin/ || die "could not move fhs bins" + # move critical binaries into /bin (common scripts) + local com="basename chroot cut dir dirname du env expr head mkfifo + mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" + mv ${com} ../../bin/ || die "could not move common bins" + # create a symlink for uname in /usr/bin/ since autotools require it + local x + for x in ${com} uname ; do + dosym /bin/${x} /usr/bin/${x} || die + done + else + # For now, drop the man pages, collides with the ones of the system. + rm -rf "${D}"/usr/share/man + fi +} + +pkg_postinst() { + ewarn "Make sure you run 'hash -r' in your active shells." +} diff --git a/sys-apps/coreutils/files/coreutils-6.10-selinux-opt.patch b/sys-apps/coreutils/files/coreutils-6.10-selinux-opt.patch new file mode 100644 index 0000000..3c03f8e --- /dev/null +++ b/sys-apps/coreutils/files/coreutils-6.10-selinux-opt.patch @@ -0,0 +1,39 @@ +Disable automagical building of stuff with libselinux. + +Gentoo-Bug: 230073 +Acked-by: Robin H. Johnson <robbat2@gentoo.org> + +--- coreutils-6.10/m4/gnulib-comp.m4.orig 2008-07-06 18:44:54.000000000 +0200 ++++ coreutils-6.10/m4/gnulib-comp.m4 2008-07-06 20:17:37.000000000 +0200 +@@ -263,16 +263,25 @@ + gl_SAVEWD + # FIXME: put this in an .m4 file? + # For runcon. +- AC_CHECK_HEADERS([selinux/flask.h]) +- AC_LIBOBJ([selinux-at]) +- ac_save_LIBS="$LIBS" ++ AC_LIBOBJ([selinux-at]) ++ AC_ARG_ENABLE([selinux], ++ AC_HELP_STRING([--disable-selinux], [disable support for SELinux]), ++ , [enable_selinux=auto]) ++ if test "x$enable_selinux" != "xno" ; then ++ AC_CHECK_HEADERS([selinux/flask.h]) ++ ac_save_LIBS="$LIBS" + AC_SEARCH_LIBS(setfilecon, selinux, + [test "$ac_cv_search_setfilecon" = "none required" || + LIB_SELINUX=$ac_cv_search_setfilecon]) + AC_SUBST(LIB_SELINUX) +- LIBS="$ac_save_LIBS" +- gl_HEADERS_SELINUX_SELINUX_H +- gl_HEADERS_SELINUX_CONTEXT_H ++ LIBS="$ac_save_LIBS" ++ gl_HEADERS_SELINUX_SELINUX_H ++ gl_HEADERS_SELINUX_CONTEXT_H ++ else ++ AC_SUBST(LIB_SELINUX,"") ++ AC_SUBST(SELINUX_CONTEXT_H,selinux/context.h) ++ AC_SUBST(SELINUX_SELINUX_H,selinux/selinux.h) ++ fi + gl_FUNC_SETENV + gl_STDLIB_MODULE_INDICATOR([setenv]) + gl_SETTIME diff --git a/sys-apps/coreutils/files/coreutils-6.12-ginstall.patch b/sys-apps/coreutils/files/coreutils-6.12-ginstall.patch new file mode 100644 index 0000000..683410e --- /dev/null +++ b/sys-apps/coreutils/files/coreutils-6.12-ginstall.patch @@ -0,0 +1,27 @@ +--- src/Makefile.am.orig 2008-09-12 13:56:41.000000000 +0200 ++++ src/Makefile.am 2008-09-12 14:00:37.000000000 +0200 +@@ -430,11 +430,13 @@ + { echo 'the above variables should have static scope' 1>&2; \ + exit 1; } || : + +-.PHONY: cu-install-binPROGRAMS + install-exec-am: +- @case '$(program_transform_name):$(EXEEXT)' in \ ++ @(./ginstall --version) > /dev/null 2>&1 \ ++ && install=./ginstall \ ++ || install='$(INSTALL_PROGRAM)'; \ ++ case '$(program_transform_name):$(EXEEXT)' in \ + 's,x,x,:') cu=cu-;; *) cu= ;; esac; \ +- $(MAKE) $(AM_MAKEFLAGS) binPROGRAMS_INSTALL=./ginstall \ ++ $(MAKE) $(AM_MAKEFLAGS) binPROGRAMS_INSTALL="$$install" \ + $${cu}install-binPROGRAMS + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook +@@ -451,6 +453,7 @@ + filtered_PROGS = \ + `echo "$(bin_PROGRAMS)" | sed 's/ *\<ginstall\> */ /;s/ *\[ */ /'` + d_bindir = $(DESTDIR)$(bindir) ++.PHONY: cu-install-binPROGRAMS + cu-install-binPROGRAMS: $(bin_PROGRAMS) + $(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(d_bindir)" diff --git a/sys-apps/coreutils/files/gnulib-utimens-update.patch b/sys-apps/coreutils/files/gnulib-utimens-update.patch new file mode 100644 index 0000000..d3e3fec --- /dev/null +++ b/sys-apps/coreutils/files/gnulib-utimens-update.patch @@ -0,0 +1,113 @@ +--- coreutils-6.12/lib/utimens.c 2008-05-29 09:21:57.000000000 -0400 ++++ lib/utimens.c 2008-06-07 11:36:50.000000000 -0400 +@@ -96,20 +96,42 @@ + #endif + + /* POSIX 200x added two interfaces to set file timestamps with +- nanosecond resolution. */ ++ nanosecond resolution. We provide a fallback for ENOSYS (for ++ example, compiling against Linux 2.6.25 kernel headers and glibc ++ 2.7, but running on Linux 2.6.18 kernel). */ + #if HAVE_UTIMENSAT + if (fd < 0) +- return utimensat (AT_FDCWD, file, timespec, 0); ++ { ++ int result = utimensat (AT_FDCWD, file, timespec, 0); ++#ifdef __linux__ ++ /* Work around what might be a kernel bug: ++ http://bugzilla.redhat.com/442352 ++ http://bugzilla.redhat.com/449910 ++ It appears that utimensat can mistakenly return 280 rather ++ than 0 to indicate success. ++ FIXME: remove in 2010 or whenever the offending kernels ++ are no longer in common use. */ ++ if (0 < result) ++ result = 0; ++#endif ++ ++ if (result == 0 || errno != ENOSYS) ++ return result; ++ } + #endif + #if HAVE_FUTIMENS +- return futimens (fd, timespec); +-#else ++ { ++ int result = futimens (fd, timespec); ++ if (result == 0 || errno != ENOSYS) ++ return result; ++ } ++#endif + + /* The platform lacks an interface to set file timestamps with + nanosecond resolution, so do the best we can, discarding any + fractional part of the timestamp. */ + { +-# if HAVE_FUTIMESAT || HAVE_WORKING_UTIMES ++#if HAVE_FUTIMESAT || HAVE_WORKING_UTIMES + struct timeval timeval[2]; + struct timeval const *t; + if (timespec) +@@ -125,9 +147,9 @@ + + if (fd < 0) + { +-# if HAVE_FUTIMESAT ++# if HAVE_FUTIMESAT + return futimesat (AT_FDCWD, file, t); +-# endif ++# endif + } + else + { +@@ -141,21 +163,21 @@ + worth optimizing, and who knows what other messed-up systems + are out there? So play it safe and fall back on the code + below. */ +-# if HAVE_FUTIMESAT ++# if HAVE_FUTIMESAT + if (futimesat (fd, NULL, t) == 0) + return 0; +-# elif HAVE_FUTIMES ++# elif HAVE_FUTIMES + if (futimes (fd, t) == 0) + return 0; +-# endif ++# endif + } +-# endif /* HAVE_FUTIMESAT || HAVE_WORKING_UTIMES */ ++#endif /* HAVE_FUTIMESAT || HAVE_WORKING_UTIMES */ + + if (!file) + { +-# if ! (HAVE_FUTIMESAT || (HAVE_WORKING_UTIMES && HAVE_FUTIMES)) ++#if ! (HAVE_FUTIMESAT || (HAVE_WORKING_UTIMES && HAVE_FUTIMES)) + errno = ENOSYS; +-# endif ++#endif + + /* Prefer EBADF to ENOSYS if both error numbers apply. */ + if (errno == ENOSYS) +@@ -170,9 +192,9 @@ + return -1; + } + +-# if HAVE_WORKING_UTIMES ++#if HAVE_WORKING_UTIMES + return utimes (file, t); +-# else ++#else + { + struct utimbuf utimbuf; + struct utimbuf const *ut; +@@ -187,9 +209,8 @@ + + return utime (file, ut); + } +-# endif /* !HAVE_WORKING_UTIMES */ ++#endif /* !HAVE_WORKING_UTIMES */ + } +-#endif /* !HAVE_FUTIMENS */ + } + + /* Set the access and modification time stamps of FILE to be diff --git a/sys-apps/coreutils/metadata.xml b/sys-apps/coreutils/metadata.xml new file mode 100644 index 0000000..96a2d58 --- /dev/null +++ b/sys-apps/coreutils/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>base-system</herd> +</pkgmetadata> diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog new file mode 100644 index 0000000..ca21736 --- /dev/null +++ b/sys-apps/kbd/ChangeLog @@ -0,0 +1,320 @@ +# ChangeLog for sys-apps/kbd +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.77 2008/11/17 22:48:07 flameeyes Exp $ + + 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org> + files/kbd-1.12-debian.patch: + Fix patch with absolute paths. + + 23 Sep 2008; Markus Rothe <corsair@gentoo.org> kbd-1.14.1-r1.ebuild: + Stable on ppc + + 25 May 2008; Markus Rothe <corsair@gentoo.org> kbd-1.14.1-r1.ebuild: + Stable on ppc64 + + 10 Apr 2008; Mike Frysinger <vapier@gentoo.org> + kbd-1.14.1-r1.ebuild: + Fix building on sparc #217068 by David Dolbel. + +*kbd-1.14.1-r1 (01 Apr 2008) + + 01 Apr 2008; Mike Frysinger <vapier@gentoo.org> + +files/kbd-1.14.1-missing-configure.patch, -kbd-1.14.1.ebuild, + +kbd-1.14.1-r1.ebuild: + Fix from Charles Clément for missing binaries #215610 by Massimo Maggi. + +*kbd-1.14.1 (30 Mar 2008) + + 30 Mar 2008; Mike Frysinger <vapier@gentoo.org> +kbd-1.14.1.ebuild: + Version bump #215280 by timofonic. + + 19 Nov 2007; Joshua Kinard <kumba@gentoo.org> kbd-1.13-r1.ebuild: + Stable on mips, per #195687. + + 22 Oct 2007; Raúl Porcel <armin76@gentoo.org> kbd-1.13-r1.ebuild: + alpha/ia64/sparc stable wrt #195687 + + 15 Oct 2007; Jeroen Roovers <jer@gentoo.org> kbd-1.13-r1.ebuild: + Stable for HPPA (bug #195687). + + 14 Oct 2007; Markus Rothe <corsair@gentoo.org> kbd-1.13-r1.ebuild: + Stable on ppc64; bug #195687 + + 13 Oct 2007; Christoph Mende <angelos@gentoo.org> kbd-1.13-r1.ebuild: + Stable on amd64 wrt bug #195687 + + 13 Oct 2007; nixnut <nixnut@gentoo.org> kbd-1.13-r1.ebuild: + Stable on ppc wrt bug 195687 + + 13 Oct 2007; Dawid Węgliński <cla@gentoo.org> kbd-1.13-r1.ebuild: + Stable on x86 (bug #195687) + +*kbd-1.13-r1 (26 Aug 2007) + + 26 Aug 2007; Mike Frysinger <vapier@gentoo.org> + files/kbd-1.13-dont-use-error.patch, +kbd-1.13-r1.ebuild: + Fix from Alexey Gladkov so our patch doesnt break things #184037. + +*kbd-1.13 (28 Jun 2007) + + 28 Jun 2007; Mike Frysinger <vapier@gentoo.org> + +files/kbd-1.13-dont-use-error.patch, +kbd-1.13.ebuild: + Version bump. + + 15 Nov 2006; Markus Rothe <corsair@gentoo.org> kbd-1.12-r8.ebuild: + Stable on ppc64; bug #153556 + + 02 Nov 2006; Timothy Redaelli <drizzt@gentoo.org> kbd-1.12-r8.ebuild: + Stable for ppc (bug #153556). + + 02 Nov 2006; Jeroen Roovers <jer@gentoo.org> kbd-1.12-r8.ebuild: + Stable for HPPA (bug #153556). + + 01 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> kbd-1.12-r8.ebuild: + Stable on Alpha + ia64, bug 153556. + + 31 Oct 2006; Torsten Veller <tove@gentoo.org> kbd-1.12-r8.ebuild: + Stable on x86 (#153556) + + 31 Oct 2006; Danny van Dyk <kugelfang@gentoo.org> kbd-1.12-r8.ebuild: + Marked stable on amd64. + + 31 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> kbd-1.12-r8.ebuild: + Stable on sparc wrt #153556 + + 23 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> + +files/kbd-1.12-kbio.patch, kbd-1.12-r8.ebuild: + Build fix: sparc newer linux-headers lack asm/kbio + + 14 Oct 2006; Aron Griffis <agriffis@gentoo.org> kbd-1.12-r7.ebuild: + Mark 1.12-r7 stable on ia64 + + 26 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> kbd-1.12-r7.ebuild: + Stable on hppa wrt #146511 + + 14 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> kbd-1.12-r7.ebuild: + Stable on sparc wrt #146511 + + 09 Sep 2006; Torsten Veller <tove@gentoo.org> kbd-1.12-r7.ebuild: + Stable on x86 (#146511) + + 09 Sep 2006; Thomas Cort <tcort@gentoo.org> kbd-1.12-r7.ebuild: + Stable on amd64 wrt Bug #146511. + + 08 Sep 2006; Stephanie Lockwood-Childs <wormo@gentoo.org> + kbd-1.12-r7.ebuild: + stable on ppc (Bug #146511) + + 06 Sep 2006; Markus Rothe <corsair@gentoo.org> kbd-1.12-r7.ebuild: + Stable on ppc64; bug #146511 + +*kbd-1.12-r8 (24 Aug 2006) + + 24 Aug 2006; Roy Marples <uberlord@gentoo.org> + +files/kbd-1.12-unimap.patch, +kbd-1.12-r8.ebuild: + Fix the Debian patch mangling the unimaps directory. + +*kbd-1.12-r7 (28 Jun 2006) + + 28 Jun 2006; <solar@gentoo.org> +files/kbd-1.12-xcompile.patch, + +kbd-1.12-r7.ebuild: + - fix cross-compile failing for powerpc targets bug #133856 + + 10 Jun 2006; Mike Frysinger <vapier@gentoo.org> + +files/kbd-1.12-configure-LANG.patch, kbd-1.12-r6.ebuild: + Fix building in et_EE locale #128253 by J. + +*kbd-1.12-r6 (16 Mar 2006) + + 16 Mar 2006; Mike Frysinger <vapier@gentoo.org> +kbd-1.12-r6.ebuild: + Drop the italian euro keymap patch #75970. + + 08 Feb 2006; Joel Martin <kanaka@gentoo.org> kbd-1.12-r5.ebuild: + Don't run test programs when cross-compiling. Export CC for cross-compiling. + + 12 Jul 2005; Joseph Jezak <josejx@gentoo.org> kbd-1.12-r5.ebuild: + Marked ppc stable. + + 07 Jul 2005; Markus Rothe <corsair@gentoo.org> kbd-1.12-r5.ebuild: + Stable on ppc64 + + 04 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> kbd-1.12-r5.ebuild: + Stable on sparc + + 02 Jul 2005; Mike Frysinger <vapier@gentoo.org> + +files/kbd-1.12-jp-escape.patch, kbd-1.12-r5.ebuild: + Touch up the jp106 map #71870 by OKUMURA N. Shin-ya. + + 31 May 2005; Sven Wegener <swegener@gentoo.org> kbd-1.12-r3.ebuild, + kbd-1.12-r4.ebuild, kbd-1.12-r5.ebuild: + Let portage handle the stripping of binaries. + +*kbd-1.12-r5 (19 May 2005) + + 19 May 2005; Martin Schlemmer <azarah@gentoo.org> + +files/kbd-1.12-Meta_utf8.patch, +files/kbd-1.12-alias.patch, + +files/kbd-1.12-setfont-man.patch, +kbd-1.12-r5.ebuild: + Add patches from fedora. + + 02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> : + Change encoding to UTF-8 for GLEP 31 compliance + +*kbd-1.12-r4 (29 Dec 2004) + + 29 Dec 2004; Mike Frysinger <vapier@gentoo.org> + files/kbd-1.12-cz-qwerty-map.patch, +files/kbd-1.12-it-euro-map.patch, + files/kbd-1.12-kbd_repeat-v2.patch, +kbd-1.12-r4.ebuild: + Add patch by Tupone Alfredo for italian maps to support the euro #75970. + +*kbd-1.12-r3 (26 Oct 2004) + + 26 Oct 2004; Mike Frysinger <vapier@gentoo.org> + +files/kbd-1.12-cz-qwerty-map.patch, +files/kbd-1.12-debian.patch, + +kbd-1.12-r3.ebuild: + Fix cz keymaps #19010 by kavol@email.cz. Include svorak keymap #55643 by + David Holm. Grab some updates from debian. + + 16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> kbd-1.12-r2.ebuild: + use emake + + 16 Jun 2004; Aron Griffis <agriffis@gentoo.org> -kbd-1.06-r1.ebuild, + -kbd-1.08-r4.ebuild, kbd-1.08-r5.ebuild, -kbd-1.12-r1.ebuild, + kbd-1.12-r2.ebuild, -kbd-1.12.ebuild: + - Fix bug 53984: Mark 1.12-r2 stable everywhere so we don't have to + workaround the /bin/kbd_mode vs. /usr/bin/kbd_mode issue in + baselayout + - Fix bugs 42859 and 46456: Unpack manually to avoid the issue of a + UTF-8 filename in the tarball + - Trim old ebuilds + + 11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> kbd-1.12-r2.ebuild: + Stable on alpha. + + 02 Jun 2004; Travis Tilley <lv@gentoo.org> kbd-1.12-r2.ebuild: + stable on amd64 + + 01 Jun 2004; Tom Gall <tgall@gentoo.org> kbd-1.12-r2.ebuild: + stable on ppc64 bug #52651 + +*kbd-1.12-r2 (08 Feb 2004) + + 08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.12-r2.ebuild, + files/kbd-1.12-kbd_repeat-v2.patch: + Update patch from Andries again. + +*kbd-1.12-r1 (08 Feb 2004) + + 08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.12-r1.ebuild, + files/kbd-1.12-kbd_repeat.patch: + Sparc have not yet fixed struct kbd_rate to use 'period' and not 'rate'. Patch + by Andries Brouwer <Andries.Brouwer@cwi.nl>. + +*kbd-1.12 (29 Jan 2004) + + 29 Jan 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.12.ebuild, + files/kbd-1.12-find-map-fix.patch: + Update version. Add proper patch from Andries for this version. + +*kbd-1.08-r5 (29 Jan 2004) + + 29 Jan 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r5.ebuild, + files/kbd-1.08-find-map-fix.patch: + Fixes a problem where loadkeys matches dvorak the dir, and not the + .map file. + + 19 Jan 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r4.ebuild: + Mark stable, as latest stable baselayout depends on it, bug #38585. + + 04 Nov 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r4.ebuild: + Fix to compile on Sparc again, bug #25517. + +*kbd-1.08-r4 (31 Oct 2003) + + 31 Oct 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r4.ebuild, + files/kbd-1.06-othervt.patch, files/kbd-1.08-nowarn.patch, + files/kbd-1.08-sparc.patch, files/kbd-1.08-terminal.patch: + Add '--tty' switch to setfont, thanks to Krzysztof Kotlenga + <pocek@polbrokers.ods.org>, bug #32279. Also add a few patches from Redhat, + and update our Sparc patch with a more simple one. + +*kbd-1.08-r3 (24 Sep 2003) + + 24 Sep 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r3.ebuild, + files/kbd-1.08-po-install-locations.patch: + Locales do not use DATADIR corretly, and thus install to /share, and not + /usr/share, bug #26384. + +*kbd-1.08-r2 (02 Aug 2003) + + 06 Aug 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> kbd-1.08-r2.ebuild, + marked -ppc for now: loading a non-us keymap fails with 'flex input failed' + + 02 Aug 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r2.ebuild, + files/kbd-1.08-kbd_repeat.patch: + A better fix from Keith M Wesolowski <wesolows@gentoo.org> (bug #25517). + + 02 Aug 2003; Martin Schlemmer <azarah@gentoo.org> + files/kbd-1.08-sparc-fixes.patch: + Sparc64 fixes, bug #25517 again. + + 31 Jul 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r1.ebuild: + Fix struct kbd_rate not being fixed for sparc to use 'period' and not 'rate', + bug #25517. + +*kbd-1.08-r1 (29 Jul 2003) + + 06 Aug 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> kbd-1.08-r2.ebuild, + marked -ppc for now: loading a non-us keymap fails with 'flex input failed' + + 29 Jul 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r1.ebuild: + New configure script is even more broken than before - we should not add the + prefix to the paths we pass --datadir and --mandir, else it looks for data in + /usr/usr/share ... (bug #25448). + Thanks to Nicolai Lissner <nlissne@linux01.gwdg.de> who did have the right + solution (did not check bug again until now, so missed his feedback). + +*kbd-1.08 (28 Jul 2003) + + 28 Jul 2003; Martin Schlemmer <azarah@gentoo.org> Manifest, kbd-1.08.ebuild: + New version. + + 20 May 2003; Joshua Kinard <kumba@gentoo.org> kbd-1.06-r1.ebuild: + Added fix to ebuild to use CFLAGS from /etc/make.conf. Fixes Bug #21320. + + 21 Feb 2003; Zach Welch <zwelch@gentoo.org> kbd-1.06-r1.ebuild : + Added arm to keywords. + + 09 Feb 2003; Guy Martin <gmsoft@gentoo.org> kbd-1.06-r1.ebuild : + Added hppa to keywords. + + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords + + 22 Mar 2002; Daniel Robbins <drobbins@gentoo.org> kbd-1.06-r1.ebuild : + + 14 Jul 2002; phoen][x <phoenix@gentoo.org> kbd-1.06.ebuild : + Added LICENSE, KEYWORDS, SLOT. + + 14 Jul 2002; phoen][x <phoenix@gentoo.org> kbd-1.06-r1.ebuild : + Added LICENSE, KEYWORDS, SLOT. + Fixed Matthew Kennedy's patch which was totally broken in every way and + killed this ebuild. + +*kbd-1.06-r1 (22 Mar 2002) + + 19 Jan 2003; Jan Seidel <tuxus@gentoo.org> : + Added mips to keywords + + 22 Mar 2002; Seemant Kulleen <seemant@gentoo.org> kbd-1.06-r1.ebuild : + Added USE dependent nls support from a patch sent in by Matthew Kennedy. + +*kbd-1.06 (1 Feb 2002) + + 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : + + This changelog is targetted to users. This means that the comments should be + well explained and written in clean English. + + Every new version or revision of the package has to be marked by a '*' + seperator line as above. Changements since the last revision have to be + added to the top of the file, underneath the initial copyright and cvs header + omments, in exactly the same format as this comment. diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest new file mode 100644 index 0000000..9118955 --- /dev/null +++ b/sys-apps/kbd/Manifest @@ -0,0 +1,19 @@ +AUX kbd-1.08-terminal.patch 925 RMD160 0f622bcf874c01ee6533cfbdc6137e4f8949299b SHA1 e4a473ce98292a77403a9d79b8cdc083542113ec SHA256 466ac92951695017498c640547af9aeb6351b2da75b6b787c7d0f17f409e9134 +AUX kbd-1.12-Meta_utf8.patch 344 RMD160 a1a1326716716305767f297817519d1cd6f5670d SHA1 a3de75ef80288597d2a134dcc6f7a8b7ce81ca7e SHA256 9cb114acb7704fe14ae99d77ffc1f6fc586101fc541eadce5efbfd36f9d8b8c0 +AUX kbd-1.12-alias.patch 1129 RMD160 2dbff90ee13a3f7e738faed94301388ea8c4ce83 SHA1 2a266a3fc520371bba9050ea8fa13f4592892e83 SHA256 354779bdc2a3a69485877089d6eac95939fc48acea8d7a7e6efd2cac42de951a +AUX kbd-1.12-configure-LANG.patch 609 RMD160 1ed668e620d438da9bc42542908232f72a138f5e SHA1 908c8f635af838f2de0febf0584ecee5609218f9 SHA256 2162d613d68391fd81b172d57c261569a6f342c87e4bb540e926184a3c00d331 +AUX kbd-1.12-cz-qwerty-map.patch 5821 RMD160 aa7d3448f3bfc053ef27b1a65d9da73664b5b5c5 SHA1 6a32a00be729d6804ec2551752c5ab24fcacf946 SHA256 5218c2119d50be11e36b7cec7985b69b43336bf8d51d869b3c367762d8bb9064 +AUX kbd-1.12-debian.patch 2536 RMD160 0ae073c691659a999dbc8567641f927e676e1a6b SHA1 9ddc717c3c018f1677cfacf14beaa81c877ff74e SHA256 42e87c234d2217cdfcba1464240ff874af95ca5b3705337617fb20a4dbf2cf5d +AUX kbd-1.12-find-map-fix.patch 957 RMD160 4e3a6fd81f533d08c19d6f443ad447c1d0617924 SHA1 420fd29fc06e3518dac3fac8003c8ac71ae3b28e SHA256 76bed8974c260fff1a44bcc3844471c6dd24d04d473f052de6199eb39a38a456 +AUX kbd-1.12-it-euro-map.patch 501 RMD160 c1e7d02e0254f7800fbc432c8a4de9ea1f8aa1a5 SHA1 97bd7c4afc31862893256ce0adc337bcd9940cb5 SHA256 9114756bb0a07262790947303b941da0d873a35edcc8cd23f6dc4e29b5a84e6e +AUX kbd-1.12-jp-escape.patch 404 RMD160 58773e9196a62ea46983d02c12f04de92ef31d1b SHA1 3b3b5b48b5d92493a504ba77d92a2143fb4a0cf5 SHA256 61f75f672a69018f25acd3a51de49ef971cac8eaa1e3c097e0b49dff470113ab +AUX kbd-1.12-kbd_repeat-v2.patch 809 RMD160 48d058cd7cfcff6df450e21138f28ed8ead1cdca SHA1 f5e787fca0342976dc04ab1c00bb1a85ea8b412b SHA256 7b64a4d2a59f28e4f19405bbc81bedd7774f812f1831cb2c0afe217799d7c165 +AUX kbd-1.12-kbio.patch 648 RMD160 a1351e1d3691bc86cd8f5ad74c0b0a2d2e5da5d8 SHA1 64f1bcabd93d34dfaedc5b0f566f8cfd0decaf11 SHA256 822d7fb35a7d2f730e4272284368a44a055f850bf98005bf5d69e5e116bb417f +AUX kbd-1.12-setfont-man.patch 629 RMD160 dba23dfb4a9d263da6bc094a56366371bfc1b9d2 SHA1 61f3e19290ec3d85838158b2efbbf60be21e88af SHA256 f81c6f07bddefe8bf1f8e1102f8a8c72e96f632aefa248e71a594ad19d767770 +AUX kbd-1.12-unimap.patch 642 RMD160 a8ae481be1e2ca64a2ddc73f03fda644436f76a2 SHA1 9cf44c9ed07da02f5ba9a0dce9df4278e8a4beaa SHA256 f1364a306636661ebcca73d91ca179be811b6b4ccd08b1b761a0847f579623a0 +AUX kbd-1.12-xcompile.patch 680 RMD160 a2db9ef656d9a09aec4ebd5d02726efa7e3d4818 SHA1 7c4c6b08f0f0c443a309a86055b01c11d8e80c21 SHA256 78d29c76075cf5ee347461e28ae0ac25a06ce446151d91ec661c3a2d33da4191 +AUX kbd-1.13-dont-use-error.patch 414 RMD160 76e822064fedc9f5b36daf10c06c83f13afc1f13 SHA1 543874d0f36ace327af79815004b1cd017ce9357 SHA256 9f9e7e860362b7e5402c1c0af55ff301e0542e34aacc71167f9252f50a4f74ca +AUX kbd-1.14.1-missing-configure.patch 444 RMD160 d1d4f185e8d761d865a3f64fb717446505e08c30 SHA1 ea03ca92b21c0d5a87db2e31f1fd27c1c2e4394b SHA256 0a2a530ac1d2baa03c7cc12e10a242bbc9d128304136f5dba4909d3df2b16eb1 +DIST kbd-1.14.1.tar.gz 1010836 RMD160 5206423c9950c8beb2467e7b761d2a0f827ebbe2 SHA1 12d91613096d1a724fc780e2d7974a0a1b308dce SHA256 e97ed7ec4ec937a27ac2e72789e76db4b661f7ce2c2b7b68524f55ee69dce491 +EBUILD kbd-1.14.1-r1.ebuild 1312 RMD160 7f1ba09a2d946cc01e7517d1b5d5d259ce3ff99a SHA1 271dc1869d0b0c55134221d1463db2128ddce672 SHA256 a177f24a0e82413db4f065eea1c55b67800bc817a58ec9356ee84421e471db71 +MISC ChangeLog 11483 RMD160 07ad554938e097da5331bd666ed4193f9624f933 SHA1 49b41df98604b0d4757bd48bd9924885dc2162b3 SHA256 1bb7284a18cd6b37a08b3f1f3bce2e58f29efed8a1c91bb46fd8862439af989e diff --git a/sys-apps/kbd/files/kbd-1.08-terminal.patch b/sys-apps/kbd/files/kbd-1.08-terminal.patch new file mode 100644 index 0000000..13aeeec --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.08-terminal.patch @@ -0,0 +1,31 @@ +Output terminal control sequences only when output is a terminal. + +--- kbd-1.08/src/unicode_start 2002-11-22 19:23:00.000000000 -0500 ++++ kbd-1.08/src/unicode_start 2002-11-22 19:24:34.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # Enables Unicode processing in the current console. + # + # 1. The input side: the keyboard driver. +@@ -25,7 +25,9 @@ + # Tell the console output driver that the bytes arriving are UTF-8 + # encoded multibyte sequences. + +-echo -n -e '\033%G' ++if test -t 1 -a -t 2 ; then ++ echo -n -e '\033%G' ++fi + + # Tell the graphics card how to display Unicode characters not + # contained in the IBM 437 character set (on PCs). The font should +--- kbd-1.08/src/unicode_stop 2002-11-22 19:23:30.000000000 -0500 ++++ kbd-1.08/src/unicode_stop 2002-11-22 19:24:15.000000000 -0500 +@@ -1,4 +1,6 @@ + #!/bin/sh + # stop unicode + kbd_mode -a +-echo -n -e '\033%@' ++if test -t ; then ++ echo -n -e '\033%@' ++fi diff --git a/sys-apps/kbd/files/kbd-1.12-Meta_utf8.patch b/sys-apps/kbd/files/kbd-1.12-Meta_utf8.patch new file mode 100644 index 0000000..9bc68b6 --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.12-Meta_utf8.patch @@ -0,0 +1,11 @@ +--- kbd-1.12/src/ksyms.c.org 2005-01-11 16:38:32.000000000 +0100 ++++ kbd-1.12/src/ksyms.c 2005-01-11 16:46:19.000000000 +0100 +@@ -1710,6 +1710,8 @@ + keycode = ksymtocode(s+5); + if (KTYP(keycode) == KT_LATIN) + return K(KT_META, KVAL(keycode)); ++ else if(prefer_unicode) ++ return (0); + /* fall through to error printf */ + } + diff --git a/sys-apps/kbd/files/kbd-1.12-alias.patch b/sys-apps/kbd/files/kbd-1.12-alias.patch new file mode 100644 index 0000000..30be4fa --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.12-alias.patch @@ -0,0 +1,47 @@ +diff -u kbd-1.12/src/psffontop.c kbd-1.12/src/psffontop.c +--- kbd-1.12/src/psffontop.c 2005-03-12 00:48:30.075310872 +0100 ++++ kbd-1.12/src/psffontop.c 2005-05-14 10:49:59.000000000 +0900 +@@ -59,7 +59,6 @@ + + static unsigned int + assemble_ucs2(char **inptr, int cnt) { +- unsigned char **in = (unsigned char **) inptr; + unsigned int u1, u2; + + if (cnt < 2) { +@@ -68,8 +67,8 @@ + exit(EX_DATAERR); + } + +- u1 = *(*in)++; +- u2 = *(*in)++; ++ u1 = (unsigned char)*(*inptr)++; ++ u2 = (unsigned char)*(*inptr)++; + return (u1 | (u2 << 8)); + } + +@@ -110,7 +109,6 @@ + */ + static void + get_uni_entry(char **inptr, char **endptr, struct unicode_list *up, int utf8) { +- unsigned char **in = (unsigned char **) inptr; + unsigned char uc; + unicode unichar; + int inseq = 0; +@@ -126,14 +124,14 @@ + exit(EX_DATAERR); + } + if (utf8) { +- uc = *(*in)++; ++ uc = *(*inptr)++; + if (uc == PSF2_SEPARATOR) + break; + if (uc == PSF2_STARTSEQ) { + inseq = 1; + continue; + } +- --(*in); ++ --(*inptr); + unichar = assemble_utf8(inptr, *endptr - *inptr); + } else { + unichar = assemble_ucs2(inptr, *endptr - *inptr); diff --git a/sys-apps/kbd/files/kbd-1.12-configure-LANG.patch b/sys-apps/kbd/files/kbd-1.12-configure-LANG.patch new file mode 100644 index 0000000..554c4f3 --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.12-configure-LANG.patch @@ -0,0 +1,27 @@ +The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in +option parsing, it may break. + +http://bugs.gentoo.org/128253 + +--- configure ++++ configure +@@ -8,6 +8,19 @@ + # New default: /usr/share/kbd + # + ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ unset $as_var ++ fi ++done ++ + prefix= + datadir= + mandir= diff --git a/sys-apps/kbd/files/kbd-1.12-cz-qwerty-map.patch b/sys-apps/kbd/files/kbd-1.12-cz-qwerty-map.patch new file mode 100644 index 0000000..a27c88a --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.12-cz-qwerty-map.patch @@ -0,0 +1,101 @@ +kavol@email.cz writes: + +I wanted to use the keymap file /usr/share/keymaps/i386/qwerty/cz.map.gz, +but I have found this to be qwertz so I think it should be placed in +/usr/share/keymaps/i386/qwertz/ (or, much better, converted to qwerty - +I don't understand the masochists who use us-qwerty and cz-qwertz together :-) + +http://bugs.gentoo.org/show_bug.cgi?id=19010 + +Gentoo notes: +We copy the qwerty/cz.map to qwertz/cz.map and then apply this patch ... +that way we end up with both a qwerty and qwertz version of the cz.map + +--- data/keymaps/i386/qwerty/cz.map.old 2004-06-21 00:03:22.000000000 +0200 ++++ data/keymaps/i386/qwerty/cz.map 2004-10-24 16:04:44.471056808 +0200 +@@ -1,6 +1,9 @@ ++# *** toto neni originalni verze souboru: ++# *** upraveno z puvodni QWERTZ na QWERTY + opraveno par preklepu ++# + # Tato keymapa NENI urcena pro jadro "opatchovane" programem "patch-capslock" + # +-# klavesova mapa kompatibilni s windows QWERTZ ++# klavesova mapa kompatibilni s windows QWERTY + # + # Vytvoril: Richard S~puta, Richard.Sputa@os3.os.ds.mfcr.cz + # +@@ -11,7 +14,7 @@ + # Links: ftp://ftp.penguin.cz/pub/cestina/klavesnice/console/ + # - primary ftp archiv + # http://www.debian.cz/proj/czkbd/index.php3 +-# - czech keyboard standarts ++# - czech keyboard standards + # + # + # POZOR: Tato klavesova mapa obsahuje ve skutecnosti 2 (dve) klavesnice +@@ -27,7 +30,7 @@ + # Navic klavesa "PrintScreen" funguje jako carka a hacek + # + # +-# Rozsireni oproti standartni_CESKE_unikodove_klavesnici ++# Rozsireni oproti standardni_CESKE_unikodove_klavesnici + # (zde jsou popsany pouze kombinace, jejichz umisteni je diskutabilni) + # (popis ostatnich rozsireni je v souboru "readme.txt") + # 1) AltGr-SPACE => znak "nobreakspace" (neoddelitelna mezera kod 0xa0) +@@ -148,7 +151,7 @@ + # Linefeed (primarni) => Control_j + # + # vzdalenost mezi zacatky symbolu: +-# 12 znaku (standartne) vyhovuje 80% symbolickych nazvu ++# 12 znaku (standardne) vyhovuje 80% symbolickych nazvu + # 25 znaku ma symbolicky nazev Meta_Control_bracketright + # 123456789012 123456789012 123456789012 123456789012 123456789012 + keycode 1 = Escape Escape VoidSymbol VoidSymbol VoidSymbol \ +@@ -383,15 +386,15 @@ + VoidSymbol VoidSymbol +T t VoidSymbol \ + VoidSymbol VoidSymbol VoidSymbol Meta_T Meta_t \ + VoidSymbol +-keycode 21 = +z Z VoidSymbol VoidSymbol Control_z \ +- Control_z VoidSymbol VoidSymbol Meta_z Meta_Z \ +- VoidSymbol VoidSymbol +Z z VoidSymbol \ +- VoidSymbol VoidSymbol VoidSymbol Meta_Z Meta_z \ ++keycode 21 = +y Y VoidSymbol VoidSymbol Control_y \ ++ Control_y VoidSymbol VoidSymbol Meta_y Meta_Y \ ++ VoidSymbol VoidSymbol +Y y VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_Z Meta_y \ + VoidSymbol \ +- +z Z VoidSymbol VoidSymbol Control_z \ +- Control_z VoidSymbol VoidSymbol Meta_z Meta_Z \ +- VoidSymbol VoidSymbol +Z z VoidSymbol \ +- VoidSymbol VoidSymbol VoidSymbol Meta_Z Meta_z \ ++ +y Y VoidSymbol VoidSymbol Control_y \ ++ Control_y VoidSymbol VoidSymbol Meta_y Meta_Y \ ++ VoidSymbol VoidSymbol +Y y VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_Y Meta_y \ + VoidSymbol + keycode 22 = +u U VoidSymbol VoidSymbol Control_u \ + Control_u VoidSymbol VoidSymbol Meta_u Meta_U \ +@@ -601,15 +604,15 @@ + Meta_Control_backslash bar bar VoidSymbol \ + VoidSymbol VoidSymbol VoidSymbol Meta_bar Meta_bar \ + VoidSymbol +-keycode 44 = +y Y degree degree Control_y \ +- Control_y VoidSymbol VoidSymbol Meta_y Meta_Y \ +- VoidSymbol VoidSymbol +Y y VoidSymbol \ +- VoidSymbol VoidSymbol VoidSymbol Meta_Y Meta_y \ ++keycode 44 = +z Z degree degree Control_z \ ++ Control_z VoidSymbol VoidSymbol Meta_z Meta_Z \ ++ VoidSymbol VoidSymbol +Z z VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_Z Meta_z \ + VoidSymbol \ +- +y Y degree degree Control_y \ +- Control_y VoidSymbol VoidSymbol Meta_y Meta_Y \ +- VoidSymbol VoidSymbol +Y y VoidSymbol \ +- VoidSymbol VoidSymbol VoidSymbol Meta_Y Meta_y \ ++ +z Z degree degree Control_z \ ++ Control_z VoidSymbol VoidSymbol Meta_z Meta_Z \ ++ VoidSymbol VoidSymbol +Z z VoidSymbol \ ++ VoidSymbol VoidSymbol VoidSymbol Meta_Z Meta_z \ + VoidSymbol + keycode 45 = +x X numbersign numbersign Control_x \ + Control_x VoidSymbol VoidSymbol Meta_x Meta_X \ diff --git a/sys-apps/kbd/files/kbd-1.12-debian.patch b/sys-apps/kbd/files/kbd-1.12-debian.patch new file mode 100644 index 0000000..c6bf3c1 --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.12-debian.patch @@ -0,0 +1,86 @@ +diff -urNad kbd-1.12.orig/src/loadkeys.y kbd-1.12/src/loadkeys.y +--- kbd-1.12.orig/src/loadkeys.y 2004-01-27 14:25:50.000000000 +0300 ++++ kbd-1.12/src/loadkeys.y 2004-01-27 14:37:01.000000000 +0300 +@@ -566,7 +566,7 @@ + } + + char *dirpath[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 }; +-char *suffixes[] = { "", ".map", 0 }; ++char *suffixes[] = { "", ".kmap", ".map", 0 }; + extern FILE *findfile(char *fnam, char **dirpath, char **suffixes); + + #undef yywrap +diff -urNad kbd-1.12.orig/src/loadunimap.c kbd-1.12/src/loadunimap.c +--- kbd-1.12.orig/src/loadunimap.c 2004-08-02 22:57:25.000000000 +0200 ++++ kbd-1.12/src/loadunimap.c 2004-08-02 22:57:44.000000000 +0200 +@@ -28,8 +28,8 @@ + extern char *progname; + extern int force; + +-static char *unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 }; +-static char *unisuffixes[] = { "", ".uni", 0 }; ++static char *unidirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 }; ++static char *unisuffixes[] = { "", ".sfm", ".uni", 0 }; + + #ifdef MAIN + #include "version.h" +diff -urNad kbd-1.12.orig/src/getunimap.c kbd-1.12/src/getunimap.c +--- kbd-1.12.orig/src/getunimap.c 2004-08-01 20:33:38.000000000 +0200 ++++ kbd-1.12/src/getunimap.c 2004-08-02 22:45:30.000000000 +0200 +@@ -62,7 +62,7 @@ + } + } + +- if (argc != 1) ++ if (optind < argc) + usage(); + + fd = getfd(console); +diff -urNad kbd-1.12.orig/src/loadunimap.c kbd-1.12/src/loadunimap.c +--- kbd-1.12.orig/src/loadunimap.c 2004-08-02 22:45:06.000000000 +0200 ++++ kbd-1.12/src/loadunimap.c 2004-08-02 22:46:39.000000000 +0200 +@@ -73,18 +73,18 @@ + } + } + +- if (argc > 2 || (argc == 1 && !outfnam)) ++ if (argc > optind+1 || (argc == optind && !outfnam)) + usage(); + + fd = getfd(console); + + if (outfnam) { + saveunicodemap(fd, outfnam); +- if (argc == 1) ++ if (argc == optind) + exit(0); + } + +- if (argc == 2) ++ if (argc == optind+1) + infnam = argv[optind]; + loadunicodemap(fd, infnam); + exit(0); +diff -urNad kbd-1.12.orig/src/showconsolefont.c kbd-1.12/src/showconsolefont.c +--- kbd-1.12.orig/src/showconsolefont.c 2004-08-02 22:44:30.000000000 +0200 ++++ kbd-1.12/src/showconsolefont.c 2004-08-02 22:47:07.000000000 +0200 +@@ -135,7 +135,7 @@ + } + } + +- if (argc != 1) ++ if (optind < argc) + usage(); + + fd = getfd(console); +--- kbd-1.12.orig/src/kbdrate.c ++++ kbd-1.12/src/kbdrate.c +@@ -112,7 +112,7 @@ + kbdrep_s.period = -1; + kbdrep_s.delay = -1; + if (ioctl( 0, KDKBDREP, &kbdrep_s )) { +- if (errno == EINVAL) ++ if (errno == EINVAL || errno == ENOTTY) + return 0; + perror( "ioctl(KDKBDREP)" ); + exit( 1 ); diff --git a/sys-apps/kbd/files/kbd-1.12-find-map-fix.patch b/sys-apps/kbd/files/kbd-1.12-find-map-fix.patch new file mode 100644 index 0000000..ca24703 --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.12-find-map-fix.patch @@ -0,0 +1,37 @@ +Oh, but I fixed it already. Patch below. + +Andries + +--- kbd-1.12.orig/src/findfile.c Fri Jan 16 20:45:31 2004 ++++ kbd-1.12/src/findfile.c Wed Jan 28 23:29:35 2004 +@@ -70,6 +70,7 @@ + FILE *fp = NULL; + DIR *d; + struct dirent *de; ++ struct stat statbuf; + char *ff, *fdir, *p, *q, **sp; + struct decompressor *dc; + int secondpass = 0; +@@ -104,7 +105,6 @@ + okdir = (ff && strcmp(de->d_name, fdir) == 0); + + if ((secondpass && recdepth) || okdir) { +- struct stat statbuf; + char *a; + + a = xmalloc(strlen(dir) + strlen(de->d_name) + 2); +@@ -137,6 +137,11 @@ + + sprintf(pathname, "%s/%s", dir, de->d_name); + ++ /* Is this a regular file? */ ++ if (stat(pathname, &statbuf) != 0 || ++ !S_ISREG(statbuf.st_mode)) ++ continue; ++ + /* Does tail consist of a known suffix and possibly + a compression suffix? */ + for(sp = suf; *sp; sp++) { + + +[pasted and cut from another window, so with whitespace damage] diff --git a/sys-apps/kbd/files/kbd-1.12-it-euro-map.patch b/sys-apps/kbd/files/kbd-1.12-it-euro-map.patch new file mode 100644 index 0000000..bf42651 --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.12-it-euro-map.patch @@ -0,0 +1,18 @@ +Tupone Alfredo writes: + +To make euro key work at console (not X) I had to modify the +it.map.gz to include euro. + +http://bugs.gentoo.org/show_bug.cgi?id=75970 + +--- data/keymaps/i386/qwerty/it.map.orig 2004-12-29 15:31:59.269844456 -0500 ++++ data/keymaps/i386/qwerty/it.map 2004-12-29 15:32:49.049276832 -0500 +@@ -86,7 +86,7 @@ + alt keycode 15 = Meta_Tab + keycode 16 = q + keycode 17 = w +-keycode 18 = e ++keycode 18 = e E euro + keycode 19 = r + keycode 20 = t + keycode 21 = y diff --git a/sys-apps/kbd/files/kbd-1.12-jp-escape.patch b/sys-apps/kbd/files/kbd-1.12-jp-escape.patch new file mode 100644 index 0000000..f413f00 --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.12-jp-escape.patch @@ -0,0 +1,16 @@ +Recognize Ctrl-[ as Escape. + +Patch by OKUMURA N. Shin-ya. + +http://bugs.gentoo.org/71870 + +--- data/keymaps/i386/qwerty/jp106.map ++++ data/keymaps/i386/qwerty/jp106.map +@@ -35,6 +35,7 @@ + keycode 26 = at grave + control keycode 26 = nul + keycode 27 = bracketleft braceleft ++ control keycode 27 = Escape + keycode 28 = Return + alt keycode 28 = Meta_Control_m + keycode 29 = Control diff --git a/sys-apps/kbd/files/kbd-1.12-kbd_repeat-v2.patch b/sys-apps/kbd/files/kbd-1.12-kbd_repeat-v2.patch new file mode 100644 index 0000000..3e7f11d --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.12-kbd_repeat-v2.patch @@ -0,0 +1,27 @@ +Linux is nice and changes around core structures :) + +--- kbd-1.12/src/kbdrate.c Fri Jan 16 20:45:31 2004 ++++ kbd-1.12.kbdrate/src/kbdrate.c Sun Feb 8 14:52:04 2004 +@@ -164,10 +169,10 @@ + exit( 1 ); + } + +- kbdrate_s.period = (int) (rate + 0.5); /* round up */ ++ kbdrate_s.rate = (int) (rate + 0.5); /* round up */ + kbdrate_s.delay = delay * HZ / 1000; /* convert ms to Hz */ +- if (kbdrate_s.period > 50) +- kbdrate_s.period = 50; ++ if (kbdrate_s.rate > 50) ++ kbdrate_s.rate = 50; + + if (ioctl( fd, KIOCSRATE, &kbdrate_s )) { + perror( "ioctl(KIOCSRATE)" ); +@@ -177,7 +182,7 @@ + + if (!silent) + printf( "Typematic Rate set to %d cps (delay = %d ms)\n", +- kbdrate_s.period, kbdrate_s.delay * 1000 / HZ ); ++ kbdrate_s.rate, kbdrate_s.delay * 1000 / HZ ); + + return 1; + #else /* no KIOCSRATE */ diff --git a/sys-apps/kbd/files/kbd-1.12-kbio.patch b/sys-apps/kbd/files/kbd-1.12-kbio.patch new file mode 100644 index 0000000..b2a80d9 --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.12-kbio.patch @@ -0,0 +1,25 @@ +diff -Nura kbd-1.12/src/kbdrate.c kbd-1.12.nokbio/src/kbdrate.c +--- kbd-1.12/src/kbdrate.c 2004-01-16 16:45:31.000000000 -0300 ++++ kbd-1.12.nokbio/src/kbdrate.c 2006-10-23 11:30:11.000000000 -0300 +@@ -77,7 +77,6 @@ + + #ifdef __sparc__ + #include <asm/param.h> +-#include <asm/kbio.h> + #endif + + #ifndef KDKBDREP +diff -Nura kbd-1.12/src/setleds.c kbd-1.12.nokbio/src/setleds.c +--- kbd-1.12/src/setleds.c 2004-01-16 16:45:31.000000000 -0300 ++++ kbd-1.12.nokbio/src/setleds.c 2006-10-23 11:30:20.000000000 -0300 +@@ -14,10 +14,6 @@ + #include "nls.h" + #include "version.h" + +-#ifdef __sparc__ +-#include <asm/kbio.h> +-#endif +- + static void + usage(void) + { diff --git a/sys-apps/kbd/files/kbd-1.12-setfont-man.patch b/sys-apps/kbd/files/kbd-1.12-setfont-man.patch new file mode 100644 index 0000000..73cce39 --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.12-setfont-man.patch @@ -0,0 +1,14 @@ +diff -Nrbu kbd-1.12/man/man8/setfont.8.in kbd-1.12-OK/man/man8/setfont.8.in +--- kbd-1.12/man/man8/setfont.8.in 2004-01-03 07:15:59.000000000 +0300 ++++ kbd-1.12-OK/man/man8/setfont.8.in 2004-11-26 19:20:15.000000000 +0300 +@@ -50,6 +50,10 @@ + Load a given font (here a 512-glyph font combining several + character sets) and indicate that one's local character set + is ISO 8859-2. ++.LP ++Note: if a font has more than 256 glyphs, only 8 out of 16 colors ++can be used simultaneously. It can make console perception worse ++(loss of intensity and even some colors). + + .SH "FONT FORMATS" + The standard Linux font format is the PSF font. diff --git a/sys-apps/kbd/files/kbd-1.12-unimap.patch b/sys-apps/kbd/files/kbd-1.12-unimap.patch new file mode 100644 index 0000000..c7ea73c --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.12-unimap.patch @@ -0,0 +1,16 @@ +That silly Debian patch changes the default dir to TRANSDIR. +This patch corrects that oversight so both work if we ever +use console-data, also by Debian. + +--- kbd-1.12/src/loadunimap.c.orig 2006-08-24 13:48:11.000000000 +0100 ++++ kbd-1.12/src/loadunimap.c 2006-08-24 13:49:07.000000000 +0100 +@@ -28,7 +28,7 @@ + extern char *progname; + extern int force; + +-static char *unidirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 }; +-static char *unisuffixes[] = { "", ".sfm", ".uni", 0 }; ++static char *unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", DATADIR "/" TRANSDIR "/", 0 }; ++static char *unisuffixes[] = { "", ".uni", ".sfm", 0 }; + + #ifdef MAIN diff --git a/sys-apps/kbd/files/kbd-1.12-xcompile.patch b/sys-apps/kbd/files/kbd-1.12-xcompile.patch new file mode 100644 index 0000000..985dbad --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.12-xcompile.patch @@ -0,0 +1,21 @@ +this shit is wrong, but so was original ... this needs to be +rewritten so that $HOST_ARCH/$TARGET_ARCH aren't even needed ... + +--- configure ++++ configure +@@ -129,8 +129,13 @@ + # + # 0. Figure out architecture (one of i386, alpha, sparc, arm, m68k, mips) + # +-ARCH=`uname -m | sed s/i.86/i386/` +-echo "ARCH=$ARCH" >> make_include ++HOST_ARCH=`uname -m` ++TARGET_ARCH=`$CC -dumpmachine | awk -F- '{print $1}'` ++# Don't allow ARCH="sparc" for sparc64 targets with 32-bit userland ++if (test "$HOST_ARCH" = "sparc64" && test "$TARGET_ARCH" = "sparc") ; then ++ TARGET_ARCH="sparc64" ++fi ++echo "ARCH=${TARGET_ARCH}" | sed -e 's:i.86:i386:' >> make_include + + # + # 1. Do we have <locale.h>? diff --git a/sys-apps/kbd/files/kbd-1.13-dont-use-error.patch b/sys-apps/kbd/files/kbd-1.13-dont-use-error.patch new file mode 100644 index 0000000..d8e0bb1 --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.13-dont-use-error.patch @@ -0,0 +1,17 @@ +dont use GNU-specific function error() + +--- openvt/openvt.c ++++ openvt/openvt.c +@@ -107,8 +107,10 @@ + + for (i=0; i<3; i++) { + struct stat st; +- if (fstat(i, &st) == -1 && open("/dev/null", O_RDWR) == -1) +- error(EXIT_FAILURE, errno, "open"); ++ if (fstat(i, &st) == -1 && open("/dev/null", O_RDWR) == -1) { ++ perror("open(/dev/null/) failed"); ++ return EXIT_FAILURE; ++ } + } + + consfd = getfd(NULL); diff --git a/sys-apps/kbd/files/kbd-1.14.1-missing-configure.patch b/sys-apps/kbd/files/kbd-1.14.1-missing-configure.patch new file mode 100644 index 0000000..b9fe961 --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.14.1-missing-configure.patch @@ -0,0 +1,15 @@ +fix from Charles Clément for missing binaries + +http://bugs.gentoo.org/215610 + +--- kbd-1.14.1/src/Makefile.in ++++ kbd-1.14.1/src/Makefile.in +@@ -2,6 +2,8 @@ prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = $(DESTDIR)@bindir@ + datarootdir = @datarootdir@ ++KEYCODES_PROGS = @KEYCODES_PROGS@ ++RESIZECONS_PROGS = @RESIZECONS_PROGS@ + OPTIONAL_PROGS = @OPTIONAL_PROGS@ + + # Something like /usr/lib/kbd or /usr/share/kbd diff --git a/sys-apps/kbd/kbd-1.14.1-r1.ebuild b/sys-apps/kbd/kbd-1.14.1-r1.ebuild new file mode 100644 index 0000000..82275b6 --- /dev/null +++ b/sys-apps/kbd/kbd-1.14.1-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.14.1-r1.ebuild,v 1.5 2008/09/23 07:20:38 corsair Exp $ + +inherit eutils + +DESCRIPTION="Keyboard and console utilities" +HOMEPAGE="http://freshmeat.net/projects/kbd/" +SRC_URI="ftp://ftp.altlinux.org/pub/people/legion/kbd/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="nls" + +RDEPEND="" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +src_unpack() { + unpack ${A} + cd "${S}" + sed -i 's:install -s:install:' src/Makefile.in + + # fix unimap path issue caused by Debian patch + epatch "${FILESDIR}"/${PN}-1.12-unimap.patch + + # Provide a QWERTZ and QWERTY cz map #19010 + cp data/keymaps/i386/{qwertz,qwerty}/cz.map || die "cz qwerty" + epatch "${FILESDIR}"/${PN}-1.12-cz-qwerty-map.patch + + # Fix jp map to recognize Ctrl-[ as Escape #71870 + epatch "${FILESDIR}"/${PN}-1.12-jp-escape.patch + + epatch "${FILESDIR}"/${P}-missing-configure.patch #215610 + epatch "${FILESDIR}"/${PN}-1.12-kbio.patch +} + +src_compile() { + econf $(use_enable nls) || die + emake CC=$(tc-getCC) || die +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc CHANGES CREDITS README + dohtml doc/*.html +} diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest new file mode 100644 index 0000000..1b5002a --- /dev/null +++ b/sys-apps/openrc/Manifest @@ -0,0 +1,25 @@ +AUX 0.2.5/0001-msg-style.patch 1709 RMD160 c8f22d90c66cd99da701d0840094694d96269def SHA1 2983c97f1b3c770d9b2afce4540d6d8a7db8abe7 SHA256 5a5d7cd9c0289eb9e7332b01aa15331e8497579efc78ea4d833400d00cb46f7b +AUX 0.2.5/0002-useful-functions.patch 1745 RMD160 f507c10185e09d05f18f097a83102131f1373161 SHA1 fe8f35a5acc6b01830cb5aa7cb6d13706efa9820 SHA256 640a59b382d54a629f67cea0f0428f127ebcb8a071068e5a75ecbd9d0869e8a4 +AUX 0.2.5/0003-KV.patch 2569 RMD160 7ccbca71beba996aedcec5aa1def57a96c008893 SHA1 d3489d7a34f9984b4267819677b5e4549c12fc00 SHA256 dab3a00036718ea99058f362d84a4bac5e9bbd4eff934f1ad1d4da85c8551539 +AUX 0.3.0/0001-Fix-a-segfault-when-profile.env-does-not-exist.patch 1559 RMD160 a08248a348db9a8a2a2d8a1797c456c41efe03ba SHA1 bec79a1434c7855ee5764cc3d849900dcfd488f4 SHA256 a04ff81fe4f2358086084cb64ab53dd88a3a863184e708b18b7ab4d52684fbb2 +AUX 0.3.0/0002-kenv-is-not-always-available.patch 823 RMD160 63e540371f2831cecb605bb17c242cc95ff5f001 SHA1 da2d76f8e50674525834847af9f37ac60c5912dd SHA256 fbc2433956adb626724414b9d0f4758feee1c581cc95081e2dbbcecec389c919 +AUX 0.3.0/0003-This-reverts-commit-0e2f160c95b15e95f3885e3f5a3670ec.patch 1718 RMD160 ab7d56e7723b8d78b0d3ad95c31506e6449fa30f SHA1 3edc1b081374467582f0139555c08e0a1ec4888d SHA256 810a27323ab4eea22aa76b5500eac4d650d612c6307edb55d953e7bcf778ed9f +AUX 0.3.0/0004-add-a-softlevel-function-to-the-API-so-people-dont.patch 1803 RMD160 be1963ad7d51deb8ffc96d9ce5d7c59903e9dbcd SHA1 d07901d1c65af2c37a4817d05b364f736b66470c SHA256 d270bba9141333df12c5b5795566bba9f59ba6d6c26a58f09abf0c394f802475 +AUX 0.3.0/0005-add-back-KV_-funcs.patch 2581 RMD160 ab6bfb3a7786120f21a02934009c82b223bf6758 SHA1 256f6e26cdc2cc9b4ad74fff5a2ea5b7e0c40bc7 SHA256 cb859f5333e65440fef0993b5cf5686b27dfc4796d6c2b030dec019475967e2f +AUX 0.3.0/0006-Fix-tests-Gentoo-240350.patch 1302 RMD160 2594c6dbc4896e5e897a682bdc100a120b596f32 SHA1 d3063dc1ad9b3a763456cef0314fb62a2e5e8e8d SHA256 b285fd499a5f23ce79bad0ccab2add93b972644ce9945c1c94b470047157d673 +AUX 0.3.0/0007-Fix-utmp-permissions-Gentoo-240437.patch 846 RMD160 3f766bf93af8d535a7611885c9e4a7e5a3a524f1 SHA1 085e13efe91810686182d16a9bce03a0dd31b23a SHA256 ddb5c44735647a1576f11f69993fbb2d4e52f41ae1beda91eac89770b14ba410 +AUX 0.3.0/0008-Clean-up-warnings-regarding-printf.patch 13827 RMD160 9d19dc1ff80b554fc3a134b3f815b063d1260937 SHA1 3c5d57088a1c98e78c542a306a1852a251b4b2bd SHA256 b434b8351815bce1133d059f824897d9f2b6e340abcc787f27c5d9879b39186f +AUX 0.4.2/0001-msg-style.patch 1709 RMD160 c8f22d90c66cd99da701d0840094694d96269def SHA1 2983c97f1b3c770d9b2afce4540d6d8a7db8abe7 SHA256 5a5d7cd9c0289eb9e7332b01aa15331e8497579efc78ea4d833400d00cb46f7b +AUX 0.4.2/0002-useful-functions.patch 1803 RMD160 be1963ad7d51deb8ffc96d9ce5d7c59903e9dbcd SHA1 d07901d1c65af2c37a4817d05b364f736b66470c SHA256 d270bba9141333df12c5b5795566bba9f59ba6d6c26a58f09abf0c394f802475 +AUX 0.4.2/0003-KV.patch 2569 RMD160 7ccbca71beba996aedcec5aa1def57a96c008893 SHA1 d3489d7a34f9984b4267819677b5e4549c12fc00 SHA256 dab3a00036718ea99058f362d84a4bac5e9bbd4eff934f1ad1d4da85c8551539 +AUX 0.4.2/0004-svn-version.patch 450 RMD160 7e85a0b4e08bd9554749ab384ce61bab4b7ddd21 SHA1 bfcd2eb61affc819f2ecabc420dc9e9c08dc4179 SHA256 f3877a994690912998daae1144a3564eea7a15d841df41af4ca93a37566cce46 +AUX 9999/0001-msg-style.patch 1709 RMD160 c8f22d90c66cd99da701d0840094694d96269def SHA1 2983c97f1b3c770d9b2afce4540d6d8a7db8abe7 SHA256 5a5d7cd9c0289eb9e7332b01aa15331e8497579efc78ea4d833400d00cb46f7b +AUX 9999/0002-useful-functions.patch 1803 RMD160 be1963ad7d51deb8ffc96d9ce5d7c59903e9dbcd SHA1 d07901d1c65af2c37a4817d05b364f736b66470c SHA256 d270bba9141333df12c5b5795566bba9f59ba6d6c26a58f09abf0c394f802475 +AUX 9999/0003-KV.patch 2569 RMD160 7ccbca71beba996aedcec5aa1def57a96c008893 SHA1 d3489d7a34f9984b4267819677b5e4549c12fc00 SHA256 dab3a00036718ea99058f362d84a4bac5e9bbd4eff934f1ad1d4da85c8551539 +DIST openrc-0.2.5.tar.bz2 142526 RMD160 5938b2186b7ef84890d4a6aebb9aeb3bf272e609 SHA1 e41249abb9f68ac0ebf92c080276499bd22daa94 SHA256 f81e6a84f016dcecdee67067d6c0bc85f3184baa6c127cc406cc00e88a45bec2 +DIST openrc-0.3.0.tar.bz2 145599 RMD160 ca45de6f222060a24542663fff343b84b870e72b SHA1 2fcac5cb7586b407714700b8325b8c3d705aa2cd SHA256 857a038dc123ae67bff7afee3137a292e03f0b7a3999fd9f150f6a75119cdd1a +DIST openrc-0.4.2.tar.bz2 144825 RMD160 68f559ddb41f5fcc367298f258b43bf667af45c3 SHA1 da75f8a9d81639fa7e5de5b398c3b807190be520 SHA256 df6463ba76b3700d803b3fe81c9cd6d511142225ada7ff655cb71b91ca1bf8af +EBUILD openrc-0.2.5.ebuild 9001 RMD160 87557aa2984c5036cb0c5484a8503361696d5b2a SHA1 f923227dd487a46dd6a3695be7ca3b701dc117d9 SHA256 f7cfb2fe755aa69aa202f853780f37dc791acd687a73cf2ed25389d874dec35d +EBUILD openrc-0.3.0-r1.ebuild 8994 RMD160 a99e81fc96df6d8d52eda840b9f678ec0dc1f064 SHA1 aaf7ed0502251f82fde1f2dfbf3ef060d401bf0c SHA256 cb23fbcd586af6dbff1f9a78ee442c4f6c46df25b097cc6819b3e99f98fdce6d +EBUILD openrc-0.4.2.ebuild 10240 RMD160 cbb7e5110c5106bc22823580ca278c129ae7139d SHA1 2ee68ae728696f7a5fb19cb8be5933ecb979a5c0 SHA256 e84302e40ccd8141f7db2598c0660556eef43ca199a386dbd217831b2679cba0 +EBUILD openrc-9999.ebuild 10023 RMD160 9d53fa28f968c155f2f4865e90e3fcc3442022ad SHA1 e99a4b09b401293225c64f2f11d3de72a270eb15 SHA256 5a1223ed58af309a2d33477600bfbce7564ab1bcb3d06c34be0274d15da67cd9 diff --git a/sys-apps/openrc/files/0.2.5/0001-msg-style.patch b/sys-apps/openrc/files/0.2.5/0001-msg-style.patch new file mode 100644 index 0000000..ab3559e --- /dev/null +++ b/sys-apps/openrc/files/0.2.5/0001-msg-style.patch @@ -0,0 +1,46 @@ +From 1eddb56f11b41c4bf4f878c995c5d140b1f9d44d Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 01:48:19 -0400 +Subject: [PATCH] This reverts commit 0e2f160c95b15e95f3885e3f5a3670ec5ae0a709. 2 spaces in 80 cols has never made any sort of realistic difference and we're not going to change this behavior in Gentoo. + +--- + src/libeinfo/libeinfo.c | 9 +++------ + 1 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c +index f8ddcb5..c46cacb 100644 +--- a/src/libeinfo/libeinfo.c ++++ b/src/libeinfo/libeinfo.c +@@ -787,7 +787,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, + if (! msg) + return; + +- cols = get_term_columns(fp) - (strlen(msg) + 3); ++ cols = get_term_columns(fp) - (strlen(msg) + 5); + + /* cons25 is special - we need to remove one char, otherwise things + * do not align properly at all. */ +@@ -801,18 +801,15 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, + if (term_is_cons25) + cols--; + +- /* If extra spacing is required around msg, then please change +- * via a runtime knob and leave this default as is as it saves 2 +- * valuable columns when running on 80 column screens. */ + if (cols > 0 && colour_terminal(fp)) { +- fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols), ++ fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols), + ecolor(ECOLOR_BRACKET), ecolor(color), msg, + ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL)); + } else { + if (col > 0) + for (i = 0; i < cols - col; i++) + fprintf(fp, " "); +- fprintf(fp, " [%s]\n", msg); ++ fprintf(fp, " [ %s ]\n", msg); + } + } + +-- +1.5.4.4 + diff --git a/sys-apps/openrc/files/0.2.5/0002-useful-functions.patch b/sys-apps/openrc/files/0.2.5/0002-useful-functions.patch new file mode 100644 index 0000000..91969a1 --- /dev/null +++ b/sys-apps/openrc/files/0.2.5/0002-useful-functions.patch @@ -0,0 +1,79 @@ +From c5552432d21e964ea1dbda7415040259b87ea77e Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 02:03:39 -0400 +Subject: [PATCH] add a softlevel() function to the API so people dont have to worry about inner details and move get_bootparam back to the exported function.sh api + +--- + sh/functions.sh.in | 27 +++++++++++++++++++++++++++ + sh/rc-functions.sh.in | 22 ---------------------- + 2 files changed, 27 insertions(+), 22 deletions(-) + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 1a1fbba..140f6dc 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -38,6 +38,28 @@ yesno() + esac + } + ++get_bootparam() ++{ ++ local match="$1" ++ [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 ++ ++ set -- $(cat /proc/cmdline) ++ while [ -n "$1" ]; do ++ case "$1" in ++ gentoo=*) ++ local params="${1##*=}" ++ local IFS=, x= ++ for x in ${params}; do ++ [ "${x}" = "${match}" ] && return 0 ++ done ++ ;; ++ esac ++ shift ++ done ++ ++ return 1 ++} ++ + _sanitize_path() + { + local IFS=":" p= path= +diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in +index 74db71e..eb45e49 100644 +--- a/sh/rc-functions.sh.in ++++ b/sh/rc-functions.sh.in +@@ -51,28 +51,6 @@ is_union_fs() + unionctl "$1" --list >/dev/null 2>&1 + } + +-get_bootparam() +-{ +- local match="$1" +- [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 +- +- set -- $(cat /proc/cmdline) +- while [ -n "$1" ]; do +- case "$1" in +- gentoo=*) +- local params="${1##*=}" +- local IFS=, x= +- for x in ${params}; do +- [ "${x}" = "${match}" ] && return 0 +- done +- ;; +- esac +- shift +- done +- +- return 1 +-} +- + # Add our sbin to $PATH + case "${PATH}" in + @PREFIX@/lib/rc/sbin|@PREFIX@/lib/rc/sbin:*);; +-- +1.5.4.4 + diff --git a/sys-apps/openrc/files/0.2.5/0003-KV.patch b/sys-apps/openrc/files/0.2.5/0003-KV.patch new file mode 100644 index 0000000..8ab646f --- /dev/null +++ b/sys-apps/openrc/files/0.2.5/0003-KV.patch @@ -0,0 +1,120 @@ +From dac703b26c71cd8479b71d101c4e1ddb8eadc194 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 03:14:02 -0400 +Subject: [PATCH] add back KV_* funcs + +--- + sh/functions.sh.in | 35 +++++++++++++++++++++++++++++++++++ + sh/runtests.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 80 insertions(+), 0 deletions(-) + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 140f6dc..0522792 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -65,6 +65,41 @@ get_bootparam() + return 1 + } + ++KV_major() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ echo ${KV%%.*} ++} ++ ++KV_minor() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ KV=${KV#*.} ++ echo ${KV%%.*} ++} ++ ++KV_micro() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ KV=${KV#*.*.} ++ echo ${KV%%[![:digit:]]*} ++} ++ ++KV_to_int() { ++ [ -z "$*" ] && return 1 ++ local KV_MAJOR="$(KV_major "$*")" ++ local KV_MINOR="$(KV_minor "$*")" ++ local KV_MICRO="$(KV_micro "$*")" ++ local KV_int="$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))" ++ echo "${KV_int}" ++} ++ ++_RC_GET_KV_CACHE="" ++get_KV() { ++ [ -z ${_RC_GET_KV_CACHE} ] && _RC_GET_KV_CACHE=$(uname -r) ++ echo $(KV_to_int "${_RC_GET_KV_CACHE}") ++} ++ + _sanitize_path() + { + local IFS=":" p= path= +diff --git a/sh/runtests.sh b/sh/runtests.sh +index d0d6a17..debcf4f 100755 +--- a/sh/runtests.sh ++++ b/sh/runtests.sh +@@ -3,6 +3,19 @@ + top_srcdir=${top_srcdir:-..} + . ${top_srcdir}/test/setup_env.sh + ++checkit() { ++ local output=$($1 $3) ++ local lret=$? ++ if [ ${lret} -ne 0 ] ; then ++ ((tret+=lret)) ++ echo "FAIL: exec: $*" ++ fi ++ if [ "${output}" != "$2" ] ; then ++ ((tret+=lret)) ++ echo "FAIL: output: $* : got='${output}' wanted='$2'" ++ fi ++} ++ + ret=0 + + tret=0 +@@ -22,4 +35,36 @@ done + eend ${tret} + ((ret+=tret)) + ++compare_int() { ++ local got=$(KV_to_int $1) ++ local exp=$(KV_to_int $3) ++ if ! [ ${got} $2 ${exp} ] ; then ++ ((tret+=1)) ++ echo "FAIL: KV_to_int '${v}'(${got}) $2 '1.2.2'(${exp})" ++ fi ++} ++ ++tret=0 ++ebegin "Testing KV_{major,minor,micro,to_int}" ++for v in \ ++ 1.2.3 1.2.3-rc0 1.2.3_rc0 "1.2.3 rc0" \ ++ 1.2.3.4 1.2.3.4-rc0 1.2.3.4_rc0 "1.2.3.4 rc0" ++do ++ checkit KV_major 1 ${v} ++ checkit KV_minor 2 ${v} ++ checkit KV_micro 3 ${v} ++ ++ compare_int 1.2.2 -lt ${v} ++ compare_int 1.2.2.10 -lt ${v} ++ compare_int 1.2.4 -gt ${v} ++ compare_int 1.2.4-rc0 -gt ${v} ++ compare_int 1.2.3 -eq ${v} ++ compare_int 1.2.3-rc0 -eq ${v} ++ compare_int 1.2.3.2 -eq ${v} ++ compare_int 1.2.3.3 -eq ${v} ++ compare_int 1.2.3.4 -eq ${v} ++done ++eend ${tret} ++((ret+=tret)) ++ + exit ${ret} +-- +1.5.4.4 + diff --git a/sys-apps/openrc/files/0.3.0/0001-Fix-a-segfault-when-profile.env-does-not-exist.patch b/sys-apps/openrc/files/0.3.0/0001-Fix-a-segfault-when-profile.env-does-not-exist.patch new file mode 100644 index 0000000..610b13f --- /dev/null +++ b/sys-apps/openrc/files/0.3.0/0001-Fix-a-segfault-when-profile.env-does-not-exist.patch @@ -0,0 +1,54 @@ +From 908a084d0ed193f6ec1b4017438cb4bbf3814b7f Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@uberpc.marples.name> +Date: Fri, 3 Oct 2008 18:50:10 +0100 +Subject: [PATCH] Fix a segfault when profile.env does not exist. + +--- + src/rc/rc-misc.c | 17 +++++++++-------- + 1 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c +index d94cd2e..d4b3ca0 100644 +--- a/src/rc/rc-misc.c ++++ b/src/rc/rc-misc.c +@@ -128,13 +128,13 @@ void env_filter(void) + size_t i = 0; + + /* Add the user defined list of vars */ +- env_allow = rc_stringlist_split(rc_conf_value ("rc_env_allow"), " "); ++ env_allow = rc_stringlist_split(rc_conf_value("rc_env_allow"), " "); + if (exists(PROFILE_ENV)) + profile = rc_config_load(PROFILE_ENV); + + /* Copy the env and work from this so we can manipulate it safely */ + env_list = rc_stringlist_new(); +- while (environ[i]) { ++ while (environ && environ[i]) { + env = rc_stringlist_add(env_list, environ[i++]); + e = strchr(env->value, '='); + if (e) +@@ -159,14 +159,15 @@ void env_filter(void) + } + + /* Now add anything missing from the profile */ +- TAILQ_FOREACH(env, profile, entries) { +- e = strchr(env->value, '='); +- *e = '\0'; +- if (!getenv(env->value)) +- setenv(env->value, e + 1, 1); ++ if (profile) { ++ TAILQ_FOREACH(env, profile, entries) { ++ e = strchr(env->value, '='); ++ *e = '\0'; ++ if (!getenv(env->value)) ++ setenv(env->value, e + 1, 1); ++ } + } + +- + rc_stringlist_free(env_list); + rc_stringlist_free(env_allow); + rc_stringlist_free(profile); +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.3.0/0002-kenv-is-not-always-available.patch b/sys-apps/openrc/files/0.3.0/0002-kenv-is-not-always-available.patch new file mode 100644 index 0000000..d7bd443 --- /dev/null +++ b/sys-apps/openrc/files/0.3.0/0002-kenv-is-not-always-available.patch @@ -0,0 +1,31 @@ +From 19f8761365b825ae9949559048afd90c2f662de8 Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@uberpc.marples.name> +Date: Fri, 3 Oct 2008 18:50:30 +0100 +Subject: [PATCH] kenv is not always available. + +--- + init.d/hostid.in | 8 +++++--- + 1 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/init.d/hostid.in b/init.d/hostid.in +index a058884..584fd2d 100644 +--- a/init.d/hostid.in ++++ b/init.d/hostid.in +@@ -38,9 +38,11 @@ _set() + # otherwise we generate a random UUID. + reset() + { +- local uuid=$(kenv smbios.system.uuid 2>/dev/null) +- local x="[0-9a-f]" +- local y="${x}${x}${x}${x}" ++ local uuid= x="[0-9a-f]" y="${x}${x}${x}${x}" ++ ++ if type kenv >/dev/null 2>&1; then ++ uuid=$(kenv smbios.system.uuid 2>/dev/null) ++ fi + case "${uuid}" in + ${y}${y}-${y}-${y}-${y}-${y}${y}${y});; + *) uuid=;; +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.3.0/0003-This-reverts-commit-0e2f160c95b15e95f3885e3f5a3670ec.patch b/sys-apps/openrc/files/0.3.0/0003-This-reverts-commit-0e2f160c95b15e95f3885e3f5a3670ec.patch new file mode 100644 index 0000000..8325015 --- /dev/null +++ b/sys-apps/openrc/files/0.3.0/0003-This-reverts-commit-0e2f160c95b15e95f3885e3f5a3670ec.patch @@ -0,0 +1,46 @@ +From ce2effcad208d2fdc6126811ac7127fdc928e823 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 01:48:19 -0400 +Subject: [PATCH] This reverts commit 0e2f160c95b15e95f3885e3f5a3670ec5ae0a709. 2 spaces in 80 cols has never made any sort of realistic difference and we're not going to change this behavior in Gentoo. + +--- + src/libeinfo/libeinfo.c | 9 +++------ + 1 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c +index bef98a5..a5977b7 100644 +--- a/src/libeinfo/libeinfo.c ++++ b/src/libeinfo/libeinfo.c +@@ -764,7 +764,7 @@ _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg) + if (!msg) + return; + +- cols = get_term_columns(fp) - (strlen(msg) + 3); ++ cols = get_term_columns(fp) - (strlen(msg) + 5); + + /* cons25 is special - we need to remove one char, otherwise things + * do not align properly at all. */ +@@ -778,18 +778,15 @@ _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg) + if (term_is_cons25) + cols--; + +- /* If extra spacing is required around msg, then please change +- * via a runtime knob and leave this default as is as it saves 2 +- * valuable columns when running on 80 column screens. */ + if (cols > 0 && colour_terminal(fp)) { +- fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols), ++ fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols), + ecolor(ECOLOR_BRACKET), ecolor(color), msg, + ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL)); + } else { + if (col > 0) + for (i = 0; i < cols - col; i++) + fprintf(fp, " "); +- fprintf(fp, " [%s]\n", msg); ++ fprintf(fp, " [ %s ]\n", msg); + } + } + +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.3.0/0004-add-a-softlevel-function-to-the-API-so-people-dont.patch b/sys-apps/openrc/files/0.3.0/0004-add-a-softlevel-function-to-the-API-so-people-dont.patch new file mode 100644 index 0000000..a307386 --- /dev/null +++ b/sys-apps/openrc/files/0.3.0/0004-add-a-softlevel-function-to-the-API-so-people-dont.patch @@ -0,0 +1,80 @@ +From 79e8ce8d2ea0ede99aba18d5f9a625a110aa918f Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 02:03:39 -0400 +Subject: [PATCH] add a softlevel() function to the API so people dont have to worry about inner details and move get_bootparam back to the exported function.sh api + +--- + sh/functions.sh.in | 22 ++++++++++++++++++++++ + sh/rc-functions.sh.in | 23 ----------------------- + 2 files changed, 22 insertions(+), 23 deletions(-) + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 57917ed..680f534 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -42,6 +42,28 @@ rc_runlevel() { + rc-status --runlevel + } + ++get_bootparam() ++{ ++ local match="$1" ++ [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 ++ ++ set -- $(cat /proc/cmdline) ++ while [ -n "$1" ]; do ++ case "$1" in ++ gentoo=*) ++ local params="${1##*=}" ++ local IFS=, x= ++ for x in ${params}; do ++ [ "${x}" = "${match}" ] && return 0 ++ done ++ ;; ++ esac ++ shift ++ done ++ ++ return 1 ++} ++ + _sanitize_path() + { + local IFS=":" p= path= +diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in +index 751d47a..c713def 100644 +--- a/sh/rc-functions.sh.in ++++ b/sh/rc-functions.sh.in +@@ -51,29 +51,6 @@ is_union_fs() + unionctl "$1" --list >/dev/null 2>&1 + } + +-get_bootparam() +-{ +- local match="$1" +- [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 +- +- set -- $(cat /proc/cmdline) +- while [ -n "$1" ]; do +- [ "$1" = "${match}" ] && return 0 +- case "$1" in +- gentoo=*) +- local params="${1##*=}" +- local IFS=, x= +- for x in ${params}; do +- [ "${x}" = "${match}" ] && return 0 +- done +- ;; +- esac +- shift +- done +- +- return 1 +-} +- + # Add our sbin to $PATH + case "${PATH}" in + "${RC_LIBDIR}"/sbin|"${RC_LIBDIR}"/sbin:*);; +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.3.0/0005-add-back-KV_-funcs.patch b/sys-apps/openrc/files/0.3.0/0005-add-back-KV_-funcs.patch new file mode 100644 index 0000000..dfde845 --- /dev/null +++ b/sys-apps/openrc/files/0.3.0/0005-add-back-KV_-funcs.patch @@ -0,0 +1,120 @@ +From 77a1fb72523df6495ae526fbf4fd834ac15aae74 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 03:14:02 -0400 +Subject: [PATCH] add back KV_* funcs + +--- + sh/functions.sh.in | 35 +++++++++++++++++++++++++++++++++++ + sh/runtests.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 80 insertions(+), 0 deletions(-) + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 680f534..f121564 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -64,6 +64,41 @@ get_bootparam() + return 1 + } + ++KV_major() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ echo ${KV%%.*} ++} ++ ++KV_minor() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ KV=${KV#*.} ++ echo ${KV%%.*} ++} ++ ++KV_micro() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ KV=${KV#*.*.} ++ echo ${KV%%[![:digit:]]*} ++} ++ ++KV_to_int() { ++ [ -z "$*" ] && return 1 ++ local KV_MAJOR="$(KV_major "$*")" ++ local KV_MINOR="$(KV_minor "$*")" ++ local KV_MICRO="$(KV_micro "$*")" ++ local KV_int="$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))" ++ echo "${KV_int}" ++} ++ ++_RC_GET_KV_CACHE="" ++get_KV() { ++ [ -z ${_RC_GET_KV_CACHE} ] && _RC_GET_KV_CACHE=$(uname -r) ++ echo $(KV_to_int "${_RC_GET_KV_CACHE}") ++} ++ + _sanitize_path() + { + local IFS=":" p= path= +diff --git a/sh/runtests.sh b/sh/runtests.sh +index 110266b..9f6726d 100755 +--- a/sh/runtests.sh ++++ b/sh/runtests.sh +@@ -3,6 +3,19 @@ + top_srcdir=${top_srcdir:-..} + . ${top_srcdir}/test/setup_env.sh + ++checkit() { ++ local output=$($1 $3) ++ local lret=$? ++ if [ ${lret} -ne 0 ] ; then ++ ((tret+=lret)) ++ echo "FAIL: exec: $*" ++ fi ++ if [ "${output}" != "$2" ] ; then ++ ((tret+=lret)) ++ echo "FAIL: output: $* : got='${output}' wanted='$2'" ++ fi ++} ++ + ret=0 + + tret=0 +@@ -22,4 +35,36 @@ done + eend ${tret} + ret=$((${ret} + ${tret})) + ++compare_int() { ++ local got=$(KV_to_int $1) ++ local exp=$(KV_to_int $3) ++ if ! [ ${got} $2 ${exp} ] ; then ++ ((tret+=1)) ++ echo "FAIL: KV_to_int '${v}'(${got}) $2 '1.2.2'(${exp})" ++ fi ++} ++ ++tret=0 ++ebegin "Testing KV_{major,minor,micro,to_int}" ++for v in \ ++ 1.2.3 1.2.3-rc0 1.2.3_rc0 "1.2.3 rc0" \ ++ 1.2.3.4 1.2.3.4-rc0 1.2.3.4_rc0 "1.2.3.4 rc0" ++do ++ checkit KV_major 1 ${v} ++ checkit KV_minor 2 ${v} ++ checkit KV_micro 3 ${v} ++ ++ compare_int 1.2.2 -lt ${v} ++ compare_int 1.2.2.10 -lt ${v} ++ compare_int 1.2.4 -gt ${v} ++ compare_int 1.2.4-rc0 -gt ${v} ++ compare_int 1.2.3 -eq ${v} ++ compare_int 1.2.3-rc0 -eq ${v} ++ compare_int 1.2.3.2 -eq ${v} ++ compare_int 1.2.3.3 -eq ${v} ++ compare_int 1.2.3.4 -eq ${v} ++done ++eend ${tret} ++((ret+=tret)) ++ + exit ${ret} +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.3.0/0006-Fix-tests-Gentoo-240350.patch b/sys-apps/openrc/files/0.3.0/0006-Fix-tests-Gentoo-240350.patch new file mode 100644 index 0000000..dfb022e --- /dev/null +++ b/sys-apps/openrc/files/0.3.0/0006-Fix-tests-Gentoo-240350.patch @@ -0,0 +1,49 @@ +From 86a3baa490d1d84f764b2f4b081d5abfc437b496 Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@marples.name> +Date: Tue, 7 Oct 2008 13:14:53 +0100 +Subject: [PATCH] Fix tests, #Gentoo 240350. + +--- + src/test/librc.funcs.hidden.list | 2 ++ + src/test/rc.funcs.list | 4 ++++ + 2 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/src/test/librc.funcs.hidden.list b/src/test/librc.funcs.hidden.list +index 15249ad..2416a0c 100644 +--- a/src/test/librc.funcs.hidden.list ++++ b/src/test/librc.funcs.hidden.list +@@ -41,8 +41,10 @@ rc_services_scheduled_by + rc_stringlist_add + rc_stringlist_addu + rc_stringlist_delete ++rc_stringlist_find + rc_stringlist_free + rc_stringlist_new + rc_stringlist_sort ++rc_stringlist_split + rc_sys + rc_yesno +diff --git a/src/test/rc.funcs.list b/src/test/rc.funcs.list +index 85cf936..f632474 100644 +--- a/src/test/rc.funcs.list ++++ b/src/test/rc.funcs.list +@@ -82,12 +82,16 @@ rc_stringlist_addu + rc_stringlist_addu@@RC_1.0 + rc_stringlist_delete + rc_stringlist_delete@@RC_1.0 ++rc_stringlist_find ++rc_stringlist_find@@RC_1.0 + rc_stringlist_free + rc_stringlist_free@@RC_1.0 + rc_stringlist_new + rc_stringlist_new@@RC_1.0 + rc_stringlist_sort + rc_stringlist_sort@@RC_1.0 ++rc_stringlist_split ++rc_stringlist_split@@RC_1.0 + rc_sys + rc_sys@@RC_1.0 + rc_yesno +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.3.0/0007-Fix-utmp-permissions-Gentoo-240437.patch b/sys-apps/openrc/files/0.3.0/0007-Fix-utmp-permissions-Gentoo-240437.patch new file mode 100644 index 0000000..1ef89f2 --- /dev/null +++ b/sys-apps/openrc/files/0.3.0/0007-Fix-utmp-permissions-Gentoo-240437.patch @@ -0,0 +1,31 @@ +From a327a7d1e795fb6d6c49a459f5863d9d1fdc0b9c Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@marples.name> +Date: Wed, 8 Oct 2008 14:58:17 +0100 +Subject: [PATCH] Fix utmp permissions, Gentoo #240437. + +--- + init.d/bootmisc.in | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in +index 50e83a0..529097e 100644 +--- a/init.d/bootmisc.in ++++ b/init.d/bootmisc.in +@@ -77,10 +77,13 @@ start() + if dir_writeable /var/run; then + ebegin "Creating user login records" + cp /dev/null /var/run/utmp ++ chgrp utmp /var/run/utmp ++ chmod 0664 /var/run/utmp + if dir_writeable /var/log; then + logw=true + [ -e /var/log/wtmp ] || cp /dev/null /var/log/wtmp +- chmod 0644 /var/run/utmp /var/log/wtmp ++ chgrp utmp /var/log/wtmp ++ chmod 0664 /var/log/wtmp + fi + eend 0 + +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.3.0/0008-Clean-up-warnings-regarding-printf.patch b/sys-apps/openrc/files/0.3.0/0008-Clean-up-warnings-regarding-printf.patch new file mode 100644 index 0000000..f645f07 --- /dev/null +++ b/sys-apps/openrc/files/0.3.0/0008-Clean-up-warnings-regarding-printf.patch @@ -0,0 +1,442 @@ +From ca7651e9ee42b222ec4fd1b30f4e9ba8eb0ffc37 Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@marples.name> +Date: Wed, 8 Oct 2008 16:56:47 +0100 +Subject: [PATCH] Clean up warnings regarding printf. + +--- + src/libeinfo/einfo.h | 66 ++++++++++++++++++++++------------------------ + src/libeinfo/libeinfo.c | 63 ++++++++++++++++++++++---------------------- + src/rc/rc-applets.c | 11 ++++--- + src/rc/runscript.c | 2 +- + 4 files changed, 70 insertions(+), 72 deletions(-) + +diff --git a/src/libeinfo/einfo.h b/src/libeinfo/einfo.h +index 3934b58..9c54e68 100644 +--- a/src/libeinfo/einfo.h ++++ b/src/libeinfo/einfo.h +@@ -28,13 +28,11 @@ + #define __EINFO_H__ + + #if defined(__GNUC__) +-# define __EINFO_PRINTF __attribute__ ((__format__ (__printf__, 1, 2))) +-# define __EINFO_XPRINTF __attribute__ ((__noreturn__, __format__ (__printf__, 1, 2))) +-# define __EEND_PRINTF __attribute__ ((__format__ (__printf__, 2, 3))) ++# define EINFO_PRINTF(a, b) __attribute__((__format__(__printf__, a, b))) ++# define EINFO_XPRINTF(a, b) __attribute__((__noreturn__,__format__(__printf__, a, b))) + #else +-# define __EINFO_PRINTF +-# define __EINFO_XPRINTF +-# define __EEND_PRINTF ++# define EINFO_PRINTF(a, b) ++# define EINFO_XPRINTF(a, b) + #endif + + #include <sys/types.h> +@@ -42,12 +40,12 @@ + + /* Although OpenRC requires C99, linking to us should not. */ + #ifdef restrict +-# define __EINFO_RESTRICT restrict ++# define EINFO_RESTRICT restrict + #else + # ifdef __restrict +-# define __EINFO_RESTRICT __restrict ++# define EINFO_RESTRICT __restrict + # else +-# define __EINFO_RESTRICT ++# define EINFO_RESTRICT + # endif + #endif + +@@ -68,7 +66,7 @@ typedef enum + const char *ecolor(ECOLOR); + + /*! @brief Writes to syslog. */ +-void elog(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF; ++void elog(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3); + + /*! + * @brief Display informational messages. +@@ -86,22 +84,22 @@ void elog(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF; + * The v suffix means only print if EINFO_VERBOSE is yes. + */ + /*@{*/ +-int einfon(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int ewarnn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int eerrorn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int einfo(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int ewarn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-void ewarnx(const char * __EINFO_RESTRICT, ...) __EINFO_XPRINTF; +-int eerror(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-void eerrorx(const char * __EINFO_RESTRICT, ...) __EINFO_XPRINTF; +- +-int einfovn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int ewarnvn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int ebeginvn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int eendvn(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF; +-int ewendvn(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF; +-int einfov(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int ewarnv(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; ++int einfon(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int ewarnn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int eerrorn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int einfo(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int ewarn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++void ewarnx(const char * __EINFO_RESTRICT, ...) EINFO_XPRINTF(1, 2); ++int eerror(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++void eerrorx(const char * __EINFO_RESTRICT, ...) EINFO_XPRINTF(1, 2); ++ ++int einfovn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int ewarnvn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int ebeginvn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int eendvn(int, const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3); ++int ewendvn(int, const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3); ++int einfov(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int ewarnv(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); + /*@}*/ + + /*! @ingroup ebegin +@@ -109,8 +107,8 @@ int ewarnv(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; + * + * Similar to einfo, but we add ... to the end of the message */ + /*@{*/ +-int ebeginv(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int ebegin(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; ++int ebeginv(const char * EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int ebegin(const char * EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); + /*@}*/ + + /*! @ingroup eend +@@ -122,12 +120,12 @@ int ebegin(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; + * + * ebracket allows you to specifiy the position, color and message */ + /*@{*/ +-int eend(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF; +-int ewend(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF; +-void ebracket(int, ECOLOR, const char * __EINFO_RESTRICT); ++int eend(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3); ++int ewend(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3); ++void ebracket(int, ECOLOR, const char * EINFO_RESTRICT); + +-int eendv(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF; +-int ewendv(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF; ++int eendv(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3); ++int ewendv(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3); + /*@}*/ + + /*! @ingroup eindent +@@ -141,7 +139,7 @@ void eindentv(void); + void eoutdentv(void); + + /*! @brief Prefix each einfo line with something */ +-void eprefix(const char * __EINFO_RESTRICT); ++void eprefix(const char * EINFO_RESTRICT); + + __END_DECLS + #endif +diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c +index a5977b7..7dd2ef6 100644 +--- a/src/libeinfo/libeinfo.c ++++ b/src/libeinfo/libeinfo.c +@@ -316,7 +316,7 @@ tgoto(const char *cap, int a, int b) + #endif + + static bool +-colour_terminal(FILE * __EINFO_RESTRICT f) ++colour_terminal(FILE * EINFO_RESTRICT f) + { + static int in_colour = -1; + char *e, *ee, *end, *d, *p; +@@ -460,7 +460,7 @@ colour_terminal(FILE * __EINFO_RESTRICT f) + } + + static int +-get_term_columns(FILE * __EINFO_RESTRICT stream) ++get_term_columns(FILE * EINFO_RESTRICT stream) + { + struct winsize ws; + char *env = getenv("COLUMNS"); +@@ -480,14 +480,14 @@ get_term_columns(FILE * __EINFO_RESTRICT stream) + } + + void +-eprefix(const char *__EINFO_RESTRICT prefix) ++eprefix(const char *EINFO_RESTRICT prefix) + { + _eprefix = prefix; + } + hidden_def(eprefix) + +-static void +-elogv(int level, const char *__EINFO_RESTRICT fmt, va_list ap) ++static void EINFO_PRINTF(2, 0) ++elogv(int level, const char *EINFO_RESTRICT fmt, va_list ap) + { + char *e = getenv("EINFO_LOG"); + va_list apc; +@@ -503,7 +503,7 @@ elogv(int level, const char *__EINFO_RESTRICT fmt, va_list ap) + } + + void +-elog(int level, const char *__EINFO_RESTRICT fmt, ...) ++elog(int level, const char *EINFO_RESTRICT fmt, ...) + { + va_list ap; + +@@ -514,7 +514,7 @@ elog(int level, const char *__EINFO_RESTRICT fmt, ...) + hidden_def(elog) + + static int +-_eindent(FILE * __EINFO_RESTRICT stream) ++_eindent(FILE * EINFO_RESTRICT stream) + { + char *env = getenv("EINFO_INDENT"); + int amount = 0; +@@ -538,7 +538,7 @@ _eindent(FILE * __EINFO_RESTRICT stream) + } + + static const char * +-_ecolor(FILE * __EINFO_RESTRICT f, ECOLOR color) ++_ecolor(FILE * EINFO_RESTRICT f, ECOLOR color) + { + unsigned int i; + +@@ -575,9 +575,8 @@ ecolor(ECOLOR color) + setenv("EINFO_LASTCMD", _cmd, 1); \ + } + +-static int +-_einfo(FILE *f, ECOLOR color, const char *__EINFO_RESTRICT fmt, va_list va) +- ++static int EINFO_PRINTF(3, 0) ++_einfo(FILE *f, ECOLOR color, const char *EINFO_RESTRICT fmt, va_list va) + { + int retval = 0; + char *last = getenv("EINFO_LASTCMD"); +@@ -605,7 +604,7 @@ _einfo(FILE *f, ECOLOR color, const char *__EINFO_RESTRICT fmt, va_list va) + #define _eerrorvn(fmt, ap) _einfo(stderr, ECOLOR_BAD, fmt, ap) + + int +-einfon(const char *__EINFO_RESTRICT fmt, ...) ++einfon(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -621,7 +620,7 @@ einfon(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(einfon) + + int +-ewarnn(const char *__EINFO_RESTRICT fmt, ...) ++ewarnn(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -637,7 +636,7 @@ ewarnn(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(ewarnn) + + int +-eerrorn(const char *__EINFO_RESTRICT fmt, ...) ++eerrorn(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -651,7 +650,7 @@ eerrorn(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(eerrorn) + + int +-einfo(const char *__EINFO_RESTRICT fmt, ...) ++einfo(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -668,7 +667,7 @@ einfo(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(einfo) + + int +-ewarn(const char *__EINFO_RESTRICT fmt, ...) ++ewarn(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -686,7 +685,7 @@ ewarn(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(ewarn) + + void +-ewarnx(const char *__EINFO_RESTRICT fmt, ...) ++ewarnx(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -703,7 +702,7 @@ ewarnx(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(ewarnx) + + int +-eerror(const char *__EINFO_RESTRICT fmt, ...) ++eerror(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -721,7 +720,7 @@ eerror(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(eerror) + + void +-eerrorx(const char *__EINFO_RESTRICT fmt, ...) ++eerrorx(const char *EINFO_RESTRICT fmt, ...) + { + va_list ap; + +@@ -737,7 +736,7 @@ eerrorx(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(eerrorx) + + int +-ebegin(const char *__EINFO_RESTRICT fmt, ...) ++ebegin(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -756,7 +755,7 @@ ebegin(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(ebegin) + + static void +-_eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg) ++_eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg) + { + int i; + int cols; +@@ -790,8 +789,8 @@ _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg) + } + } + +-static int +-_do_eend(const char *cmd, int retval, const char *__EINFO_RESTRICT fmt, va_list ap) ++static int EINFO_PRINTF(3, 0) ++_do_eend(const char *cmd, int retval, const char *EINFO_RESTRICT fmt, va_list ap) + { + int col = 0; + FILE *fp = stdout; +@@ -814,7 +813,7 @@ _do_eend(const char *cmd, int retval, const char *__EINFO_RESTRICT fmt, va_list + } + + int +-eend(int retval, const char *__EINFO_RESTRICT fmt, ...) ++eend(int retval, const char *EINFO_RESTRICT fmt, ...) + { + va_list ap; + +@@ -829,7 +828,7 @@ eend(int retval, const char *__EINFO_RESTRICT fmt, ...) + hidden_def(eend) + + int +-ewend(int retval, const char *__EINFO_RESTRICT fmt, ...) ++ewend(int retval, const char *EINFO_RESTRICT fmt, ...) + { + va_list ap; + +@@ -897,7 +896,7 @@ void eoutdent(void) + hidden_def(eoutdent) + + int +-einfovn(const char *__EINFO_RESTRICT fmt, ...) ++einfovn(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -913,7 +912,7 @@ einfovn(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(einfovn) + + int +-ewarnvn(const char *__EINFO_RESTRICT fmt, ...) ++ewarnvn(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -929,7 +928,7 @@ ewarnvn(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(ewarnvn) + + int +-einfov(const char *__EINFO_RESTRICT fmt, ...) ++einfov(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -946,7 +945,7 @@ einfov(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(einfov) + + int +-ewarnv(const char *__EINFO_RESTRICT fmt, ...) ++ewarnv(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -963,7 +962,7 @@ ewarnv(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(ewarnv) + + int +-ebeginv(const char *__EINFO_RESTRICT fmt, ...) ++ebeginv(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -983,7 +982,7 @@ ebeginv(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(ebeginv) + + int +-eendv(int retval, const char *__EINFO_RESTRICT fmt, ...) ++eendv(int retval, const char *EINFO_RESTRICT fmt, ...) + { + va_list ap; + +@@ -998,7 +997,7 @@ eendv(int retval, const char *__EINFO_RESTRICT fmt, ...) + hidden_def(eendv) + + int +-ewendv(int retval, const char *__EINFO_RESTRICT fmt, ...) ++ewendv(int retval, const char *EINFO_RESTRICT fmt, ...) + { + va_list ap; + +diff --git a/src/rc/rc-applets.c b/src/rc/rc-applets.c +index f5892f9..eea4a01 100644 +--- a/src/rc/rc-applets.c ++++ b/src/rc/rc-applets.c +@@ -84,8 +84,8 @@ static int do_e(int argc, char **argv) + int level = 0; + struct timespec ts; + struct timeval stop, now; +- int (*e) (const char *, ...) __EINFO_PRINTF = NULL; +- int (*ee) (int, const char *, ...) __EEND_PRINTF = NULL; ++ int (*e) (const char *, ...) EINFO_PRINTF(1, 2) = NULL; ++ int (*ee) (int, const char *, ...) EINFO_PRINTF(2, 3) = NULL; + + /* Punt applet */ + argc--; +@@ -205,9 +205,10 @@ static int do_e(int argc, char **argv) + ee = eend; + else if (strcmp(applet, "ewend") == 0) + ee = ewend; +- else if (strcmp(applet, "esyslog") == 0) +- ee = elog; +- else if (strcmp(applet, "veinfo") == 0) ++ else if (strcmp(applet, "esyslog") == 0) { ++ elog(retval, "%s", message); ++ retval = 0; ++ } else if (strcmp(applet, "veinfo") == 0) + e = einfov; + else if (strcmp(applet, "veinfon") == 0) + e = einfovn; +diff --git a/src/rc/runscript.c b/src/rc/runscript.c +index c04f967..211beff 100644 +--- a/src/rc/runscript.c ++++ b/src/rc/runscript.c +@@ -556,7 +556,7 @@ static bool svc_wait(const char *svc) + static RC_SERVICE svc_status(void) + { + char status[10]; +- int (*e) (const char *fmt, ...) __EINFO_PRINTF = einfo; ++ int (*e) (const char *fmt, ...) EINFO_PRINTF(1, 2) = einfo; + RC_SERVICE state = rc_service_state(service); + + if (state & RC_SERVICE_STOPPING) { +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.4.2/0001-msg-style.patch b/sys-apps/openrc/files/0.4.2/0001-msg-style.patch new file mode 100644 index 0000000..ab3559e --- /dev/null +++ b/sys-apps/openrc/files/0.4.2/0001-msg-style.patch @@ -0,0 +1,46 @@ +From 1eddb56f11b41c4bf4f878c995c5d140b1f9d44d Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 01:48:19 -0400 +Subject: [PATCH] This reverts commit 0e2f160c95b15e95f3885e3f5a3670ec5ae0a709. 2 spaces in 80 cols has never made any sort of realistic difference and we're not going to change this behavior in Gentoo. + +--- + src/libeinfo/libeinfo.c | 9 +++------ + 1 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c +index f8ddcb5..c46cacb 100644 +--- a/src/libeinfo/libeinfo.c ++++ b/src/libeinfo/libeinfo.c +@@ -787,7 +787,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, + if (! msg) + return; + +- cols = get_term_columns(fp) - (strlen(msg) + 3); ++ cols = get_term_columns(fp) - (strlen(msg) + 5); + + /* cons25 is special - we need to remove one char, otherwise things + * do not align properly at all. */ +@@ -801,18 +801,15 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, + if (term_is_cons25) + cols--; + +- /* If extra spacing is required around msg, then please change +- * via a runtime knob and leave this default as is as it saves 2 +- * valuable columns when running on 80 column screens. */ + if (cols > 0 && colour_terminal(fp)) { +- fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols), ++ fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols), + ecolor(ECOLOR_BRACKET), ecolor(color), msg, + ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL)); + } else { + if (col > 0) + for (i = 0; i < cols - col; i++) + fprintf(fp, " "); +- fprintf(fp, " [%s]\n", msg); ++ fprintf(fp, " [ %s ]\n", msg); + } + } + +-- +1.5.4.4 + diff --git a/sys-apps/openrc/files/0.4.2/0002-useful-functions.patch b/sys-apps/openrc/files/0.4.2/0002-useful-functions.patch new file mode 100644 index 0000000..a307386 --- /dev/null +++ b/sys-apps/openrc/files/0.4.2/0002-useful-functions.patch @@ -0,0 +1,80 @@ +From 79e8ce8d2ea0ede99aba18d5f9a625a110aa918f Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 02:03:39 -0400 +Subject: [PATCH] add a softlevel() function to the API so people dont have to worry about inner details and move get_bootparam back to the exported function.sh api + +--- + sh/functions.sh.in | 22 ++++++++++++++++++++++ + sh/rc-functions.sh.in | 23 ----------------------- + 2 files changed, 22 insertions(+), 23 deletions(-) + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 57917ed..680f534 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -42,6 +42,28 @@ rc_runlevel() { + rc-status --runlevel + } + ++get_bootparam() ++{ ++ local match="$1" ++ [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 ++ ++ set -- $(cat /proc/cmdline) ++ while [ -n "$1" ]; do ++ case "$1" in ++ gentoo=*) ++ local params="${1##*=}" ++ local IFS=, x= ++ for x in ${params}; do ++ [ "${x}" = "${match}" ] && return 0 ++ done ++ ;; ++ esac ++ shift ++ done ++ ++ return 1 ++} ++ + _sanitize_path() + { + local IFS=":" p= path= +diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in +index 751d47a..c713def 100644 +--- a/sh/rc-functions.sh.in ++++ b/sh/rc-functions.sh.in +@@ -51,29 +51,6 @@ is_union_fs() + unionctl "$1" --list >/dev/null 2>&1 + } + +-get_bootparam() +-{ +- local match="$1" +- [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 +- +- set -- $(cat /proc/cmdline) +- while [ -n "$1" ]; do +- [ "$1" = "${match}" ] && return 0 +- case "$1" in +- gentoo=*) +- local params="${1##*=}" +- local IFS=, x= +- for x in ${params}; do +- [ "${x}" = "${match}" ] && return 0 +- done +- ;; +- esac +- shift +- done +- +- return 1 +-} +- + # Add our sbin to $PATH + case "${PATH}" in + "${RC_LIBDIR}"/sbin|"${RC_LIBDIR}"/sbin:*);; +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.4.2/0003-KV.patch b/sys-apps/openrc/files/0.4.2/0003-KV.patch new file mode 100644 index 0000000..8ab646f --- /dev/null +++ b/sys-apps/openrc/files/0.4.2/0003-KV.patch @@ -0,0 +1,120 @@ +From dac703b26c71cd8479b71d101c4e1ddb8eadc194 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 03:14:02 -0400 +Subject: [PATCH] add back KV_* funcs + +--- + sh/functions.sh.in | 35 +++++++++++++++++++++++++++++++++++ + sh/runtests.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 80 insertions(+), 0 deletions(-) + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 140f6dc..0522792 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -65,6 +65,41 @@ get_bootparam() + return 1 + } + ++KV_major() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ echo ${KV%%.*} ++} ++ ++KV_minor() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ KV=${KV#*.} ++ echo ${KV%%.*} ++} ++ ++KV_micro() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ KV=${KV#*.*.} ++ echo ${KV%%[![:digit:]]*} ++} ++ ++KV_to_int() { ++ [ -z "$*" ] && return 1 ++ local KV_MAJOR="$(KV_major "$*")" ++ local KV_MINOR="$(KV_minor "$*")" ++ local KV_MICRO="$(KV_micro "$*")" ++ local KV_int="$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))" ++ echo "${KV_int}" ++} ++ ++_RC_GET_KV_CACHE="" ++get_KV() { ++ [ -z ${_RC_GET_KV_CACHE} ] && _RC_GET_KV_CACHE=$(uname -r) ++ echo $(KV_to_int "${_RC_GET_KV_CACHE}") ++} ++ + _sanitize_path() + { + local IFS=":" p= path= +diff --git a/sh/runtests.sh b/sh/runtests.sh +index d0d6a17..debcf4f 100755 +--- a/sh/runtests.sh ++++ b/sh/runtests.sh +@@ -3,6 +3,19 @@ + top_srcdir=${top_srcdir:-..} + . ${top_srcdir}/test/setup_env.sh + ++checkit() { ++ local output=$($1 $3) ++ local lret=$? ++ if [ ${lret} -ne 0 ] ; then ++ ((tret+=lret)) ++ echo "FAIL: exec: $*" ++ fi ++ if [ "${output}" != "$2" ] ; then ++ ((tret+=lret)) ++ echo "FAIL: output: $* : got='${output}' wanted='$2'" ++ fi ++} ++ + ret=0 + + tret=0 +@@ -22,4 +35,36 @@ done + eend ${tret} + ((ret+=tret)) + ++compare_int() { ++ local got=$(KV_to_int $1) ++ local exp=$(KV_to_int $3) ++ if ! [ ${got} $2 ${exp} ] ; then ++ ((tret+=1)) ++ echo "FAIL: KV_to_int '${v}'(${got}) $2 '1.2.2'(${exp})" ++ fi ++} ++ ++tret=0 ++ebegin "Testing KV_{major,minor,micro,to_int}" ++for v in \ ++ 1.2.3 1.2.3-rc0 1.2.3_rc0 "1.2.3 rc0" \ ++ 1.2.3.4 1.2.3.4-rc0 1.2.3.4_rc0 "1.2.3.4 rc0" ++do ++ checkit KV_major 1 ${v} ++ checkit KV_minor 2 ${v} ++ checkit KV_micro 3 ${v} ++ ++ compare_int 1.2.2 -lt ${v} ++ compare_int 1.2.2.10 -lt ${v} ++ compare_int 1.2.4 -gt ${v} ++ compare_int 1.2.4-rc0 -gt ${v} ++ compare_int 1.2.3 -eq ${v} ++ compare_int 1.2.3-rc0 -eq ${v} ++ compare_int 1.2.3.2 -eq ${v} ++ compare_int 1.2.3.3 -eq ${v} ++ compare_int 1.2.3.4 -eq ${v} ++done ++eend ${tret} ++((ret+=tret)) ++ + exit ${ret} +-- +1.5.4.4 + diff --git a/sys-apps/openrc/files/0.4.2/0004-svn-version.patch b/sys-apps/openrc/files/0.4.2/0004-svn-version.patch new file mode 100644 index 0000000..a2f9e1e --- /dev/null +++ b/sys-apps/openrc/files/0.4.2/0004-svn-version.patch @@ -0,0 +1,13 @@ +Index: openrc-0.4.2/src/rc/Makefile +=================================================================== +--- openrc-0.4.2.orig/src/rc/Makefile ++++ openrc-0.4.2/src/rc/Makefile +@@ -45,7 +45,7 @@ include ${MK}/${MKPAM}.mk + + _SVNVER_SH= ret=""; \ + if type svnversion >/dev/null 2>&1; then \ +- svnver="$$(svnversion)"; \ ++ svnver="$$(LC_ALL=C svnversion)"; \ + [ "$${svnver}" != exported ] && ret="-svn-$${svnver}"; \ + fi; \ + echo "$${ret}"; diff --git a/sys-apps/openrc/files/9999/0001-msg-style.patch b/sys-apps/openrc/files/9999/0001-msg-style.patch new file mode 100644 index 0000000..ab3559e --- /dev/null +++ b/sys-apps/openrc/files/9999/0001-msg-style.patch @@ -0,0 +1,46 @@ +From 1eddb56f11b41c4bf4f878c995c5d140b1f9d44d Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 01:48:19 -0400 +Subject: [PATCH] This reverts commit 0e2f160c95b15e95f3885e3f5a3670ec5ae0a709. 2 spaces in 80 cols has never made any sort of realistic difference and we're not going to change this behavior in Gentoo. + +--- + src/libeinfo/libeinfo.c | 9 +++------ + 1 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c +index f8ddcb5..c46cacb 100644 +--- a/src/libeinfo/libeinfo.c ++++ b/src/libeinfo/libeinfo.c +@@ -787,7 +787,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, + if (! msg) + return; + +- cols = get_term_columns(fp) - (strlen(msg) + 3); ++ cols = get_term_columns(fp) - (strlen(msg) + 5); + + /* cons25 is special - we need to remove one char, otherwise things + * do not align properly at all. */ +@@ -801,18 +801,15 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, + if (term_is_cons25) + cols--; + +- /* If extra spacing is required around msg, then please change +- * via a runtime knob and leave this default as is as it saves 2 +- * valuable columns when running on 80 column screens. */ + if (cols > 0 && colour_terminal(fp)) { +- fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols), ++ fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols), + ecolor(ECOLOR_BRACKET), ecolor(color), msg, + ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL)); + } else { + if (col > 0) + for (i = 0; i < cols - col; i++) + fprintf(fp, " "); +- fprintf(fp, " [%s]\n", msg); ++ fprintf(fp, " [ %s ]\n", msg); + } + } + +-- +1.5.4.4 + diff --git a/sys-apps/openrc/files/9999/0002-useful-functions.patch b/sys-apps/openrc/files/9999/0002-useful-functions.patch new file mode 100644 index 0000000..a307386 --- /dev/null +++ b/sys-apps/openrc/files/9999/0002-useful-functions.patch @@ -0,0 +1,80 @@ +From 79e8ce8d2ea0ede99aba18d5f9a625a110aa918f Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 02:03:39 -0400 +Subject: [PATCH] add a softlevel() function to the API so people dont have to worry about inner details and move get_bootparam back to the exported function.sh api + +--- + sh/functions.sh.in | 22 ++++++++++++++++++++++ + sh/rc-functions.sh.in | 23 ----------------------- + 2 files changed, 22 insertions(+), 23 deletions(-) + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 57917ed..680f534 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -42,6 +42,28 @@ rc_runlevel() { + rc-status --runlevel + } + ++get_bootparam() ++{ ++ local match="$1" ++ [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 ++ ++ set -- $(cat /proc/cmdline) ++ while [ -n "$1" ]; do ++ case "$1" in ++ gentoo=*) ++ local params="${1##*=}" ++ local IFS=, x= ++ for x in ${params}; do ++ [ "${x}" = "${match}" ] && return 0 ++ done ++ ;; ++ esac ++ shift ++ done ++ ++ return 1 ++} ++ + _sanitize_path() + { + local IFS=":" p= path= +diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in +index 751d47a..c713def 100644 +--- a/sh/rc-functions.sh.in ++++ b/sh/rc-functions.sh.in +@@ -51,29 +51,6 @@ is_union_fs() + unionctl "$1" --list >/dev/null 2>&1 + } + +-get_bootparam() +-{ +- local match="$1" +- [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 +- +- set -- $(cat /proc/cmdline) +- while [ -n "$1" ]; do +- [ "$1" = "${match}" ] && return 0 +- case "$1" in +- gentoo=*) +- local params="${1##*=}" +- local IFS=, x= +- for x in ${params}; do +- [ "${x}" = "${match}" ] && return 0 +- done +- ;; +- esac +- shift +- done +- +- return 1 +-} +- + # Add our sbin to $PATH + case "${PATH}" in + "${RC_LIBDIR}"/sbin|"${RC_LIBDIR}"/sbin:*);; +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/9999/0003-KV.patch b/sys-apps/openrc/files/9999/0003-KV.patch new file mode 100644 index 0000000..8ab646f --- /dev/null +++ b/sys-apps/openrc/files/9999/0003-KV.patch @@ -0,0 +1,120 @@ +From dac703b26c71cd8479b71d101c4e1ddb8eadc194 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 03:14:02 -0400 +Subject: [PATCH] add back KV_* funcs + +--- + sh/functions.sh.in | 35 +++++++++++++++++++++++++++++++++++ + sh/runtests.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 80 insertions(+), 0 deletions(-) + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 140f6dc..0522792 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -65,6 +65,41 @@ get_bootparam() + return 1 + } + ++KV_major() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ echo ${KV%%.*} ++} ++ ++KV_minor() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ KV=${KV#*.} ++ echo ${KV%%.*} ++} ++ ++KV_micro() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ KV=${KV#*.*.} ++ echo ${KV%%[![:digit:]]*} ++} ++ ++KV_to_int() { ++ [ -z "$*" ] && return 1 ++ local KV_MAJOR="$(KV_major "$*")" ++ local KV_MINOR="$(KV_minor "$*")" ++ local KV_MICRO="$(KV_micro "$*")" ++ local KV_int="$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))" ++ echo "${KV_int}" ++} ++ ++_RC_GET_KV_CACHE="" ++get_KV() { ++ [ -z ${_RC_GET_KV_CACHE} ] && _RC_GET_KV_CACHE=$(uname -r) ++ echo $(KV_to_int "${_RC_GET_KV_CACHE}") ++} ++ + _sanitize_path() + { + local IFS=":" p= path= +diff --git a/sh/runtests.sh b/sh/runtests.sh +index d0d6a17..debcf4f 100755 +--- a/sh/runtests.sh ++++ b/sh/runtests.sh +@@ -3,6 +3,19 @@ + top_srcdir=${top_srcdir:-..} + . ${top_srcdir}/test/setup_env.sh + ++checkit() { ++ local output=$($1 $3) ++ local lret=$? ++ if [ ${lret} -ne 0 ] ; then ++ ((tret+=lret)) ++ echo "FAIL: exec: $*" ++ fi ++ if [ "${output}" != "$2" ] ; then ++ ((tret+=lret)) ++ echo "FAIL: output: $* : got='${output}' wanted='$2'" ++ fi ++} ++ + ret=0 + + tret=0 +@@ -22,4 +35,36 @@ done + eend ${tret} + ((ret+=tret)) + ++compare_int() { ++ local got=$(KV_to_int $1) ++ local exp=$(KV_to_int $3) ++ if ! [ ${got} $2 ${exp} ] ; then ++ ((tret+=1)) ++ echo "FAIL: KV_to_int '${v}'(${got}) $2 '1.2.2'(${exp})" ++ fi ++} ++ ++tret=0 ++ebegin "Testing KV_{major,minor,micro,to_int}" ++for v in \ ++ 1.2.3 1.2.3-rc0 1.2.3_rc0 "1.2.3 rc0" \ ++ 1.2.3.4 1.2.3.4-rc0 1.2.3.4_rc0 "1.2.3.4 rc0" ++do ++ checkit KV_major 1 ${v} ++ checkit KV_minor 2 ${v} ++ checkit KV_micro 3 ${v} ++ ++ compare_int 1.2.2 -lt ${v} ++ compare_int 1.2.2.10 -lt ${v} ++ compare_int 1.2.4 -gt ${v} ++ compare_int 1.2.4-rc0 -gt ${v} ++ compare_int 1.2.3 -eq ${v} ++ compare_int 1.2.3-rc0 -eq ${v} ++ compare_int 1.2.3.2 -eq ${v} ++ compare_int 1.2.3.3 -eq ${v} ++ compare_int 1.2.3.4 -eq ${v} ++done ++eend ${tret} ++((ret+=tret)) ++ + exit ${ret} +-- +1.5.4.4 + diff --git a/sys-apps/openrc/openrc-0.2.5.ebuild b/sys-apps/openrc/openrc-0.2.5.ebuild new file mode 100644 index 0000000..2dfbfb4 --- /dev/null +++ b/sys-apps/openrc/openrc-0.2.5.ebuild @@ -0,0 +1,275 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.5.ebuild,v 1.5 2008/10/06 18:53:12 cardoe Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git" + EGIT_BRANCH="master" + inherit git +else + SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2 + mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2 + http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" +fi + +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" +HOMEPAGE="http://roy.marples.name/openrc" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="debug ncurses pam unicode kernel_linux kernel_FreeBSD" + +RDEPEND="virtual/init + kernel_linux? ( virtual/modutils ) + kernel_FreeBSD? ( sys-process/fuser-bsd ) + elibc_glibc? ( >=sys-libs/glibc-2.5 ) + ncurses? ( sys-libs/ncurses ) + pam? ( virtual/pam ) + >=sys-apps/baselayout-2.0.0 + !<sys-fs/udev-118-r2" +DEPEND="virtual/os-headers" + +pkg_setup() { + LIBDIR="lib" + [ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}") + + MAKE_ARGS="${MAKE_ARGS} LIBNAME=${LIBDIR}" + + local brand="Unknown" + if use kernel_linux ; then + MAKE_ARGS="${MAKE_ARGS} OS=Linux" + brand="Linux" + elif use kernel_FreeBSD ; then + MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" + brand="FreeBSD" + fi + export BRANDING="Gentoo ${brand}" + + export DEBUG=$(usev debug) + export MKPAM=$(usev pam) + export MKTERMCAP=$(usev ncurses) +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git_src_unpack + else + unpack ${A} + fi + cd "${S}" + epatch "${FILESDIR}"/0.2.5/*.patch +} + +src_compile() { + # catch people running `ebuild` w/out setup + if [[ -z ${MAKE_ARGS} ]] ; then + die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?" + fi + + if [[ ${PV} == "9999" ]] ; then + local ver="git-$(git --git-dir=${EGIT_STORE_DIR}/${EGIT_PROJECT} rev-parse --verify ${EGIT_BRANCH} | cut -c1-8)" + sed -i "/^VERSION[[:space:]]*=/s:=.*:=${ver}:" Makefile + fi + + tc-export CC AR RANLIB + echo emake ${MAKE_ARGS} + emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed" +} + +src_install() { + emake ${MAKE_ARGS} DESTDIR="${D}" install || die "make install failed" + gen_usr_ldscript libeinfo.so + gen_usr_ldscript librc.so + + keepdir /"${LIBDIR}"/rc/init.d + keepdir /"${LIBDIR}"/rc/tmp + + # Backup our default runlevels + dodir /usr/share/"${PN}" + mv "${D}/etc/runlevels" "${D}/usr/share/${PN}" + + # Setup unicode defaults for silly unicode users + use unicode && sed -i -e '/^unicode=/s:NO:YES:' "${D}"/etc/rc.conf + + # Cater to the norm + (use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps +} + +add_boot_init() { + local initd=$1 + # if the initscript is not going to be installed and is not + # currently installed, return + [[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \ + || return + [[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return + elog "Auto-adding '${initd}' service to your boot runlevel" + ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd} +} +add_boot_init_mit_config() { + local config=$1 initd=$2 + if [[ -e ${ROOT}${config} ]] ; then + if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then + add_boot_init ${initd} + fi + fi +} + +pkg_preinst() { + local f + + # default net script is just comments, so no point in biting people + # in the ass by accident + mv "${D}"/etc/conf.d/net "${T}"/ + [[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/ + + # upgrade timezone file ... do it before moving clock + if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then + ( + source "${ROOT}"/etc/conf.d/clock + [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone + ) + fi + + # /etc/conf.d/clock moved to /etc/conf.d/hwclock + local clock + use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" + if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then + mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock} + fi + if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then + rm -f "${ROOT}"/etc/runlevels/boot/clock + ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock} + fi + if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then + rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock + ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock} + fi + + # /etc/conf.d/rc is no longer used for configuration + if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then + elog "/etc/conf.d/rc is no longer used for configuration." + elog "Please migrate your settings to /etc/rc.conf as applicable" + elog "and delete /etc/conf.d/rc" + fi + + # force net init.d scripts into symlinks + for f in "${ROOT}"/etc/init.d/net.* ; do + [[ -e ${f} ]] || continue # catch net.* not matching anything + [[ ${f} == */net.lo ]] && continue # real file now + [[ ${f} == *.openrc.bak ]] && continue + if [[ ! -L ${f} ]] ; then + elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." + elog "You should delete '${f##*/}.openrc.bak' if you don't need it." + mv "${f}" "${f}.openrc.bak" + ln -snf net.lo "${f}" + fi + done + + # termencoding was added in 0.2.1 and needed in boot + has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding + + # skip remaining migration if we already have openrc installed + has_version sys-apps/openrc && return 0 + + # baselayout boot init scripts have been split out + for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do + add_boot_init ${f} + done + + # Try to auto-add some addons when possible + add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt + add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt + add_boot_init_mit_config /etc/mdadm.conf mdraid + add_boot_init_mit_config /etc/evms.conf evms + [[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper + [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm + elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" + elog "init.d scripts. If you use such a thing, make sure you have the" + elog "required init.d scripts added to your boot runlevel." + + # Upgrade out state for baselayout-1 users + if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then + ( + [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc + svcdir=${svcdir:-/var/lib/init.d} + if [[ ! -d ${ROOT}${svcdir}/started ]] ; then + ewarn "No state found, and no state exists" + elog "You should reboot this host" + else + mkdir -p "${ROOT}${LIBDIR}/rc/init.d" + einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d" + mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d + rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \ + "${ROOT}${LIBDIR}"/rc/init.d/console + umount "${ROOT}${svcdir}" 2>/dev/null + rm -rf "${ROOT}${svcdir}" + fi + ) + fi + + # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" + rm -f "${ROOT}"/etc/modules.autoload.d/.keep* + rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + local f v + for f in "${ROOT}"/etc/modules.autoload.d/* ; do + v=${f##*/} + v=${v#kernel-} + v=${v//[^[:alnum:]]/_} + gawk -v v="${v}" -v f="${f##*/}" ' + BEGIN { print "\n### START: Auto-converted from " f "\n" } + { + if ($0 ~ /^[^#]/) { + print "modules_" v "=\"${modules_" v "} " $1 "\"" + gsub(/[^[:alnum:]]/, "_", $1) + printf "module_" $1 "_args_" v "=\"" + for (i = 2; i <= NF; ++i) { + if (i > 2) + printf " " + printf $i + } + print "\"\n" + } else + print + } + END { print "\n### END: Auto-converted from " f "\n" } + ' "${f}" >> "${D}"/etc/conf.d/modules + done + rm -f "${f}" + rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null + fi + fi +} + +pkg_postinst() { + # Remove old baselayout links + rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin} + + [[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net + + # Make our runlevels if they don't exist + if [[ ! -e ${ROOT}/etc/runlevels ]] ; then + einfo "Copying across default runlevels" + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc + fi + + # update the dependency tree bug #224171 + [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u + + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + ewarn "/etc/modules.autoload.d is no longer used. Please convert" + ewarn "your files to /etc/conf.d/modules and delete the directory." + fi + + elog "You should now update all files in /etc, using etc-update" + elog "or equivalent before restarting any services or this host." + elog + elog "Please read the migration guide available at:" + elog "http://www.gentoo.org/doc/en/openrc-migration.xml" +} diff --git a/sys-apps/openrc/openrc-0.3.0-r1.ebuild b/sys-apps/openrc/openrc-0.3.0-r1.ebuild new file mode 100644 index 0000000..3ac8810 --- /dev/null +++ b/sys-apps/openrc/openrc-0.3.0-r1.ebuild @@ -0,0 +1,275 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.3.0-r1.ebuild,v 1.1 2008/10/08 16:19:11 cardoe Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git" + EGIT_BRANCH="master" + inherit git +else + SRC_URI="http://roy.marples.name/${PN}/${P}.tar.bz2 + mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2 + http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" +fi + +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" +HOMEPAGE="http://roy.marples.name/openrc" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="debug ncurses pam unicode kernel_linux kernel_FreeBSD" + +RDEPEND="virtual/init + kernel_linux? ( virtual/modutils ) + kernel_FreeBSD? ( sys-process/fuser-bsd ) + elibc_glibc? ( >=sys-libs/glibc-2.5 ) + ncurses? ( sys-libs/ncurses ) + pam? ( virtual/pam ) + >=sys-apps/baselayout-2.0.0 + !<sys-fs/udev-118-r2" +DEPEND="virtual/os-headers" + +pkg_setup() { + LIBDIR="lib" + [ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}") + + MAKE_ARGS="${MAKE_ARGS} LIBNAME=${LIBDIR}" + + local brand="Unknown" + if use kernel_linux ; then + MAKE_ARGS="${MAKE_ARGS} OS=Linux" + brand="Linux" + elif use kernel_FreeBSD ; then + MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" + brand="FreeBSD" + fi + export BRANDING="Gentoo ${brand}" + + export DEBUG=$(usev debug) + export MKPAM=$(usev pam) + export MKTERMCAP=$(usev ncurses) +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git_src_unpack + else + unpack ${A} + fi + cd "${S}" + epatch "${FILESDIR}"/${PV}/*.patch +} + +src_compile() { + # catch people running `ebuild` w/out setup + if [[ -z ${MAKE_ARGS} ]] ; then + die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?" + fi + + if [[ ${PV} == "9999" ]] ; then + local ver="git-$(git --git-dir=${EGIT_STORE_DIR}/${EGIT_PROJECT} rev-parse --verify ${EGIT_BRANCH} | cut -c1-8)" + sed -i "/^VERSION[[:space:]]*=/s:=.*:=${ver}:" Makefile + fi + + tc-export CC AR RANLIB + echo emake ${MAKE_ARGS} + emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed" +} + +src_install() { + emake ${MAKE_ARGS} DESTDIR="${D}" install || die "make install failed" + gen_usr_ldscript libeinfo.so + gen_usr_ldscript librc.so + + keepdir /"${LIBDIR}"/rc/init.d + keepdir /"${LIBDIR}"/rc/tmp + + # Backup our default runlevels + dodir /usr/share/"${PN}" + mv "${D}/etc/runlevels" "${D}/usr/share/${PN}" + + # Setup unicode defaults for silly unicode users + use unicode && sed -i -e '/^unicode=/s:NO:YES:' "${D}"/etc/rc.conf + + # Cater to the norm + (use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps +} + +add_boot_init() { + local initd=$1 + # if the initscript is not going to be installed and is not + # currently installed, return + [[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \ + || return + [[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return + elog "Auto-adding '${initd}' service to your boot runlevel" + ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd} +} +add_boot_init_mit_config() { + local config=$1 initd=$2 + if [[ -e ${ROOT}${config} ]] ; then + if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then + add_boot_init ${initd} + fi + fi +} + +pkg_preinst() { + local f + + # default net script is just comments, so no point in biting people + # in the ass by accident + mv "${D}"/etc/conf.d/net "${T}"/ + [[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/ + + # upgrade timezone file ... do it before moving clock + if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then + ( + source "${ROOT}"/etc/conf.d/clock + [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone + ) + fi + + # /etc/conf.d/clock moved to /etc/conf.d/hwclock + local clock + use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" + if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then + mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock} + fi + if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then + rm -f "${ROOT}"/etc/runlevels/boot/clock + ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock} + fi + if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then + rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock + ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock} + fi + + # /etc/conf.d/rc is no longer used for configuration + if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then + elog "/etc/conf.d/rc is no longer used for configuration." + elog "Please migrate your settings to /etc/rc.conf as applicable" + elog "and delete /etc/conf.d/rc" + fi + + # force net init.d scripts into symlinks + for f in "${ROOT}"/etc/init.d/net.* ; do + [[ -e ${f} ]] || continue # catch net.* not matching anything + [[ ${f} == */net.lo ]] && continue # real file now + [[ ${f} == *.openrc.bak ]] && continue + if [[ ! -L ${f} ]] ; then + elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." + elog "You should delete '${f##*/}.openrc.bak' if you don't need it." + mv "${f}" "${f}.openrc.bak" + ln -snf net.lo "${f}" + fi + done + + # termencoding was added in 0.2.1 and needed in boot + has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding + + # skip remaining migration if we already have openrc installed + has_version sys-apps/openrc && return 0 + + # baselayout boot init scripts have been split out + for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do + add_boot_init ${f} + done + + # Try to auto-add some addons when possible + add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt + add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt + add_boot_init_mit_config /etc/mdadm.conf mdraid + add_boot_init_mit_config /etc/evms.conf evms + [[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper + [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm + elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" + elog "init.d scripts. If you use such a thing, make sure you have the" + elog "required init.d scripts added to your boot runlevel." + + # Upgrade out state for baselayout-1 users + if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then + ( + [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc + svcdir=${svcdir:-/var/lib/init.d} + if [[ ! -d ${ROOT}${svcdir}/started ]] ; then + ewarn "No state found, and no state exists" + elog "You should reboot this host" + else + mkdir -p "${ROOT}${LIBDIR}/rc/init.d" + einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d" + mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d + rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \ + "${ROOT}${LIBDIR}"/rc/init.d/console + umount "${ROOT}${svcdir}" 2>/dev/null + rm -rf "${ROOT}${svcdir}" + fi + ) + fi + + # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" + rm -f "${ROOT}"/etc/modules.autoload.d/.keep* + rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + local f v + for f in "${ROOT}"/etc/modules.autoload.d/* ; do + v=${f##*/} + v=${v#kernel-} + v=${v//[^[:alnum:]]/_} + gawk -v v="${v}" -v f="${f##*/}" ' + BEGIN { print "\n### START: Auto-converted from " f "\n" } + { + if ($0 ~ /^[^#]/) { + print "modules_" v "=\"${modules_" v "} " $1 "\"" + gsub(/[^[:alnum:]]/, "_", $1) + printf "module_" $1 "_args_" v "=\"" + for (i = 2; i <= NF; ++i) { + if (i > 2) + printf " " + printf $i + } + print "\"\n" + } else + print + } + END { print "\n### END: Auto-converted from " f "\n" } + ' "${f}" >> "${D}"/etc/conf.d/modules + done + rm -f "${f}" + rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null + fi + fi +} + +pkg_postinst() { + # Remove old baselayout links + rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin} + + [[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net + + # Make our runlevels if they don't exist + if [[ ! -e ${ROOT}/etc/runlevels ]] ; then + einfo "Copying across default runlevels" + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc + fi + + # update the dependency tree bug #224171 + [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u + + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + ewarn "/etc/modules.autoload.d is no longer used. Please convert" + ewarn "your files to /etc/conf.d/modules and delete the directory." + fi + + elog "You should now update all files in /etc, using etc-update" + elog "or equivalent before restarting any services or this host." + elog + elog "Please read the migration guide available at:" + elog "http://www.gentoo.org/doc/en/openrc-migration.xml" +} diff --git a/sys-apps/openrc/openrc-0.4.2.ebuild b/sys-apps/openrc/openrc-0.4.2.ebuild new file mode 100644 index 0000000..64e3d4e --- /dev/null +++ b/sys-apps/openrc/openrc-0.4.2.ebuild @@ -0,0 +1,314 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.2.ebuild,v 1.1 2009/01/14 14:19:47 zzam Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git" + EGIT_BRANCH="master" + inherit git +else + SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2 + mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2 + http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" +fi + +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" +HOMEPAGE="http://roy.marples.name/openrc" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="debug elibc_glibc ncurses pam unicode kernel_linux kernel_FreeBSD" + +RDEPEND="virtual/init + kernel_FreeBSD? ( sys-process/fuser-bsd ) + elibc_glibc? ( >=sys-libs/glibc-2.5 ) + ncurses? ( sys-libs/ncurses ) + pam? ( virtual/pam ) + >=sys-apps/baselayout-2.0.0 + kernel_linux? ( !<sys-apps/module-init-tools-3.2.2-r2 ) + !<sys-fs/udev-133 + !<sys-apps/sysvinit-2.86-r11" +DEPEND="virtual/os-headers" + +pkg_setup() { + LIBDIR="lib" + [ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}") + + MAKE_ARGS="${MAKE_ARGS} LIBNAME=${LIBDIR}" + + local brand="Unknown" + if use kernel_linux ; then + MAKE_ARGS="${MAKE_ARGS} OS=Linux" + brand="Linux" + elif use kernel_FreeBSD ; then + MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" + brand="FreeBSD" + fi + export BRANDING="Gentoo ${brand}" + + export DEBUG=$(usev debug) + export MKPAM=$(usev pam) + export MKTERMCAP=$(usev ncurses) +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git_src_unpack + else + unpack ${A} + fi + cd "${S}" + epatch "${FILESDIR}"/0.4.2/*.patch +} + +src_compile() { + # catch people running `ebuild` w/out setup + if [[ -z ${MAKE_ARGS} ]] ; then + die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?" + fi + + if [[ ${PV} == "9999" ]] ; then + local ver="git-$(git --git-dir=${EGIT_STORE_DIR}/${EGIT_PROJECT} rev-parse --verify ${EGIT_BRANCH} | cut -c1-8)" + sed -i "/^VERSION[[:space:]]*=/s:=.*:=${ver}:" Makefile + fi + + tc-export CC AR RANLIB + echo emake ${MAKE_ARGS} + emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed" +} + +src_install() { + emake ${MAKE_ARGS} DESTDIR="${D}" install || die "make install failed" + gen_usr_ldscript libeinfo.so + gen_usr_ldscript librc.so + + keepdir /"${LIBDIR}"/rc/init.d + keepdir /"${LIBDIR}"/rc/tmp + + # Backup our default runlevels + dodir /usr/share/"${PN}" + mv "${D}/etc/runlevels" "${D}/usr/share/${PN}" + + # Setup unicode defaults for silly unicode users + use unicode && sed -i -e '/^unicode=/s:NO:YES:' "${D}"/etc/rc.conf + + # Cater to the norm + (use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps +} + +add_boot_init() { + local initd=$1 + # if the initscript is not going to be installed and is not + # currently installed, return + [[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \ + || return + [[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return + elog "Auto-adding '${initd}' service to your boot runlevel" + ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd} +} +add_boot_init_mit_config() { + local config=$1 initd=$2 + if [[ -e ${ROOT}${config} ]] ; then + if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then + add_boot_init ${initd} + fi + fi +} + +pkg_preinst() { + local f + + # default net script is just comments, so no point in biting people + # in the ass by accident + mv "${D}"/etc/conf.d/net "${T}"/ + [[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/ + + # upgrade timezone file ... do it before moving clock + if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then + ( + source "${ROOT}"/etc/conf.d/clock + [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone + ) + fi + + # /etc/conf.d/clock moved to /etc/conf.d/hwclock + local clock + use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" + if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then + mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock} + fi + if [[ -e ${ROOT}/etc/init.d/clock ]] ; then + rm -f "${ROOT}"/etc/init.d/clock + fi + if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then + rm -f "${ROOT}"/etc/runlevels/boot/clock + ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock} + fi + if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then + rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock + ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock} + fi + + # /etc/conf.d/rc is no longer used for configuration + if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then + elog "/etc/conf.d/rc is no longer used for configuration." + elog "Please migrate your settings to /etc/rc.conf as applicable" + elog "and delete /etc/conf.d/rc" + fi + + # force net init.d scripts into symlinks + for f in "${ROOT}"/etc/init.d/net.* ; do + [[ -e ${f} ]] || continue # catch net.* not matching anything + [[ ${f} == */net.lo ]] && continue # real file now + [[ ${f} == *.openrc.bak ]] && continue + if [[ ! -L ${f} ]] ; then + elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." + elog "You should delete '${f##*/}.openrc.bak' if you don't need it." + mv "${f}" "${f}.openrc.bak" + ln -snf net.lo "${f}" + fi + done + + # termencoding was added in 0.2.1 and needed in boot + has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding + + # openrc-0.4.0 no longer loads the udev addon + enable_udev=0 + if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \ + [[ -e "${ROOT}"/etc/init.d/udev ]] && \ + ! has_version ">=sys-apps/openrc-0.4.0" + then + # make sure udev is in sysinit if it was enabled before + local rc_devices=$( + [[ -f /etc/rc.conf ]] && source /etc/rc.conf + [[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc + echo "${rc_devices:-${RC_DEVICES:-auto}}" + ) + case ${rc_devices} in + udev|auto) + enable_udev=1 + ;; + esac + fi + + # skip remaining migration if we already have openrc installed + has_version sys-apps/openrc && return 0 + + # baselayout boot init scripts have been split out + for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do + add_boot_init ${f} + done + + # Try to auto-add some addons when possible + add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt + add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt + add_boot_init_mit_config /etc/mdadm.conf mdraid + add_boot_init_mit_config /etc/evms.conf evms + [[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper + [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm + elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" + elog "init.d scripts. If you use such a thing, make sure you have the" + elog "required init.d scripts added to your boot runlevel." + + # Upgrade out state for baselayout-1 users + if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then + ( + [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc + svcdir=${svcdir:-/var/lib/init.d} + if [[ ! -d ${ROOT}${svcdir}/started ]] ; then + ewarn "No state found, and no state exists" + elog "You should reboot this host" + else + mkdir -p "${ROOT}${LIBDIR}/rc/init.d" + einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d" + mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d + rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \ + "${ROOT}${LIBDIR}"/rc/init.d/console + umount "${ROOT}${svcdir}" 2>/dev/null + rm -rf "${ROOT}${svcdir}" + fi + ) + fi + + # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" + rm -f "${ROOT}"/etc/modules.autoload.d/.keep* + rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + local f v + for f in "${ROOT}"/etc/modules.autoload.d/* ; do + v=${f##*/} + v=${v#kernel-} + v=${v//[^[:alnum:]]/_} + gawk -v v="${v}" -v f="${f##*/}" ' + BEGIN { print "\n### START: Auto-converted from " f "\n" } + { + if ($0 ~ /^[^#]/) { + print "modules_" v "=\"${modules_" v "} " $1 "\"" + gsub(/[^[:alnum:]]/, "_", $1) + printf "module_" $1 "_args_" v "=\"" + for (i = 2; i <= NF; ++i) { + if (i > 2) + printf " " + printf $i + } + print "\"\n" + } else + print + } + END { print "\n### END: Auto-converted from " f "\n" } + ' "${f}" >> "${D}"/etc/conf.d/modules + done + rm -f "${f}" + rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null + fi + fi +} + +pkg_postinst() { + # Remove old baselayout links + rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin} + + [[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net + + # Make our runlevels if they don't exist + if [[ ! -e ${ROOT}/etc/runlevels ]] ; then + einfo "Copying across default runlevels" + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc + else + if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then + mkdir -p "${ROOT}"/etc/runlevels/sysinit + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \ + "${ROOT}"/etc/runlevels/sysinit + fi + if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then + mkdir -p "${ROOT}"/etc/runlevels/shutdown + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \ + "${ROOT}"/etc/runlevels/shutdown + fi + fi + + if [[ "$enable_udev" = 1 ]]; then + elog "Auto adding udev init script to the sysinit runlevel" + ln -sf /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev + fi + + # update the dependency tree bug #224171 + [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u + + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + ewarn "/etc/modules.autoload.d is no longer used. Please convert" + ewarn "your files to /etc/conf.d/modules and delete the directory." + fi + + elog "You should now update all files in /etc, using etc-update" + elog "or equivalent before restarting any services or this host." + elog + elog "Please read the migration guide available at:" + elog "http://www.gentoo.org/doc/en/openrc-migration.xml" +} diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild new file mode 100644 index 0000000..61646ab --- /dev/null +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -0,0 +1,309 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.43 2008/12/31 21:31:40 cardoe Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + ESVN_REPO_URI="svn://roy.marples.name/openrc/trunk" + inherit subversion +else + SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2 + mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2 + http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" +fi + +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" +HOMEPAGE="http://roy.marples.name/openrc" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="" +IUSE="debug elibc_glibc ncurses pam unicode kernel_linux kernel_FreeBSD" + +RDEPEND="virtual/init + kernel_FreeBSD? ( sys-process/fuser-bsd ) + elibc_glibc? ( >=sys-libs/glibc-2.5 ) + ncurses? ( sys-libs/ncurses ) + pam? ( virtual/pam ) + >=sys-apps/baselayout-2.0.0 + kernel_linux? ( !<sys-apps/module-init-tools-3.2.2-r2 ) + !<sys-fs/udev-133 + !<sys-apps/sysvinit-2.86-r11" +DEPEND="${RDEPEND} + virtual/os-headers" + +pkg_setup() { + LIBDIR="lib" + [ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}") + + MAKE_ARGS="${MAKE_ARGS} LIBNAME=${LIBDIR}" + + local brand="Unknown" + if use kernel_linux ; then + MAKE_ARGS="${MAKE_ARGS} OS=Linux" + brand="Linux" + elif use kernel_FreeBSD ; then + MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" + brand="FreeBSD" + fi + export BRANDING="Gentoo ${brand}" + + export DEBUG=$(usev debug) + export MKPAM=$(usev pam) + export MKTERMCAP=$(usev ncurses) +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + subversion_src_unpack + else + unpack ${A} + fi + cd "${S}" + epatch "${FILESDIR}"/9999/*.patch +} + +src_compile() { + # catch people running `ebuild` w/out setup + if [[ -z ${MAKE_ARGS} ]] ; then + die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?" + fi + + if [[ ${PV} == "9999" ]] ; then + local ver="-svn-$(cd "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}"; LC_ALL=C svn info|awk '/Revision/ { print $2 }')" + sed -i "/^SVNVER[[:space:]]*=/s:=.*:=${ver}:" src/rc/Makefile + fi + + tc-export CC AR RANLIB + echo emake ${MAKE_ARGS} + emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed" +} + +src_install() { + emake ${MAKE_ARGS} DESTDIR="${D}" install || die "make install failed" + gen_usr_ldscript libeinfo.so + gen_usr_ldscript librc.so + + keepdir /"${LIBDIR}"/rc/init.d + keepdir /"${LIBDIR}"/rc/tmp + + # Backup our default runlevels + dodir /usr/share/"${PN}" + mv "${D}/etc/runlevels" "${D}/usr/share/${PN}" + + # Setup unicode defaults for silly unicode users + use unicode && sed -i -e '/^unicode=/s:NO:YES:' "${D}"/etc/rc.conf + + # Cater to the norm + (use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps +} + +add_boot_init() { + local initd=$1 + # if the initscript is not going to be installed and is not + # currently installed, return + [[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \ + || return + [[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return + elog "Auto-adding '${initd}' service to your boot runlevel" + ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd} +} +add_boot_init_mit_config() { + local config=$1 initd=$2 + if [[ -e ${ROOT}${config} ]] ; then + if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then + add_boot_init ${initd} + fi + fi +} + +pkg_preinst() { + local f + + # default net script is just comments, so no point in biting people + # in the ass by accident + mv "${D}"/etc/conf.d/net "${T}"/ + [[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/ + + # upgrade timezone file ... do it before moving clock + if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then + ( + source "${ROOT}"/etc/conf.d/clock + [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone + ) + fi + + # /etc/conf.d/clock moved to /etc/conf.d/hwclock + local clock + use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" + if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then + mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock} + fi + if [[ -e ${ROOT}/etc/init.d/clock ]] ; then + rm -f "${ROOT}"/etc/init.d/clock + fi + if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then + rm -f "${ROOT}"/etc/runlevels/boot/clock + ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock} + fi + if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then + rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock + ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock} + fi + + # /etc/conf.d/rc is no longer used for configuration + if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then + elog "/etc/conf.d/rc is no longer used for configuration." + elog "Please migrate your settings to /etc/rc.conf as applicable" + elog "and delete /etc/conf.d/rc" + fi + + # force net init.d scripts into symlinks + for f in "${ROOT}"/etc/init.d/net.* ; do + [[ -e ${f} ]] || continue # catch net.* not matching anything + [[ ${f} == */net.lo ]] && continue # real file now + [[ ${f} == *.openrc.bak ]] && continue + if [[ ! -L ${f} ]] ; then + elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." + elog "You should delete '${f##*/}.openrc.bak' if you don't need it." + mv "${f}" "${f}.openrc.bak" + ln -snf net.lo "${f}" + fi + done + + # openrc-0.4.0 no longer loads the udev addon + enable_udev=0 + if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \ + [[ -e "${ROOT}"/etc/init.d/udev ]] && \ + ! has_version ">=sys-apps/openrc-0.4.0" + then + # make sure udev is in sysinit if it was enabled before + local rc_devices=$( + [[ -f /etc/rc.conf ]] && source /etc/rc.conf + [[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc + echo "${rc_devices:-${RC_DEVICES:-auto}}" + ) + case ${rc_devices} in + udev|auto) + enable_udev=1 + ;; + esac + fi + + # skip remaining migration if we already have openrc installed + has_version sys-apps/openrc && return 0 + + # baselayout boot init scripts have been split out + for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do + add_boot_init ${f} + done + + # Try to auto-add some addons when possible + add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt + add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt + add_boot_init_mit_config /etc/mdadm.conf mdraid + add_boot_init_mit_config /etc/evms.conf evms + [[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper + [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm + elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" + elog "init.d scripts. If you use such a thing, make sure you have the" + elog "required init.d scripts added to your boot runlevel." + + # Upgrade out state for baselayout-1 users + if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then + ( + [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc + svcdir=${svcdir:-/var/lib/init.d} + if [[ ! -d ${ROOT}${svcdir}/started ]] ; then + ewarn "No state found, and no state exists" + elog "You should reboot this host" + else + mkdir -p "${ROOT}${LIBDIR}/rc/init.d" + einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d" + mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d + rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \ + "${ROOT}${LIBDIR}"/rc/init.d/console + umount "${ROOT}${svcdir}" 2>/dev/null + rm -rf "${ROOT}${svcdir}" + fi + ) + fi + + # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" + rm -f "${ROOT}"/etc/modules.autoload.d/.keep* + rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + local f v + for f in "${ROOT}"/etc/modules.autoload.d/* ; do + v=${f##*/} + v=${v#kernel-} + v=${v//[^[:alnum:]]/_} + gawk -v v="${v}" -v f="${f##*/}" ' + BEGIN { print "\n### START: Auto-converted from " f "\n" } + { + if ($0 ~ /^[^#]/) { + print "modules_" v "=\"${modules_" v "} " $1 "\"" + gsub(/[^[:alnum:]]/, "_", $1) + printf "module_" $1 "_args_" v "=\"" + for (i = 2; i <= NF; ++i) { + if (i > 2) + printf " " + printf $i + } + print "\"\n" + } else + print + } + END { print "\n### END: Auto-converted from " f "\n" } + ' "${f}" >> "${D}"/etc/conf.d/modules + done + rm -f "${f}" + rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null + fi + fi +} + +pkg_postinst() { + # Remove old baselayout links + rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin} + + [[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net + + # Make our runlevels if they don't exist + if [[ ! -e ${ROOT}/etc/runlevels ]] ; then + einfo "Copying across default runlevels" + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc + else + if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then + mkdir -p "${ROOT}"/etc/runlevels/sysinit + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* "${ROOT}"/etc/runlevels/sysinit + fi + if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then + mkdir -p "${ROOT}"/etc/runlevels/shutdown + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* "${ROOT}"/etc/runlevels/shutdown + fi + fi + + if [[ "$enable_udev" = 1 ]]; then + elog "Auto adding udev init script to the sysinit runlevel" + ln -sf /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev + fi + + # update the dependency tree bug #224171 + [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u + + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + ewarn "/etc/modules.autoload.d is no longer used. Please convert" + ewarn "your files to /etc/conf.d/modules and delete the directory." + fi + + elog "You should now update all files in /etc, using etc-update" + elog "or equivalent before restarting any services or this host." + elog + elog "Please read the migration guide available at:" + elog "http://www.gentoo.org/doc/en/openrc-migration.xml" +} diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 82b855e..4f9d1d9 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,6 +1,8 @@ AUX 1.4-fix-kdrive-automake.patch 382 RMD160 78062824a416a2b452866d50592cc71bf34b13be SHA1 f21a54aed8eae1e718f2f0c262c37c36ccccd152 SHA256 126b67332c902802da506970acf253030004e4f7e17b3b6d2e68dd6b7bb0db81 AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237 AUX 1.5.3-fix-cross-pthread.patch 2170 RMD160 58054e1ddd3f0c93566ab61b7357b239091d3df7 SHA1 734061af22c868ce141525785f1fc8f9722ec725 SHA256 cc77562dcbdec99d002250f7d8cc8c6c40e271868128b98f2276615bbfd128ce -DIST xorg-server-1.5.3-gentoo-patches-07.tar.bz2 56276 RMD160 97afcb579d9ee10f4b2c715538557faa5d5f0eb6 SHA1 b48ea89f36e53062c4b903e613da48791bc36f64 SHA256 b80b45acb18068e7b4516cb58253f4cf1cd505f4d1a1b0b1c53e22ec7c12315b +DIST xorg-server-1.5.3-gentoo-patches-04.tar.bz2 44334 RMD160 d609ca8140593affbc2ca8ae8e9fc640ab08c3b0 SHA1 59678ba248b914d4c18a7d9ed0dea40f1fdc416d SHA256 63345edf778c810e8b731f8348a667ed0c734e75ee8f1609bc43807f18352c61 +DIST xorg-server-1.5.3-gentoo-patches-06.tar.bz2 55438 RMD160 a6ef6cf863df995917cc79795bb2b5410a4a1fff SHA1 ae95fadab882810447a4a0de9c4edc13bbd6b6f7 SHA256 f9a81dee7cee9aeb05bb400a5eb0d4ac7413bcd84ce24f3c6e9f0d9d438f5ae6 DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb -EBUILD xorg-server-1.5.3-r5.ebuild 16713 RMD160 8f8c77fc832ca1a393e08e26bba30ab45d9ba0ea SHA1 badf776677792d32b11d8fdf1cc99d6865830e54 SHA256 2affd88cfbc200312c0db5fe666796414853a51eef35eec5db1a1124e116efdb +EBUILD xorg-server-1.5.3-r2.ebuild 16654 RMD160 3d146000e971ae77fbdfb972132f68b02273ecd2 SHA1 369437fa0893fec0bea429d15f7bea14f733e88f SHA256 8a76398d233e59bacdf5f987a08a117d3ba59eb093d162a2a83f1bacbe7d36bd +EBUILD xorg-server-1.5.3-r4.ebuild 16716 RMD160 7020d76f602002fda83a9762b80c18ddcbe2c029 SHA1 22c75aeb1aa8707532b1436167d326a8a28bf92b SHA256 8a23ac615e79f355188a77534b5542a6ff2215df6e0cd21f211552ccf5a92cd0 diff --git a/x11-base/xorg-server/xorg-server-1.5.3-r2.ebuild b/x11-base/xorg-server/xorg-server-1.5.3-r2.ebuild new file mode 100644 index 0000000..a581f69 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.5.3-r2.ebuild @@ -0,0 +1,544 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r2.ebuild,v 1.4 2009/03/02 14:10:35 pva Exp $ + +# Must be before x-modular eclass is inherited +SNAPSHOT="yes" + +inherit x-modular multilib + +OPENGL_DIR="xorg-x11" + +SRC_URI="${SRC_URI} + http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2 + mirror://gentoo/${P}-gentoo-patches-04.tar.bz2" +DESCRIPTION="X.Org X servers" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE_INPUT_DEVICES=" + input_devices_acecad + input_devices_aiptek + input_devices_calcomp + input_devices_citron + input_devices_digitaledge + input_devices_dmc + input_devices_dynapro + input_devices_elo2300 + input_devices_elographics + input_devices_evdev + input_devices_fpit + input_devices_hyperpen + input_devices_jamstudio + input_devices_joystick + input_devices_keyboard + input_devices_magellan + input_devices_microtouch + input_devices_mouse + input_devices_mutouch + input_devices_palmax + input_devices_penmount + input_devices_spaceorb + input_devices_summa + input_devices_tek4957 + input_devices_tslib + input_devices_ur98 + input_devices_vmmouse + input_devices_void + + input_devices_synaptics + input_devices_wacom" +IUSE_VIDEO_CARDS=" + video_cards_apm + video_cards_ark + video_cards_ast + video_cards_chips + video_cards_cirrus + video_cards_cyrix + video_cards_dummy + video_cards_epson + video_cards_fbdev + video_cards_geode + video_cards_glamo + video_cards_glint + video_cards_i128 + video_cards_i740 + video_cards_intel + video_cards_impact + video_cards_imstt + video_cards_mach64 + video_cards_mga + video_cards_neomagic + video_cards_newport + video_cards_nsc + video_cards_nv + video_cards_r128 + video_cards_radeon + video_cards_radeonhd + video_cards_rendition + video_cards_s3 + video_cards_s3virge + video_cards_savage + video_cards_siliconmotion + video_cards_sis + video_cards_sisusb + video_cards_sunbw2 + video_cards_suncg14 + video_cards_suncg3 + video_cards_suncg6 + video_cards_sunffb + video_cards_sunleo + video_cards_suntcx + video_cards_tdfx + video_cards_tga + video_cards_trident + video_cards_tseng + video_cards_v4l + video_cards_vermilion + video_cards_vesa + video_cards_vga + video_cards_via + video_cards_vmware + video_cards_voodoo + video_cards_xgi + video_cards_fglrx + video_cards_nvidia" +IUSE_SERVERS="dmx kdrive xorg" +IUSE="${IUSE_VIDEO_CARDS} + ${IUSE_INPUT_DEVICES} + ${IUSE_SERVERS} + 3dfx tslib + hal ipv6 minimal nptl sdl" +RDEPEND="hal? ( sys-apps/hal ) + tslib? ( x11-libs/tslib ) + >=x11-libs/libXfont-1.3.3 + >=x11-libs/xtrans-1.2.2 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXext-1.0.4 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXmu-1.0.3 + >=x11-libs/libXrender-0.9.4 + >=x11-libs/libXi-1.1.3 + >=x11-libs/pixman-0.12 + media-libs/freetype + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-1.4 + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + >=x11-apps/xinit-1.0.8-r3 + app-admin/eselect-opengl + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXpm-3.5.7 + >=x11-libs/libXxf86misc-1.0.1 + >=x11-libs/libXxf86vm-1.0.2 + >=x11-libs/libpciaccess-0.10.3 + dmx? ( >=x11-libs/libdmx-1.0.2 + >=x11-libs/libXfixes-4.0.3 ) + !minimal? ( >=x11-libs/libXtst-1.0.3 + >=x11-libs/libXres-1.0.3 + >=media-libs/mesa-7.1 + media-fonts/font-adobe-75dpi ) + >=x11-libs/libxkbui-1.0.2 + kdrive? ( sdl? ( media-libs/libsdl ) )" + # Xres is dmx-dependent, xkbui is xorgcfg-dependent + # Xaw is dmx- and xorgcfg-dependent + # Xpm is dmx- and xorgcfg-dependent, pulls in Xt + # Xxf86misc and Xxf86vm are xorgcfg-dependent +DEPEND="${RDEPEND} + !net-dialup/dtrace + sys-devel/flex + >=x11-proto/randrproto-1.2.2 + >=x11-proto/renderproto-0.9.3 + >=x11-proto/fixesproto-4 + >=x11-proto/damageproto-1.1 + >=x11-proto/xextproto-7.0.3 + >=x11-proto/xproto-7.0.13 + >=x11-proto/xf86dgaproto-2.0.3 + >=x11-proto/xf86miscproto-0.9.2 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.2 + >=x11-proto/xf86bigfontproto-1.1.2 + >=x11-proto/compositeproto-0.4 + >=x11-proto/recordproto-1.13.2 + >=x11-proto/resourceproto-1.0.2 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/scrnsaverproto-1.1.0 + >=x11-proto/evieext-1.0.2 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/xineramaproto-1.1.2 + >=x11-proto/fontsproto-2.0.2 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/inputproto-1.4.4 + >=x11-proto/bigreqsproto-1.0.2 + >=x11-proto/xcmiscproto-1.1.2 + >=x11-proto/glproto-1.4.9 + dmx? ( >=x11-proto/dmxproto-2.2.2 ) + !minimal? ( >=x11-proto/xf86driproto-2.0.4 + >=x11-libs/libdrm-2.3 )" + +# Drivers +PDEPEND=" + xorg? ( + input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.2.2 ) + input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.1.1 ) + input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.2 ) + input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 ) + input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.1 ) + input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.2 ) + input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.2 ) + input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.2 ) + input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.2 ) + input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.0 ) + input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.2.0 ) + input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 ) + input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.2.0 ) + input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.3.2 ) + input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.1 ) + input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.2.0 ) + input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.2.0 ) + input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.3.0 ) + input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.1 ) + input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.2.0 ) + input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.3.0 ) + input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 ) + input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.2.0 ) + input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.2.0 ) + input_devices_tslib? ( x11-drivers/xf86-input-tslib ) + input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 ) + input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.5.0 ) + input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.1 ) + input_devices_synaptics? ( >=x11-drivers/xf86-input-synaptics-0.15.0 ) + input_devices_wacom? ( x11-drivers/linuxwacom ) + + video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.2.0 ) + video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.7.0 ) + video_cards_ast? ( >=x11-drivers/xf86-video-ast-0.85.0 ) + video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.2.0 ) + video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.2.1 ) + video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.3.0 ) + video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.4.0 ) + video_cards_geode? ( >=x11-drivers/xf86-video-geode-2.9.0 ) + video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.1 ) + video_cards_glamo? ( x11-drivers/xf86-video-glamo ) + video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.3.1 ) + video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.2.0 ) + video_cards_intel? ( >=x11-drivers/xf86-video-intel-2.4.2-r1 ) + video_cards_mach64? ( >=x11-drivers/xf86-video-mach64-6.8.0 ) + video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.9 ) + video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.2.1 ) + video_cards_newport? ( x11-drivers/xf86-video-newport ) + video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.12 ) + video_cards_nvidia? ( x11-drivers/nvidia-drivers ) + video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.552-r2 ) + video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 ) + video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.9.0 ) + video_cards_radeonhd? ( >=x11-drivers/xf86-video-radeonhd-1.2.1 ) + video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.2.0 ) + video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.6.0 ) + video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.10.1 ) + video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.2.1 ) + video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.6.0 ) + video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.10.0 ) + video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.9.0 ) + video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.2.0 ) + video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.2.0 ) + video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.0 ) + video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.2.0 ) + video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.3.0 ) + video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.2.0 ) + video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.2.0 ) + video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-2.0.0 ) + video_cards_via? ( >=x11-drivers/xf86-video-openchrome-0.2.903 ) + video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.16.5 ) + video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.2.0 ) + video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 ) + + video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) + + !x11-drivers/xf86-video-impact + !x11-drivers/xf86-video-imstt + !x11-drivers/xf86-video-sunbw2 + !x11-drivers/xf86-video-suncg14 + !x11-drivers/xf86-video-suncg3 + !x11-drivers/xf86-video-suncg6 + !x11-drivers/xf86-video-suntcx + !x11-drivers/xf86-video-vermilion + + !x11-drivers/xf86-video-cyrix + !x11-drivers/xf86-video-nsc + !x11-drivers/xf86-video-vga + )" +LICENSE="${LICENSE} MIT" + +EPATCH_FORCE="yes" +EPATCH_SUFFIX="patch" + +# Local customizations, unsuitable for upstream +GENTOO_PATCHES=( + "${FILESDIR}/1.4-fpic-libxf86config.patch" + "${FILESDIR}/1.4-fix-kdrive-automake.patch" + ) + +# These have been sent upstream +UPSTREAMED_PATCHES=( + "${WORKDIR}/patches/" +) + +PATCHES=( + "${GENTOO_PATCHES[@]}" + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}/1.5.3-fix-cross-pthread.patch" + ) + +pkg_setup() { + use minimal || ensure_a_server_is_building + + # SDL only available in kdrive build + if use kdrive && use sdl; then + conf_opts="${conf_opts} --enable-xsdl" + else + conf_opts="${conf_opts} --disable-xsdl" + fi + + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + # --enable-install-setuid needed because sparcs default off + CONFIGURE_OPTIONS=" + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable tslib) + $(use_enable !minimal xvfb) + $(use_enable !minimal xnest) + $(use_enable !minimal xtrap) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal install-libxf86config) + $(use_enable !minimal dri) + $(use_enable !minimal glx) + $(use_enable xorg) + $(use_enable nptl glx-tls) + $(use_enable !minimal xorgcfg) + $(use_enable hal config-dbus) + $(use_enable hal config-hal) + --disable-dri2 + --sysconfdir=/etc/X11 + --localstatedir=/var + --enable-install-setuid + --with-fontdir=/usr/share/fonts + --with-xkb-output=/var/lib/xkb + ${conf_opts}" + + local diemsg="You must build xorg-server and mesa with the same nptl USE setting." + if ! use minimal; then + if built_with_use media-libs/mesa nptl; then + use nptl || die "${diemsg}" + else + use nptl && die "${diemsg}" + fi + fi + + # (#121394) Causes window corruption + filter-flags -fweb + + # Nothing else provides new enough glxtokens.h + ewarn "Forcing on xorg-x11 for new enough glxtokens.h..." + OLD_IMPLEM="$(eselect opengl show)" + eselect opengl set --impl-headers ${OPENGL_DIR} +} + +src_unpack() { + x-modular_specs_check + x-modular_dri_check + x-modular_unpack_source + x-modular_patch_source + + # Set up kdrive servers to build + if use kdrive; then + kdrive_setup + fi + + # Make sure eautoreconf gets run if we need the autoconf/make + # changes. + if [[ ${SNAPSHOT} != "yes" ]]; then + if use kdrive || use dmx; then + SNAPSHOT="yes" + fi + fi + + if use hal; then + sed -i \ + -e "s:^\(dbusconfigdir = \).*\(dbus-1.*\):\1/etc/\2:g" \ + "${S}"/config/Makefile.am \ + || die "failed to fix DBUS config directory" + SNAPSHOT="yes" + fi + + x-modular_reconf_source +} + +src_install() { + x-modular_src_install + + dynamic_libgl_install + + server_based_install + + # Install video mode files for system-config-display + insinto /usr/share/xorg + doins hw/xfree86/common/{extra,vesa}modes \ + || die "couldn't install extra modes" + + # Bug #151421 - this file is not built with USE="minimal" + # Bug #151670 - this file is also not build if USE="-xorg" + if ! use minimal && use xorg; then + # Install xorg.conf.example + insinto /etc/X11 + doins hw/xfree86/xorg.conf.example \ + || die "couldn't install xorg.conf.example" + fi +} + +pkg_postinst() { + switch_opengl_implem + + # Bug #135544 + ewarn "Users of reduced blanking now need:" + ewarn " Option \"ReducedBlanking\"" + ewarn "In the relevant Monitor section(s)." + ewarn "Make sure your reduced blanking modelines are safe!" + + echo + ewarn "You must rebuild all drivers if upgrading from xorg-server 1.4.1" + ewarn "or earlier, because the ABI changed. If you cannot start X because" + ewarn "of module version mismatch errors, this is your problem." + + echo + ewarn "You can generate a list of all installed packages in the x11-drivers" + ewarn "category using this command:" + ewarn "emerge portage-utils; qlist -I -C x11-drivers/" + + ebeep 5 + epause 10 +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if ! has_version x11-base/xorg-server; then + if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules + fi + fi +} + +kdrive_setup() { + local card real_card disable_card kdrive_fbdev kdrive_vesa + + einfo "Removing unused kdrive drivers ..." + + # Some kdrive servers require fbdev and vesa + kdrive_fbdev="radeon neomagic sis siliconmotion" + # Some kdrive servers require just vesa + kdrive_vesa="chips mach64 mga nv glint r128 via" + + for card in ${IUSE_VIDEO_CARDS}; do + real_card=${card#video_cards_} + + # Differences between VIDEO_CARDS name and kdrive server name + real_card=${real_card/glint/pm2} + real_card=${real_card/radeon/ati} + real_card=${real_card/%nv/nvidia} + real_card=${real_card/siliconmotion/smi} + real_card=${real_card/%sis/sis300} + + disable_card=0 + + # Check whether it's a valid kdrive server before we waste time + # on the rest of this + if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then + continue + fi + + if ! use ${card}; then + if use x86; then + # Some kdrive servers require fbdev and vesa + for i in ${kdrive_fbdev}; do + if use video_cards_${i}; then + if [[ ${real_card} = fbdev ]] \ + || [[ ${real_card} = vesa ]]; then + continue 2 # Don't disable + fi + fi + done + + # Some kdrive servers require just vesa + for i in ${kdrive_vesa}; do + if use video_cards_${i}; then + if [[ ${real_card} = vesa ]]; then + continue 2 # Don't disable + fi + fi + done + fi + disable_card=1 + # Bug #150052 + # fbdev is the only VIDEO_CARDS setting that works on non-x86 + elif ! use x86 \ + && [[ ${real_card} != fbdev ]]; then + ewarn " $real_card does not work on your architecture; disabling." + disable_card=1 + fi + + if [[ $disable_card = 1 ]]; then + ebegin " ${real_card}" + sed -i \ + -e "s:\b${real_card}\b::g" \ + "${S}"/hw/kdrive/Makefile.am \ + || die "sed of ${real_card} failed" + eend + fi + + done +} + +dynamic_libgl_install() { + # next section is to setup the dynamic libGL stuff + ebegin "Moving GL files for dynamic switching" + dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions + local x="" + for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do + if [ -f ${x} -o -L ${x} ]; then + mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions + fi + done + eend 0 +} + +server_based_install() { + if ! use xorg; then + rm "${D}"/usr/share/man/man1/Xserver.1x \ + "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${D}"/usr/share/man/man1/Xserver.1x + fi +} + +switch_opengl_implem() { + # Switch to the xorg implementation. + # Use new opengl-update that will not reset user selected + # OpenGL interface ... + echo +# eselect opengl set --use-old ${OPENGL_DIR} + eselect opengl set ${OLD_IMPLEM} +} + +ensure_a_server_is_building() { + for server in ${IUSE_SERVERS}; do + use ${server} && return; + done + eerror "You need to specify at least one server to build." + eerror "Valid servers are: ${IUSE_SERVERS}." + die "No servers were specified to build." +} diff --git a/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild b/x11-base/xorg-server/xorg-server-1.5.3-r4.ebuild index bea02ba..f575744 100644 --- a/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild +++ b/x11-base/xorg-server/xorg-server-1.5.3-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild,v 1.1 2009/03/16 13:22:45 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r4.ebuild,v 1.2 2009/03/12 10:43:24 armin76 Exp $ # Must be before x-modular eclass is inherited SNAPSHOT="yes" @@ -11,7 +11,7 @@ OPENGL_DIR="xorg-x11" SRC_URI="${SRC_URI} http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2 - mirror://gentoo/${P}-gentoo-patches-07.tar.bz2" + mirror://gentoo/${P}-gentoo-patches-06.tar.bz2" DESCRIPTION="X.Org X servers" KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" IUSE_INPUT_DEVICES=" diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest new file mode 100644 index 0000000..241fbd4 --- /dev/null +++ b/x11-drivers/xf86-input-evdev/Manifest @@ -0,0 +1,2 @@ +DIST xf86-input-evdev-2.1.3.tar.bz2 278213 RMD160 2886e3a9713524ae902a322b18c88b8b24b35bf9 SHA1 ea8a63aa6243e272db39aad50a993768d6c2c853 SHA256 78a1dcd0bd68b94a36f06fe8fc01389bc96868a6572515b0453e42839be9bcec +EBUILD xf86-input-evdev-2.1.3.ebuild 1091 RMD160 11438ffe822f7c23ddac71285f116e597d200e11 SHA1 cb3d09abc3e9774d7ea595f20216667d8021f98b SHA256 ad55fa6a2a06468fe4b0555ef56754388241621d395bd1695f1d5d27d64d102f diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.1.3.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.1.3.ebuild new file mode 100644 index 0000000..b84cd57 --- /dev/null +++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.1.3.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.1.3.ebuild,v 1.1 2009/02/26 07:51:28 dberkholz Exp $ + +# Must be before x-modular eclass is inherited +#SNAPSHOT="yes" + +inherit x-modular + +DESCRIPTION="Generic Linux input driver" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="hal" +RDEPEND=">=x11-base/xorg-server-1.5.3 + hal? ( >=sys-apps/hal-0.5.10 )" +DEPEND="${RDEPEND} + || ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 ) + >=x11-proto/inputproto-1.4 + x11-proto/randrproto + x11-proto/xproto" + +pkg_postinst() { + x-modular_pkg_postinst + pkg_info +} + +pkg_info() { + if use hal; then + elog "If your XKB (keyboard settings) stopped working," + elog "you may uninstall this driver or move your XKB configuration." + elog "Download an example from http://dev.gentoo.org/~compnerd/temp/hal-config-examples/" + elog "(these will be installed with sys-apps/hal soon)," + elog "and drop it into /etc/hal/fdi/policy/" + fi +} diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest new file mode 100644 index 0000000..6eba5c8 --- /dev/null +++ b/x11-libs/libpciaccess/Manifest @@ -0,0 +1,2 @@ +DIST libpciaccess-0.10.5.tar.bz2 260817 RMD160 313d30e03185a23d9c9464d0b8876719ec5e52d3 SHA1 b15e1ca761eb295c0469f5a5b6e618446d1f66d4 SHA256 b6c5765a3994e59053cb3b46741b858bb56ea868baa5c48fba7e5c36ca4ae95d +EBUILD libpciaccess-0.10.5.ebuild 687 RMD160 e9ffc81f0e841f36bf083b2654191c9734c25017 SHA1 bf99c0e2d8014ed8da3268aecee157bcfda4dc7d SHA256 08cfc1fe1d3253f9f70986b9dc06acd6079e3ef2507d0c42317d8b95553a6f02 diff --git a/x11-libs/libpciaccess/libpciaccess-0.10.5.ebuild b/x11-libs/libpciaccess/libpciaccess-0.10.5.ebuild new file mode 100644 index 0000000..7dcc5b0 --- /dev/null +++ b/x11-libs/libpciaccess/libpciaccess-0.10.5.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.10.5.ebuild,v 1.3 2009/02/23 19:41:11 kumba Exp $ + +# Must be before x-modular eclass is inherited +#SNAPSHOT="yes" + +inherit x-modular + +DESCRIPTION="Library providing generic access to the PCI bus and devices" +LICENSE="MIT" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="minimal" + +DEPEND="!<x11-base/xorg-server-1.5" + +CONFIGURE_OPTIONS="--with-pciids-path=/usr/share/misc" + +src_install() { + x-modular_src_install + if ! use minimal; then + dobin src/.libs/scanpci || die + fi +} |