diff options
| author |   Robert Piasek <dagger@gentoo.org> | 2009-01-09 16:17:04 +0000 |
|---|---|---|
| committer | Robert Piasek <dagger@gentoo.org> | 2009-01-09 16:17:04 +0000 |
| commit | 6148701714b9d10fc51cf9eb503673f84b767bc0 (patch) | |
| tree | 66518c473a10185bae8de12afa08601d144b158a | |
| parent | Tesing svn access (diff) | |
| download | embedded-cross-6148701714b9d10fc51cf9eb503673f84b767bc0.tar.gz embedded-cross-6148701714b9d10fc51cf9eb503673f84b767bc0.tar.bz2 embedded-cross-6148701714b9d10fc51cf9eb503673f84b767bc0.zip | |
Initial upload of openmoko-target
262 files changed, 18558 insertions, 33 deletions
diff --git a/app-admin/metalog/ChangeLog b/app-admin/metalog/ChangeLog new file mode 100644 index 0000000..89d8749 --- /dev/null +++ b/app-admin/metalog/ChangeLog @@ -0,0 +1,294 @@ +# ChangeLog for app-admin/metalog +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.81 2008/06/08 20:18:01 vapier Exp $ + + 08 Jun 2008; Mike Frysinger <vapier@gentoo.org> files/consolelog.sh: + Dont use "source" keyword #225317 by Martin Väth. + + 24 Apr 2008; <ricmm@gentoo.org> metalog-0.8-r1.ebuild: + Drop to ~mips due to unstable deps + +*metalog-0.8-r1 (10 Jul 2007) + + 10 Jul 2007; Mike Frysinger <vapier@gentoo.org> files/metalog.conf, + +metalog-0.8-r1.ebuild: + Fix consolelog.sh install #177424 by Pim Dennendal. + + 21 Jun 2007; Joshua Kinard <kumba@gentoo.org> metalog-0.8.ebuild: + Stable on mips, per #181622. + + 14 Jun 2007; Raúl Porcel <armin76@gentoo.org> metalog-0.8.ebuild: + alpha stable wrt #181622 + + 14 Jun 2007; Christoph Mende <angelos@gentoo.org> metalog-0.8.ebuild: + Stable on amd64 wrt bug 181622 + + 12 Jun 2007; Markus Ullmann <jokey@gentoo.org> metalog-0.8.ebuild: + Stable on x86 wrt bug #181622 + + 11 Jun 2007; Markus Rothe <corsair@gentoo.org> metalog-0.8.ebuild: + Stable on ppc64; bug #181622 + + 11 Jun 2007; nixnut <nixnut@gentoo.org> metalog-0.8.ebuild: + Stable on ppc wrt bug 181622 + + 11 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org> metalog-0.8.ebuild: + Stable on sparc wrt #181622 + + 11 Jun 2007; Jeroen Roovers <jer@gentoo.org> metalog-0.8.ebuild: + Stable for HPPA (bug #181622). + + 11 Jun 2007; Joshua Kinard <kumba@gentoo.org> ChangeLog: + Stable on mips, per #181622. + + 07 Jun 2007; Christian Faulhammer <opfer@gentoo.org> ChangeLog: + modified ChangeLog to meet common standards + +*metalog-0.8 (06 May 2007) + + 06 May 2007; Mike Frysinger <vapier@gentoo.org> +metalog-0.8.ebuild: + Version bump. + + 23 Apr 2007; Bryan Østergaard <kloeri@gentoo.org> metalog-0.8_rc4.ebuild: + Stable on Mips, bug 173601. + + 11 Apr 2007; Jeroen Roovers <jer@gentoo.org> metalog-0.8_rc4.ebuild: + Stable for HPPA (bug #173601). + + 10 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> + metalog-0.8_rc4.ebuild: + Stable on sparc wrt #173601 + + 08 Apr 2007; Peter Weller <welp@gentoo.org> metalog-0.8_rc4.ebuild: + Stable on amd64 wrt bug 173601 + + 08 Apr 2007; Markus Rothe <corsair@gentoo.org> metalog-0.8_rc4.ebuild: + Stable on ppc64; bug #173601 + + 07 Apr 2007; Joseph Jezak <josejx@gentoo.org> metalog-0.8_rc4.ebuild: + Marked ppc stable for bug #173601. + + 07 Apr 2007; Christian Faulhammer <opfer@gentoo.org> + metalog-0.8_rc4.ebuild: + stable x86, bug 173601 + + 19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml: + Remove ka0ttic from metadata.xml due to retirement. + + 23 Feb 2007; Roy Marples <uberlord@gentoo.org> files/metalog.initd: + Use start-stop-daemon correctly. + +*metalog-0.8_rc4 (13 Feb 2007) + + 13 Feb 2007; Mike Frysinger <vapier@gentoo.org> +metalog-0.8_rc4.ebuild: + Version bump. + +*metalog-0.8_rc3 (08 Feb 2007) + + 08 Feb 2007; Mike Frysinger <vapier@gentoo.org> +metalog-0.8_rc3.ebuild: + Version bump. + +*metalog-0.8_rc2 (28 Jan 2007) + + 28 Jan 2007; Mike Frysinger <vapier@gentoo.org> +metalog-0.8_rc2.ebuild: + Version bump. + + 27 Jan 2007; Roy Marples <uberlord@gentoo.org> files/metalog.initd: + init script now depends on localmount and bootmisc so that it starts + correctly when coming back from single user mode, #163993. + + 30 Dec 2006; Mike Frysinger <vapier@gentoo.org> files/metalog.conf: + Pull updates from upstream metalog.conf and improve our own sections #132794. + + 22 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + metalog-0.8_rc1-r2.ebuild: + Add ~sparc-fbsd keyword. + + 14 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/metalog-0.8_rc1-gcc41.patch, metalog-0.8_rc1-r2.ebuild: + Add patch for Gentoo/FreeBSD compatibility. Bug #147320. + + 27 Apr 2006; Marien Zwart <marienz@gentoo.org> + files/digest-metalog-0.7-r1, files/digest-metalog-0.8_pre20031130, + files/digest-metalog-0.8_rc1, files/digest-metalog-0.8_rc1-r1, + files/digest-metalog-0.8_rc1-r2, Manifest: + Fixing SHA256 digest for real, pass three... + + 27 Apr 2006; Marien Zwart <marienz@gentoo.org> + files/digest-metalog-0.7-r1, files/digest-metalog-0.8_pre20031130, + files/digest-metalog-0.8_rc1, files/digest-metalog-0.8_rc1-r1, + files/digest-metalog-0.8_rc1-r2, Manifest: + Fixing SHA256 digest, pass two. + + 29 Apr 2006; Joshua Kinard <kumba@gentoo.org> metalog-0.8_rc1-r2.ebuild: + Marked stable on mips. + + 23 Apr 2006; Thomas Cort <tcort@gentoo.org> metalog-0.8_rc1-r2.ebuild: + Stable on alpha wrt Bug #130221. + + 19 Apr 2006; Jason Wever <weeve@gentoo.org> metalog-0.8_rc1-r2.ebuild: + Stable on SPARC wrt bug #130221. + + 18 Apr 2006; Joshua Jackson <tsunam@gentoo.org> metalog-0.8_rc1-r2.ebuild: + Stable on x86; bug #130221 + + 17 Apr 2006; Patrick McLean <chutzpah@gentoo.org> + metalog-0.8_rc1-r2.ebuild: + Stable on amd64 (bug 130221). + + 17 Apr 2006; Markus Rothe <corsair@gentoo.org> metalog-0.8_rc1-r2.ebuild: + Stable on ppc64; bug #130221 + + 17 Apr 2006; Tobias Scherbaum <dertobi123@gentoo.org> + metalog-0.8_rc1-r2.ebuild: + ppc stable, bug #130221 + + 02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> + metalog-0.8_rc1-r2.ebuild: + Add ~x86-fbsd keyword. + +*metalog-0.8_rc1-r2 (08 Feb 2006) + + 08 Feb 2006; Mike Frysinger <vapier@gentoo.org> files/consolelog.sh, + files/metalog.conf, files/metalog.confd, +metalog-0.8_rc1-r2.ebuild: + Allow people to control consolelog.sh from the conf.d file as that is under + CONFIG_PROTECT and get rid of all the magic voodoo which just screws up + packages (see #96038 by Martin von Gagern and #113359 by Daniel). + + 03 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> + metalog-0.8_pre20031130.ebuild: + Stable on sh. + +*metalog-0.8_rc1-r1 (15 Mar 2005) + + 15 Mar 2005; Mike Frysinger <vapier@gentoo.org> + +metalog-0.8_rc1-r1.ebuild: + Move metalog.conf to plain old /etc/. + +*metalog-0.8_rc1 (02 Feb 2005) + + 02 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> +metadata.xml, + +metalog-0.8_rc1.ebuild: + Back from the dead, a new upstream release. Closes bug 80042. + + 26 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> + metalog-0.8_pre20031130.ebuild: + Marked stable on amd64. + + 10 May 2004; Michael McCabe <randy@gentoo.org> metalog-0.7-r1.ebuild: + Added s390 keywords + + 25 Apr 2004; Aron Griffis <agriffis@gentoo.org> metalog-0.7-r1.ebuild, + metalog-0.8_pre20031130.ebuild: + Add die following econf + + 20 Apr 2004; Daniel Black <dragonheart@gentoo.org> + metalog-0.8_pre20031130.ebuild: + QA - removed runtime dependance on automake + + 15 Mar 2004; Joshua Kinard <kumba@gentoo.org> + metalog-0.8_pre20031130.ebuild: + Marked stable on mips. + + 09 Mar 2004; <agriffis@gentoo.org> metalog-0.8_pre20031130.ebuild: + stable on alpha and ia64 + + 24 Feb 2004; Guy Martin <gmsoft@gentoo.org> metalog-0.8_pre20031130.ebuild: + Marked stable on hppa. + + 23 Feb 2004; Jason Wever <weeve@gentoo.org> metalog-0.8_pre20031130.ebuild: + Stable on sparc. + + 22 Feb 2004; Heinrich Wendel <lanius@gentoo.org> + metalog-0.8_pre20031130.ebuild: + mark stable on x86 + + 12 Jan 2004; Aron Griffis <agriffis@gentoo.org> metalog-0.7-r1.ebuild: + stable on alpha + + 08 Dec 2003; Jason Wever <weeve@gentoo.org> metalog-0.7-r1.ebuild: + Marked stable on sparc. + + 01 Dec 2003; Heinrich Wendel <lanius@gentoo.org> + metalog-0.8_pre20031130.ebuild: + fixed automake line + +*metalog-0.8_pre20031130 (30 Nov 2003) + + 30 Nov 2003; Heinrich Wendel <lanius@gentoo.org> metalog-0.8_pre20031130.ebuild: + added current cvs version to fix bug #8607 + + 04 Nov 2003; Brad House <brad_mssw@gentoo.org> metalog-0.7-r1.ebuild: + make amd64 stable + + 31 Oct 2003; Chris PeBenito <pebenito@gentoo.org> metalog-0.7-r1.ebuild: + Mark stable on x86 and ppc. + + 16 Oct 2003; Chris PeBenito <pebenito@gentoo.org> files/metalog.conf: + Change crond logging from program to facility to close out old bug #11009. + +*metalog-0.7-r1 (17 Sep 2003) + + 05 Nov 2003; Guy Martin <gmsoft@gentoo.org> metalog-0.7-r1.ebuild : + Marked stable on hppa. + + 30 Sep 2003; Joshua Kinard <kumba@gentoo.org> metalog-0.7-r1.ebuild: + Changed ~mips to mips in KEYWORDS + + 17 Sep 2003; Seemant Kulleen <seemant@gentoo.org> metalog-0.6-r11.ebuild, + metalog-0.7-r1.ebuild: + version bump to provide virtual/logger + +*metalog-0.7 (12 Jun 2003) + + 12 Jun 2003; Chris PeBenito <pebenito@gentoo.org> metalog-0.7.ebuild, + files/metalog.confd: + New upstream version. The default behavior has changed. Buffering is now off + by default. Add -a to METALOG_OPTS in /etc/conf.d/metalog to turn it back on. + + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords + +*metalog-0.6-r11 (17 Sep 2003) + +*metalog-0.6-r10 (15 Jul 2002) + + 21 Mar 2003; Guy Martin <gmsoft@gentoo.org> : + Added hppa to KEYWORDS. + + 14 Mar 2003; Jan Seidel <tuxus@gentoo.org> : + Added mips to KEYWORDS + + 10 Dec 2002; Will Woods <wwoods@gentoo.org> : + Added alpha to KEYWORDS. + + 12 Oct 2002; Donny Davies <woodchip@gentoo.org> : + Small fix for #8885. + + 26 Jul 2002; Calum Selkirk <cselkirk@gentoo.org metalog-0.6-r10.ebuild : + Added ppc to KEYWORDS. Added RDEPEND + + 15 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog : + Hack man page to point to /etc/metalog/metalog.conf + + 24 Apr 2002; Thilo Bangert <bangert@gentoo.org> files/metalog.conf : + initial release - added examples on how to use the consolelog.sh script from LFS + + 24 Apr 2002; Thilo Bangert <bangert@gentoo.org> files/consolelog.sh : + initial release + + 24 Apr 2002; Thilo Bangert <bangert@gentoo.org> matalog-0.6-r9.ebuild : + added consolelog.sh - script to be able to log to a console - from LFS + +*metalog-0.6-r9 (11 Mar 2002) + + 11 Mar 2002; M.Schlemmer <azarah@gentoo.org> : + Update rc-script to provide "logger". + +*metalog-0.6-r8 (1 Feb 2002) + + 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest new file mode 100644 index 0000000..fc950a0 --- /dev/null +++ b/app-admin/metalog/Manifest @@ -0,0 +1,9 @@ +AUX consolelog.sh 269 RMD160 27246643ed2212960ee434996f3750d2f70552d6 SHA1 73f413949b6cf34442187e839b83c815ce02b1fb SHA256 b076ed8329052c8ec6d61722c15c589dbf53487cc3e7dbc0c54af6965c54048e +AUX metalog-0.8-crosscompile.patch 375 RMD160 7821b7201e3df2c9994b90d6cc24ebd6dae167ab SHA1 1631fcc8046735de1a4fe4c5f47b3d9ff78cb613 SHA256 210bc5395a43bcb9c696ca8a584d9309f870a4b10ee01e75dcbb6482d613aaf5 +AUX metalog.conf 2716 RMD160 4f2bdc2a4de05bac5f74e6615aceece661d54906 SHA1 96e27461ea23c911b57514d81e41cee45ee7dfd3 SHA256 4fc6acdc313184b7e0240b93fb1caf11e4f6172b5be1cdb010ae15c0f86f0fcf +AUX metalog.confd 505 RMD160 f575216debd3b6a0461f17a9c23657426b8b97e5 SHA1 84031ea9a673aa87edbc0088a51d86809007a69c SHA256 ec9f05b386a06a4b2d5398cc0c33f34eba3f5e74ad46ae203d682f8ebc593f99 +AUX metalog.initd 1029 RMD160 4c609ae69daa3acb32f6081653ba23f97f3e63d9 SHA1 a8d7d4a0ee33b0b02b7120c5c86bdef084ff419d SHA256 9801ae4046321740980798c40dd5b19bc015ab7f1f68b1066b5f0ecd3338a0df +DIST metalog-0.8.tar.bz2 105471 RMD160 6a941d76e568934cc4afcc26f3f8295e9ed2b4e1 SHA1 e0f4a25ef2cbc3be91b4cafe2d614feda6b1e582 SHA256 d264742ec0d379385e80d231d3ac3cc591a1d5282c677cf80ac2fd6cd9ae078b +EBUILD metalog-0.8-r1.ebuild 1517 RMD160 a0f0a4407a66e354b1ffd415d0726c72d5d0e5ed SHA1 2230d4f012a4a07290b17b55572b94d9a39230a4 SHA256 0777e7b3fc7a2c001bbcb28aaf9d826fe7d6025bca95446f9f284920ea499c8f +MISC ChangeLog 10105 RMD160 253cf56604a7b72364adcb15bc4e739ffa7c06fd SHA1 f1d09f922be250404ae3b5b700af2376a9b4008e SHA256 568841a5a7d712e078490f1e6e12c7dda14a75d5c1307f0f43c50139888ab9f0 +MISC metadata.xml 225 RMD160 c09b983b2a71ef5738567b899ab087ff80d63ca1 SHA1 e384e99e2d9d8b4dd3ce54f8e857268cbe352c5e SHA256 8c13ed9cb8e178d0e1af782bee862350146dc46765dedd79e6f531211ef52a68 diff --git a/app-admin/metalog/files/consolelog.sh b/app-admin/metalog/files/consolelog.sh new file mode 100644 index 0000000..90fb38e --- /dev/null +++ b/app-admin/metalog/files/consolelog.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# consolelog.sh +# For metalog -- log to a console + +set -f + +. /etc/conf.d/metalog +if [ -z "${CONSOLE}" ] ; then + CONSOLE="/dev/console" +fi + +if [ -z "${FORMAT}" ] ; then + FORMAT='$1 [$2] $3' +fi + +for d in ${CONSOLE} ; do + eval echo ${FORMAT} > ${d} +done + +exit 0 diff --git a/app-admin/metalog/files/metalog-0.8-crosscompile.patch b/app-admin/metalog/files/metalog-0.8-crosscompile.patch new file mode 100644 index 0000000..76afe8a --- /dev/null +++ b/app-admin/metalog/files/metalog-0.8-crosscompile.patch @@ -0,0 +1,11 @@ +--- configure.orig 2008-09-14 17:18:44.000000000 +0200 ++++ configure 2008-09-14 17:19:47.000000000 +0200 +@@ -9133,7 +9133,7 @@ + See \`config.log' for more details." >&5 + echo "$as_me: error: cannot run test program while cross compiling + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ diff --git a/app-admin/metalog/files/metalog.conf b/app-admin/metalog/files/metalog.conf new file mode 100644 index 0000000..68ee5bb --- /dev/null +++ b/app-admin/metalog/files/metalog.conf @@ -0,0 +1,136 @@ +# Sample Metalog configuration file + +maxsize = 1048576 # size in bytes +maxtime = 86400 # time in seconds (86400 = 1 day) +maxfiles = 5 # num files per dir + +# This will capture all of the internal log messages that metalog itself +# generates. If you use any "command" options below, you will want this +# as metalog generates a lot of status messages whenever it executes a +# command and children processes exit. +#Metalog : +# +# program = "metalog" +# logdir = "/var/log/metalog" +# break = 1 + +# Uncomment and adjust the following lines according to your console logging +# needs. If you want to only output things that were not caught by other log +# sections, move this to the end of the file. +# +# Hint: you can change the log console in /etc/conf.d/metalog +# +#console logging : +# +# facility = "*" +# command = "/sbin/consolelog.sh" + +Everything important : + + facility = "*" + minimum = 6 + logdir = "/var/log/everything" + +Everything very important : + + facility = "*" + minimum = 1 + logdir = "/var/log/critical" + +Password failures : + + regex = "(password|login|authentication)\s+(fail|invalid)" + regex = "(failed|invalid)\s+(password|login|authentication|user)" + regex = "ILLEGAL ROOT LOGIN" + logdir = "/var/log/pwdfail" +# command = "/usr/local/sbin/mail_pwd_failures.sh" + +Kernel messages : + + facility = "kern" + logdir = "/var/log/kernel" + break = 1 + +Crond : + + facility = "cron" + logdir = "/var/log/crond" + break = 1 + +FTP Server : + + facility = "ftp" + logdir = "/var/log/ftpd" + break = 1 + +News Server : + + facility = "news" + logdir = "/var/log/news" + break = 1 + +Dudes firewalled by IPTrap : + + program = "iptrap" + logdir = "/var/log/iptrap" + break = 1 + +SSH Server : + + program = "sshd" + logdir = "/var/log/sshd" + break = 1 + +Telnet : + + program = "login" + logdir = "/var/log/telnet" + break = 1 + +Imap : + + program = "/usr/sbin/imapd" + logdir = "/var/log/imap" + break = 1 + +POP Toaster : + + program = "/usr/sbin/ipop3d" + logdir = "/var/log/pop" + break = 1 + +#Add authenticated IP addresses for SMTP relaying : + +# program = "/usr/sbin/ipop3d" +# regex = "Login.+nmsgs=" +# command = "/usr/local/sbin/add_pop_address.sh" +# break = 1 + +Mail : + + facility = "mail" + neg_regex= "starting daemon" + logdir = "/var/log/mail" + break = 1 + +Exim : + + program_regex = "^exim" + logdir = "/var/log/exim" + break = 1 + +Ppp : + program_regex = "^ppp" + logdir = "/var/log/ppp" + break = 1 + +Postgresql : + program_regex = "^postmaster" + program_regex = "^postgres" + logdir = "/var/log/postgres" + break = 1 + +Apache : + program_regex = "^httpd" + logdir = "/var/log/http" + break = 1 diff --git a/app-admin/metalog/files/metalog.confd b/app-admin/metalog/files/metalog.confd new file mode 100644 index 0000000..caa5918 --- /dev/null +++ b/app-admin/metalog/files/metalog.confd @@ -0,0 +1,19 @@ +# /etc/conf.d/metalog +# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/files/metalog.confd,v 1.7 2006/02/08 01:04:02 vapier Exp $ + +# Some useful options: +# -a Log with buffering +# -s Log without buffering +# See `metalog --help` for more + +METALOG_OPTS="" + + +# Options used by /usr/sbin/consolelog.sh + +# Space delimited list of devices to write "console" messages to +#CONSOLE="/dev/console /dev/tty10" +CONSOLE="/dev/tty10" + +# Format of logging (make sure you use single quotes) +FORMAT='$1 [$2] $3' diff --git a/app-admin/metalog/files/metalog.initd b/app-admin/metalog/files/metalog.initd new file mode 100755 index 0000000..ed89493 --- /dev/null +++ b/app-admin/metalog/files/metalog.initd @@ -0,0 +1,45 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/files/metalog.initd,v 1.3 2007/02/23 11:17:38 uberlord Exp $ + +opts="buffer unbuffer" + +PIDFILE=/var/run/metalog.pid + +depend() { + need localmount + use clock hostname + after bootmisc + provide logger +} + +start() { + ebegin "Starting metalog" + start-stop-daemon --start --exec /usr/sbin/metalog \ + --pidfile "${PIDFILE}" \ + -- --daemonize --pidfile="${PIDFILE}" ${METALOG_OPTS} + eend $? +} + +stop() { + ebegin "Stopping metalog" + start-stop-daemon --stop --exec /usr/sbin/metalog \ + --pidfile "${PIDFILE}" + eend $? +} + +buffer() { + ebegin "Enabling log buffering" + start-stop-daemon --stop --oknodo --signal USR2 \ + --exec /usr/sbin/metalog --pidfile "${PIDFILE}" + eend $? + eend $? +} + +unbuffer() { + ebegin "Disabling log buffering" + start-stop-daemon --stop --oknodo --signal USR1 \ + --exec /usr/sbin/metalog --pidfile "${PIDFILE}" + eend $? +} diff --git a/app-admin/metalog/metadata.xml b/app-admin/metalog/metadata.xml new file mode 100644 index 0000000..80004f3 --- /dev/null +++ b/app-admin/metalog/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>base-system</herd> +<maintainer> + <email>vapier@gentoo.org</email> +</maintainer> +</pkgmetadata> diff --git a/app-admin/metalog/metalog-0.8-r1.ebuild b/app-admin/metalog/metalog-0.8-r1.ebuild new file mode 100644 index 0000000..2b4aeff --- /dev/null +++ b/app-admin/metalog/metalog-0.8-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.8-r1.ebuild,v 1.2 2008/04/24 04:37:35 ricmm Exp $ + +inherit eutils + +MY_P="${P/_/-}" +DESCRIPTION="A highly configurable replacement for syslogd/klogd" +HOMEPAGE="http://metalog.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +IUSE="" + +DEPEND=">=dev-libs/libpcre-3.4" +PROVIDE="virtual/logger" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/metalog-0.8-crosscompile.patch +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + dodoc AUTHORS ChangeLog README NEWS + newdoc metalog.conf metalog.conf.sample + + insinto /etc + doins "${FILESDIR}"/metalog.conf || die + + newinitd "${FILESDIR}"/metalog.initd metalog + newconfd "${FILESDIR}"/metalog.confd metalog + + into / + dosbin "${FILESDIR}"/consolelog.sh || die +} + +pkg_preinst() { + if [[ -d "${ROOT}"/etc/metalog ]] && [[ ! -e "${ROOT}"/etc/metalog.conf ]] ; then + mv -f "${ROOT}"/etc/metalog/metalog.conf "${ROOT}"/etc/metalog.conf + rmdir "${ROOT}"/etc/metalog + fi +} + +pkg_postinst() { + ewarn "The default metalog.conf file has been moved" + ewarn "from /etc/metalog/metalog.conf to just" + ewarn "/etc/metalog.conf. If you had a standard" + ewarn "setup, the file has been moved for you." +} diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog new file mode 100644 index 0000000..731dbcd --- /dev/null +++ b/app-misc/screen/ChangeLog @@ -0,0 +1,547 @@ +# ChangeLog for app-misc/screen +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.141 2008/08/16 20:33:47 swegener Exp $ + + 16 Aug 2008; Sven Wegener <swegener@gentoo.org> + files/screen-4.0.3_p20070403-map.patch: + Update map patch with the fix commited upstream. + + 31 Jul 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml: + Add USE flag description to metadata wrt GLEP 56. + + 07 Jun 2008; Sven Wegener <swegener@gentoo.org> files/screenrc: + Add defnonblock to system screenrc, bug #219216. + + 07 Jun 2008; Sven Wegener <swegener@gentoo.org> screen-4.0.3.ebuild, + screen-4.0.3_p20070403.ebuild: + Allow for more rendition (color/attribute) changes in status bars, bug + #216706. + + 11 Apr 2008; Sven Wegener <swegener@gentoo.org> + +files/screen-4.0.3-config.h-autoconf-2.62.patch, screen-4.0.3.ebuild, + screen-4.0.3_p20070403.ebuild: + Include a compability patch for autoconf-2.62, bug #217311. Drop + bindnow-flags, bug #214245. + + 07 Aug 2007; Sven Wegener <swegener@gentoo.org> screen-4.0.3.ebuild, + screen-4.0.3_p20070403.ebuild: + Port some changes from the new snapshot ebuild to the regular ebuild. + +*screen-4.0.3_p20070403 (07 Aug 2007) + + 07 Aug 2007; Sven Wegener <swegener@gentoo.org> + +files/screen-4.0.3_p20070403-map.patch, +screen-4.0.3_p20070403.ebuild: + Version bump, CVS snapshot, package.mask'ed for now. + + 01 Jun 2007; Christian Faulhammer <opfer@gentoo.org> ChangeLog: + modified ChangeLog to meet common format + + 22 Apr 2007; Sven Wegener <swegener@gentoo.org> screen-4.0.3.ebuild: + Install terminfo source files into /usr/share/screen. + + 28 Jan 2007; Marius Mauch <genone@gentoo.org> screen-4.0.3.ebuild: + Replacing einfo with elog + + 23 Jan 2007; Sven Wegener <swegener@gentoo.org> -screen-4.0.2-r5.ebuild: + Cleanup. + + 20 Jan 2007; Alexander H. Færøy <eroyf@gentoo.org> screen-4.0.3.ebuild: + Stable on MIPS; bug #152770 + + 17 Jan 2007; Sven Wegener <swegener@gentoo.org> screen-4.0.3.ebuild: + Remove the tty addpredict code for bug #162536. + + 29 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> screen-4.0.3.ebuild: + Stable on Alpha, bug 152770. + + 27 Oct 2006; René Nussbaumer <killerfox@gentoo.org> screen-4.0.3.ebuild: + Stable on hppa. See bug #152770. + + 26 Oct 2006; Markus Rothe <corsair@gentoo.org> screen-4.0.3.ebuild: + Stable on ppc64; bug #152770 + + 26 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> screen-4.0.3.ebuild: + Stable on x86 wrt bug #152770. + + 26 Oct 2006; Tim Yamin <plasmaroo@gentoo.org> screen-4.0.3.ebuild: + Stable on IA64; bug #152770. + + 26 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org> screen-4.0.3.ebuild: + ppc stable + + 26 Oct 2006; Daniel Gryniewicz <dang@gentoo.org> screen-4.0.3.ebuild: + Marked stable on amd64 for bug #152770 + + 26 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> screen-4.0.3.ebuild: + Stable on sparc wrt security #152770 + +*screen-4.0.3 (25 Oct 2006) + + 25 Oct 2006; Sven Wegener <swegener@gentoo.org> screen-4.0.2-r5.ebuild, + +screen-4.0.3.ebuild: + Version bump, security bug #152770. + + 17 Oct 2006; Roy Marples <uberlord@gentoo.org> screen-4.0.2-r5.ebuild: + Added ~sparc-fbsd keyword. + + 25 Jul 2006; Sven Wegener <swegener@gentoo.org> -screen-4.0.2-r4.ebuild: + Cleanup. + + 12 Jul 2006; Thomas Cort <tcort@gentoo.org> screen-4.0.2-r5.ebuild: + Stable on alpha. + + 09 Jul 2006; Joshua Kinard <kumba@gentoo.org> screen-4.0.2-r5.ebuild: + Marked stable on mips. + + 06 Jul 2006; Markus Rothe <corsair@gentoo.org> screen-4.0.2-r5.ebuild: + Stable on ppc64 + + 29 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org> + screen-4.0.2-r5.ebuild: + Stable on hppa + + 25 Jun 2006; Tobias Scherbaum <dertobi123@gentoo.org> + screen-4.0.2-r5.ebuild: + ppc stable + + 25 Jun 2006; Simon Stelling <blubb@gentoo.org> screen-4.0.2-r5.ebuild: + stable on amd64 + + 22 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org> + screen-4.0.2-r5.ebuild: + Stable on sparc + + 18 Jun 2006; Andrej Kacian <ticho@gentoo.org> screen-4.0.2-r5.ebuild: + Stable on x86. Bug #137188. + +*screen-4.0.2-r5 (07 Apr 2006) + + 07 Apr 2006; Sven Wegener <swegener@gentoo.org> + +files/4.0.2-nonblock.patch, +screen-4.0.2-r5.ebuild: + Revision bump, with some code refactoring. Raise the number of possible + windows, bug #99171. Print information on xterm tweaks which might break + some applications, bug #99524. Include patch by Michael Hanselmann to open + the tty in nonblocking mode. Add multiuser USE flag which adjusts the + permissions. + + 30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> screen-4.0.2-r4.ebuild: + Add ~x86-fbsd keyword. + + 12 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> screen-4.0.2-r4.ebuild: + Add enewgroup call to add utmp group if it does not exists already. Fixes + bug #122586. + + 25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> screen-4.0.2-r4.ebuild: + Use bindnow-flags function instead of -Wl,-z,now. + + 02 Oct 2005; Sven Wegener <swegener@gentoo.org> files/screenrc: + Remove dead link from screenrc, bug 107919. + + 16 Sep 2005; Stephen Bennett <spb@gentoo.org> screen-4.0.2-r4.ebuild: + Added selinux policy to RDEPEND + + 16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog: + Converted to UTF-8, fixed encoding screwups + + 23 Aug 2005; Sven Wegener <swegener@gentoo.org> + -files/screen.pam.system-auth, -screen-4.0.2-r1.ebuild: + Removed old ebuild. + + 23 Aug 2005; Aron Griffis <agriffis@gentoo.org> screen-4.0.2-r4.ebuild: + stable on ia64 + + 09 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> screen-4.0.2-r4.ebuild: + Stable on mips. + + 21 Jul 2005; MATSUU Takuto <matsuu@gentoo.org> screen-4.0.2-r4.ebuild: + Stable on sh. + + 19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> screen-4.0.2-r4.ebuild: + Stable on alpha. + + 19 Jul 2005; Malcolm Lashley <malc@gentoo.org> screen-4.0.2-r4.ebuild: + Stable on amd64, bug #99587 + + 09 Jul 2005; Markus Rothe <corsair@gentoo.org> screen-4.0.2-r4.ebuild: + Stable on ppc64 + + 09 Jul 2005; Joseph Jezak <josejx@gentoo.org> screen-4.0.2-r4.ebuild: + Marked ppc stable. + + 08 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> + screen-4.0.2-r4.ebuild: + Stable on hppa. + + 08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> + screen-4.0.2-r4.ebuild: + Stable on sparc + + 07 Jul 2005; Sven Wegener <swegener@gentoo.org> screen-4.0.2-r4.ebuild: + Marked stable on x86. + + 06 Jul 2005; Sven Wegener <swegener@gentoo.org> + +files/4.0.2-windowlist-multiuser-fix.patch, screen-4.0.2-r4.ebuild: + Added a minor patch that makes %u work for the windowlist format. + + 13 Jun 2005; Sven Wegener <swegener@gentoo.org> files/screenrc: + Changed the xterm scrollback tweak to clear the screen after detaching and + exiting screen. + +*screen-4.0.2-r4 (07 Jun 2005) + + 07 Jun 2005; Sven Wegener <swegener@gentoo.org> files/screenrc, + -screen-4.0.2-r3.ebuild, +screen-4.0.2-r4.ebuild: + Revision bump. Added support for the debug USE flag, bug 95100. Changed the + bufferfile configuration option to a more safe default value, bug #95273. + + 29 May 2005; <solar@gentoo.org> screen-4.0.2-r1.ebuild: + echangelog - update package to use libc expanded variable elibc_uclibc vs + uclibc so USE=-* works + + 22 May 2005; Sven Wegener <swegener@gentoo.org> + +files/4.0.2-no-libelf.patch, screen-4.0.2-r3.ebuild: + Removed the libelf check from configure. + + 20 May 2005; Sven Wegener <swegener@gentoo.org> -files/screen.pam, + screen-4.0.2-r1.ebuild, screen-4.0.2-r3.ebuild: + Changed to use pam.eclass and pamd_mimic_system. + +*screen-4.0.2-r3 (14 May 2005) + + 14 May 2005; Sven Wegener <swegener@gentoo.org> + +files/4.0.2-64bit-time.patch, +files/screen.pam, -screen-4.0.2-r2.ebuild, + +screen-4.0.2-r3.ebuild: + Revision bump to include several fixes and feature enhancements. Install the + correct pam.d file for bug #92370. Enable the built-in telnet client, bug + #82773. Fix time bug for 64bit systems, bug #71207. Also enable the 256 + colors support, requested via email by Emanuele Giaquinta. + +*screen-4.0.2-r2 (13 May 2005) + + 13 May 2005; Mike Frysinger <vapier@gentoo.org> +screen-4.0.2-r2.ebuild: + Import FreeBSD fixes and redo uClibc fixes to be more generic #92370 by + Diego Pettenò. + + 31 Dec 2004; Sven Wegener <swegener@gentoo.org> files/screenrc: + Do not use xterm's alternative window buffer by default, it breaks + scrollback. Closes bug #61195. + +*screen-4.0.2-r1 (17 Dec 2004) + + 17 Dec 2004; Sven Wegener <swegener@gentoo.org> + +files/4.0.2-no-utempter.patch, +screen-4.0.2-r1.ebuild, + -screen-4.0.2.ebuild: + Revision bump. Don't use utempter even if it is found on the system. Closes + bug #74717. + + 09 Dec 2004; Mike Frysinger <vapier@gentoo.org> files/screenrc: + Change default to vbell=off and msg=Wuff Wuff :). + + 05 Dec 2004; Sven Wegener <swegener@gentoo.org> screen-4.0.2.ebuild: + Added some more error checking. Some cosmetical rearrangements. + + 13 Nov 2004; Sven Wegener <swegener@gentoo.org> screen-4.0.2.ebuild: + Removed large comment section from ebuild. + + 15 Oct 2004; Sven Wegener <swegener@gentoo.org> screen-4.0.2.ebuild: + Fixed the nethack USE flag which was always activated. Thanks to Horst + Schirmeier <gentoo@schirmeier.com> in bug #67127. Modified to use non-lazy + bindings. + + 13 Oct 2004; Sven Wegener <swegener@gentoo.org> metadata.xml: + Added to the shell-tools herd. + + 04 Sep 2004; Sven Wegener <swegener@gentoo.org> metadata.xml, + -files/screen.pam, -screen-4.0.1-r2.ebuild, screen-4.0.2.ebuild: + Removed old ebuild. Added longdescription to metadata.xml and taking over + primary maintainership. + + 03 Sep 2004; Tom Gall <tgall@gentoo.org> screen-4.0.2.ebuild: + stable on ppc64 + + 07 Aug 2004; Tom Martin <slarti@gentoo.org> screen-4.0.2.ebuild: + Stable on amd64. + + 16 Jul 2004; Gustavo Zacarias <gustavoz@gentoo.org> screen-4.0.2.ebuild: + Stable on sparc + + 10 Jul 2004; Lars Weiler <pylon@gentoo.org> screen-4.0.2.ebuild: + Stable on ppc. + + 09 Jul 2004; <rac@gentoo.org> screen-4.0.2.ebuild: + Add nethack mode + + 06 Jul 2004; Joshua Kinard <kumba@gentoo.org> screen-4.0.2.ebuild: + Marked stable on mips. + + 03 Jul 2004; Guy Martin <gmsoft@gentoo.org> screen-4.0.2.ebuild: + Marked stable on hppa. + + 29 Jun 2004; Aron Griffis <agriffis@gentoo.org> screen-4.0.2.ebuild: + stable on x86, alpha, ia64 + + 07 Jun 2004; Daniel Black <dragonheart@gentoo.org> screen-4.0.1-r2.ebuild, + screen-4.0.2.ebuild, +metadata.xml: + x86 stable - 4.0.2. Removed 1 homepage as it didn't exits. changed SRC_URI to + mirror://gnu + + 11 May 2004; Michael Sterrett <mr_bones_@gentoo.org> screen-4.0.2.ebuild: + carry forward keywords + + 25 Apr 2004; Aron Griffis <agriffis@gentoo.org> screen-4.0.1-r2.ebuild, + screen-4.0.2.ebuild: + Add die following econf for bug 48950 + + 12 Apr 2004; Michael McCabe <randy@gentoo.org> screen-4.0.2.ebuild: + adding s390 keywords + + 03 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; screen-4.0.1-r2.ebuild, + screen-4.0.2.ebuild: + Add GNU homepage to list for #43485. + +*screen-4.0.2 (03 Apr 2004) + + 03 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; screen-4.0.2.ebuild: + Version bump, closes #43485. + + 23 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; + screen-3.9.13-r4.ebuild, screen-3.9.15-r1.ebuild, screen-3.9.15.ebuild, + screen-4.0.1-r1.ebuild, screen-4.0.1.ebuild: + Pull old versions for #34599 and to clean up the directory. + + 16 Mar 2004; Robin H. Johnson <robbat2@gentoo.org> screen-4.0.1-r2.ebuild: + fix borkage in screen-4.0.1-r2 by vapier, forgetting to close a "! + + 14 Mar 2004; Tom Gall <tgall@gentoo.org> screen-4.0.1-r2.ebuild: + stable on ppc64 + + 09 Feb 2004; <agriffis@gentoo.org> screen-4.0.1-r2.ebuild: + stable on ia64 + +*screen-4.0.1-r2 (13 Jan 2004) + + 13 Jan 2004; Aron Griffis <agriffis@gentoo.org> screen-4.0.1-r2.ebuild, + files/screen-4.0.1-vsprintf.patch: + Add patch (modified) from + http://groups.yahoo.com/group/gnu-screen/message/2863 to fix bug 31070. This + allows alpha to build with optimization again since glibc's vsprintf + function is being used instead of screen's broken internal implementation. + + 09 Jan 2004; Aron Griffis <agriffis@gentoo.org> screen-4.0.1-r1.ebuild: + stable on alpha + + 01 Jan 2004; <tuxus@gentoo.org> screen-4.0.1-r1.ebuild: + Added mips to KEYWORDS + + 14 Dec 2003; Brad House <brad_mssw@gentoo.org> screen-4.0.1-r1.ebuild: + mark stable on amd64 + + 14 Dec 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> screen-4.0.1-r1.ebuild: + call fowners before fperms. + + 13 Dec 2003; Lars Weiler <pylon@gentoo.org> screen-4.0.1-r1.ebuild: + Masked stable on ppc + + 10 Dec 2003; Ciaran McCreesh <ciaranm@gentoo.org> screen-4.0.1-r1.ebuild: + Moving to stable on sparc + + 10 Dec 2003; <solar@gentoo.org> screen-4.0.1-r1.ebuild: + marking screen stable on x86, arch herds please do the same as screen less + than -r1 will be package.masked here shortly. + + 08 Dec 2003; root <root@gentoo.org> screen-3.9.13-r4.ebuild, + screen-3.9.15-r1.ebuild, screen-3.9.15.ebuild: + Using keepdir instead of touching .keep to fix bug #35308. + + 06 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; + screen-3.9.13-r4.ebuild, screen-3.9.15-r1.ebuild, screen-3.9.15.ebuild: + Changing obsolete chown syntax for bug #35127. + +*screen-4.0.1-r1 (29 Nov 2003) + + 08 Dec 2003; Guy Martin <gmsoft@gentoo.org> screen-4.0.1-r1.ebuild : + Marked stable on hppa. + + 29 Nov 2003; <solar@gentoo.org> screen-4.0.1-r1.ebuild, + files/screen-4.0.1-int-overflow-fix.patch: + corrected integer overflows in ansi.c/resize.c max window height/width is now + 1000x1000 Bug: #34599 + + 20 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> screen-4.0.1.ebuild: + install patchlevel.h as doc for bug 33852; more error checking/messages; use + sed -i; use more portage functions + + 18 Nov 2003; Peter Johanson <latexer@gentoo.org> screen-4.0.1.ebuild: + Fixed chmod line to be 0775 (bug # 33672) + + 15 Nov 2003; Seemant Kulleen <seemant@gentoo.org> screen-3.9.13-r4.ebuild, + screen-3.9.15-r1.ebuild, screen-3.9.15.ebuild, screen-4.0.1.ebuild: + HOMEPAGE update thanks to: Hartwig Brandl + <hartwigbrandl@users.sourceforge.net> in bug #33576 + + 15 Nov 2003; Lars Weiler <pylon@gentoo.org> screen-4.0.1.ebuild: + Masked stable on x86 and sparc (with ciaranm permission). Added testing + keyword for ~ppc. + + 02 Nov 2003; Christian Birchinger <joker@gentoo.org> + screen-3.9.15-r1.ebuild: + Added sparc stable keyword + + 15 Oct 2003; Jason Wever <weeve@gentoo.org> screen-4.0.1.ebuild: + Fixed multi-user instructions so screen will launch correctly now. + + 14 Oct 2003; Jason Wever <weeve@gentoo.org> screen-4.0.1.ebuild: + Added ~sparc keyword and fixed chmod command to resolve bug #31113. + +*screen-4.0.1 (07 Oct 2003) + + 07 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; screen-4.0.1.ebuild: + Version bump, maintainer unclear. + + 07 Oct 2003; John Mylchreest <johnm@gentoo.org>; screen-3.9.15-r1.ebuild: + fixing POSIX 1003.1-2001 chown change. '.' now ':' + + 01 Oct 2003; Tavis Ormandy <taviso@gentoo.org> screen-3.9.15-r1.ebuild: + Stable on alpha + +*screen-3.9.15-r1 (12 Jul 2003) + + 12 Jul 2003; Robin H. Johnson <robbat2@gentoo.org> screen-3.9.15-r1.ebuild, + files/screen.pam.system-auth: + Updated screen.pam (in new screen.pam.system-auth copy) to use pam_stack + instead of pam_unix directly. Required for pam_ldap working properly. + +*screen-3.9.15 (13 Mar 2003) + + 27 Apr 2003; Zach Welch <zwelch@gentoo.org> screen-3.9.15.ebuild: + Add arm to KEYWORDS + + 16 Apr 2003; Guy Martin <gmsoft@gentoo.org> screen-3.9.15.ebuild : + Marked stable on hppa. + + 31 Mar 2003; Jan Seidel <tuxus@gentoo.org> screen-3.9.15.ebuild: + Added mips to KEYWORDS + + 30 Mar 2003; Christian Birchinger <joker@gentoo.org> screen-3.9.15.ebuild: + Added sparc stable keyword + + 13 Mar 2003; Brandon Low <lostlogic@gentoo.org> screen-3.9.15.ebuild: + Version bump + +*screen-3.9.13-r4 (16 Jan 2003) + + 10 Feb 2003; Guy Martin <gmsoft@gentoo.org> screen-3.9.13-r4.ebuild : + Added hppa to keywords. + + 16 Jan 2003; Aron Griffis <agriffis@gentoo.org> screen-3.9.13-r4.ebuild : + Revision bump since the last change affects run-time, not compile-time. + + 16 Jan 2003; Aron Griffis <agriffis@gentoo.org> screen-3.9.13-r3.ebuild : + Fix bug 12683 again. Last fix broke screen at run-time. + + 15 Jan 2003; Aron Griffis <agriffis@gentoo.org> screen-3.9.13-r3.ebuild : + Fixup term.h to fix bug 12683. Believe this is an upstream problem in + screen, but no doubt it will be ironed out eventually. + +*screen-3.9.13-r3 (20 Dec 2002) + + 20 Dec 2002; Maik Schreiber <blizzy@gentoo.org> : Revision bump to get + permissions right on all systems. + + 20 Dec 2002; Maik Schreiber <blizzy@gentoo.org> screen-3.9.13-r1.ebuild, + screen-3.9.13-r2.ebuild: Fixed sed calls to work with <sed-4. + + 19 Dec 2002; Maik Schreiber <blizzy@gentoo.org> files/screenrc: Changed + scrollback buffer to 1000 lines per default. Also removed version output + on startup. + +*screen-3.9.13-r2 (19 Dec 2002) + + 19 Dec 2002; Maik Schreiber <blizzy@gentoo.org> : Changed permissions of + /var/run/screen to 0755 to satisfy screen when running in multi-user mode. + +*screen-3.9.13-r1 (16 Dec 2002) + + 16 Dec 2002; Stefan Jones <cretin@gentoo.org> : A new improved ebuild. Does + everything! Many thanks to j2 on IRC for the ebuild. + + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords + +*screen-3.9.13 (18 Nov 2002) + + 18 Nov 2002; Maik Schreiber <blizzy@gentoo.org> : New version. + +*screen-3.9.11-r4 (7 Nov 2002) + + 7 Nov 2002; Michael Nazaroff <naz@gentoo.org> screen-3.9.11-r3.ebuild : + + I added in addpredict "${SSH_TTY}" and "`tty`" line into the ebuild to see if + maybe this will actually fix the ebuild. I've been getting support + from Andreas Fink <koba@braindead.de> with the ebuild, since he can produce + the issue and I cannot on my machine. + + 11 Nov 2002; Michael Nazaroff <naz@gentoo.org> screen-3.9.11-r3.ebuild : + + Fixed a typo in the ebuild so the tty addpredict will should actually work. + +*screen-3.9.11-r3 (27 Jul 2002) + + 25 Sep 2002; Mike Frysinger <vapier@gentoo.org> : + Added alpha to KEYWORDS + + 23 Aug 2002; Michael Nazaroff <naz@gentoo.org> screen-3.9.11-r3.ebuild : + + Added a Addwrite line to the ebuild to try and fix a Sandbox + violation. This is issue with vim as well and few other apps when logged + in via ssh and trying to emerge the application. + + 3 Aug 2002; Calum Selkirk <cselkirk@gentoo.org> screen-3.9.11-r3.ebuild : + + Added ppc to KEYWORDS. + + 27 Jul 2002; Michael M Nazaroff <naz@gentoo.org> screen-3.9.11-r3.ebuild : + + Small typo fix.. /dev/ptys/* in ebuild instead of /dev/pty/*. Don't think + needs revision bump. + +*screen-3.9.11-r3 (3 Jun 2002) + + 16 Jun 2002; Michael M Nazaroff <naz@gentoo.org> screen-3.9.11-r3.ebuild : + + Added in sandbox_predict to help correct a sandbox violation trying to test + /dev/pty/* , this should take care of the issue. + +*screen-3.9.11-r3 (3 Jun 2002) + + 3 Jun 2002; Michael M Nazaroff <naz@gentoo.org> screen-3.9.11-r3.ebuild : + + Added in sandbox_predict to help correct a sandbox violation trying to test + /dev/pty/s0, this should take care of the issue. + +*screen-3.9.11-r2 (7 Mar 2002) + + 7 Mar 2002; Jared H. Hudson <jhhudso@gentoo.org> screen-3.9.11-r2.ebuild : + + Removed sandbox file (addwrite /dev/vc) since it is no longer necessary + with portage-1.8.18 + +*screen-3.9.11-r1 (6 Mar 2002) + + 6 Mar 2002; Jared H. Hudson <jhhudso@gentoo.org> screen-3.9.11-r1.ebuild : + + Fixed sandbox error where configure attempts to write to tty + to see if it has permissions to. + +*screen-3.9.11 (21 Mar 2002) + + 21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> screen-3.9.11.ebuild : + + Version upgrade patch submitted by Matthew Kennedy -- this renders the texi + patch from the older version unnecessary, and adds missing documentation + items. + +*screen-3.9.9 (1 Feb 2002) + + 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : + + Added initial ChangeLog. diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest new file mode 100644 index 0000000..f40345e --- /dev/null +++ b/app-misc/screen/Manifest @@ -0,0 +1,16 @@ +AUX 4.0.2-64bit-time.patch 298 RMD160 3278d227f1f5c5bce8b7369e9c44fd7e35ac804c SHA1 ab4f298c3c46fe9dad550009def0db8c44b13d22 SHA256 d974e14a1d8e32a0a05b211cd76d9335a066c6b85538505f1d95f25209c99057 +AUX 4.0.2-no-libelf.patch 555 RMD160 4af1c158b0a4e0124fec8347090bf5d25634fdf5 SHA1 fe33038030600e60369374b994c47e68e2bb6bd3 SHA256 56cc1f7b2d02ba230501c7c87da170fa791639cb1f36b2b0b87d8644e5372059 +AUX 4.0.2-no-pty.patch 392 RMD160 d29aec55c6b76f66a8340096f627afe2e4dca3e8 SHA1 bd1328e0dbb321397692846b5c2ac62df1885a9c SHA256 edc29bc7b7bea89c2f937ca9c95f2ce51b437e4ea042741d9f4ac6d7954178d5 +AUX 4.0.2-no-utempter.patch 440 RMD160 3e0ee3492e5ae84bf05716a1787dee495362bc39 SHA1 f0f810a969790c7d2f6ecd6787909371bab79879 SHA256 cc0178fb86971c0975e3d6d60677f2ad3a393ea126790dc5d56f566c42ebe384 +AUX 4.0.2-nonblock.patch 423 RMD160 30a75e2b89542ec8a878855cf633ac3c04f799fd SHA1 b42195100bf5d4b54dff2120e66ba533c3a9a3a3 SHA256 4a5f1666d7f680a9a8157969318b525bc08885ef673000e902c8ffc23ef49159 +AUX 4.0.2-windowlist-multiuser-fix.patch 491 RMD160 7e28be8f2bc71705b4ff0d8028adb4ad4cd22cd5 SHA1 2d7b190b933900e1b0c302b37d526fafb373de31 SHA256 edec52981859cfad0a2d780352405dc7575ad7901bc101d25e95baccf1060cc7 +AUX screen-4.0.1-int-overflow-fix.patch 930 RMD160 b82fe493ccdc75bcfa97bf36e86f37ff5056565e SHA1 e516e056515a5e10cd470a8f951a94c512827515 SHA256 fe495d43c367082099cfcb890c7b66629d2ad656a7a15fee6fcd60884abee7d0 +AUX screen-4.0.1-vsprintf.patch 480 RMD160 cc80e7353e19d7d82dc506ae3a5eaaedba4db1ca SHA1 b1bf4b8f45236dc63de748699671679ce7237a59 SHA256 34d2f9d6101555fbc37e983542f3db549ea96ede89c7d87c21c69b7331d9c3cd +AUX screen-4.0.3-config.h-autoconf-2.62.patch 388 RMD160 b83b905014431c5671d8624f5b471414e8738d8f SHA1 7335c01e9f12bb2414a4e023bcb739453375f493 SHA256 71897394211d9e00e008f7c34b3a37bff0cfa54bcfa31a23e849c7021471ca2f +AUX screen-4.0.3-crosscompile.patch 18900 RMD160 8a66a9b1145e3d86a5b5931c322b1edab7db1d0c SHA1 a0225014bb4c1efb3613c5c20bd38413629720e9 SHA256 53d73989046c3a180e950cd179e72220bf6d50c96f9442e0bda9b107d3b290be +AUX screen-4.0.3_p20070403-map.patch 271 RMD160 a2d2c0f9e6a035b4b88597ba8620c764aac89a25 SHA1 783a3dcb8706ebedc3de1fa365fc49d04147de2a SHA256 4dde0133a28e996e95bff0b0e4e3f48e4e99054eb77d5381a813f5e216842e10 +AUX screenrc 10397 RMD160 e80d0c2ee7b225d041b75ae4fe080aa2ad8b134a SHA1 15dee4a41ef55d156797333e9279043597cc5682 SHA256 c4ad4932fc65ebfd047134ae8c5bc1e37096a0dd5c3c6e74b3462a8562ff39f8 +DIST screen-4.0.3.tar.gz 840602 RMD160 8c3903c1642ae30fd9d5706298919428552f7754 SHA1 7bc6e2f0959ffaae6f52d698c26c774e7dec3545 SHA256 78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77 +EBUILD screen-4.0.3.ebuild 4608 RMD160 782e4781f7ea9819dba6a0f87c6d0affcf0c2ae8 SHA1 a667db3bda6bf68fffbdd42c118ffa0304975ace SHA256 51e316e7064979c5083c7d42bf06a54a466b5b9cfb52250381c0d8ea8766e96a +MISC ChangeLog 19779 RMD160 b0f53ae78563e9ac694580f0eba5de2a555fd65a SHA1 3279c9e3f9ca4d134279c1842d138b9026257660 SHA256 3804712e7baaf9788ddf22e346a95fd4417de89345d959b488e0fb4387da12f9 +MISC metadata.xml 1697 RMD160 e3f187509d13f8e939814733c9876407006ca0ab SHA1 53a6d55362e68c62329b6a644b5b3f74c436f272 SHA256 58279e41070c88041df5acd625067c947b9df46ca68fb3ae3cd72c268ae30c81 diff --git a/app-misc/screen/files/4.0.2-64bit-time.patch b/app-misc/screen/files/4.0.2-64bit-time.patch new file mode 100644 index 0000000..645b37f --- /dev/null +++ b/app-misc/screen/files/4.0.2-64bit-time.patch @@ -0,0 +1,11 @@ +--- utmp.c.orig 2004-11-14 23:15:28.000000000 +0100 ++++ utmp.c 2004-11-14 23:15:39.000000000 +0100 +@@ -618,7 +618,7 @@ + #endif /* sgi */ + strncpy(u->ut_line, line, sizeof(u->ut_line)); + u->ut_pid = pid; +- (void)time((time_t *)&u->ut_time); ++ u->ut_time = time(NULL); + } + + static slot_t diff --git a/app-misc/screen/files/4.0.2-no-libelf.patch b/app-misc/screen/files/4.0.2-no-libelf.patch new file mode 100644 index 0000000..df06383 --- /dev/null +++ b/app-misc/screen/files/4.0.2-no-libelf.patch @@ -0,0 +1,18 @@ +--- screen-4.0.2/configure.in 2005-05-22 19:55:06.559874997 +0000 ++++ screen-4.0.2-no-libelf/configure.in 2005-05-22 19:56:05.895801017 +0000 +@@ -195,15 +195,6 @@ + #endif + ], LIBS="$LIBS -lsocket -linet";seqptx=1) + +-oldlibs="$LIBS" +-LIBS="$LIBS -lelf" +-AC_CHECKING(SVR4) +-AC_TRY_LINK([#include <utmpx.h> +-],, +-[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN), +-[AC_CHECK_HEADER(elf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN))])] +-,LIBS="$oldlibs") +- + AC_CHECKING(for Solaris 2.x) + AC_EGREP_CPP(yes, + [#if defined(SVR4) && defined(sun) diff --git a/app-misc/screen/files/4.0.2-no-pty.patch b/app-misc/screen/files/4.0.2-no-pty.patch new file mode 100644 index 0000000..7b7b798 --- /dev/null +++ b/app-misc/screen/files/4.0.2-no-pty.patch @@ -0,0 +1,14 @@ +--- screen-4.0.2/pty.c.orig 2004-07-29 23:53:45.313533536 -0400 ++++ screen-4.0.2/pty.c 2004-07-29 23:53:59.011451136 -0400 +@@ -33,11 +33,6 @@ + # include <sys/ioctl.h> + #endif + +-/* for solaris 2.1, Unixware (SVR4.2) and possibly others */ +-#ifdef HAVE_SVR4_PTYS +-# include <sys/stropts.h> +-#endif +- + #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL) + # include <sys/ttold.h> + #endif diff --git a/app-misc/screen/files/4.0.2-no-utempter.patch b/app-misc/screen/files/4.0.2-no-utempter.patch new file mode 100644 index 0000000..2a06119 --- /dev/null +++ b/app-misc/screen/files/4.0.2-no-utempter.patch @@ -0,0 +1,14 @@ +--- screen-4.0.2/configure.in.orig 2004-12-17 19:55:45.314670411 +0100 ++++ screen-4.0.2/configure.in 2004-12-17 19:55:50.575941541 +0100 +@@ -855,11 +855,6 @@ + #include <utmp.h> + #endif + ],[struct utmp u; u.ut_host[0] = 0;], AC_DEFINE(UTHOST)) +-AC_CHECK_HEADER(utempter.h, have_utempter=yes, have_utempter=no) +-if test "$have_utempter" = yes; then +- AC_DEFINE(HAVE_UTEMPTER) +- LIBS="$LIBS -lutempter" +-fi + + dnl + dnl **** loadav **** diff --git a/app-misc/screen/files/4.0.2-nonblock.patch b/app-misc/screen/files/4.0.2-nonblock.patch new file mode 100644 index 0000000..f27c903 --- /dev/null +++ b/app-misc/screen/files/4.0.2-nonblock.patch @@ -0,0 +1,11 @@ +--- screen.c.orig 2006-04-02 17:05:28.000000000 +0200 ++++ screen.c 2006-04-02 17:05:39.000000000 +0200 +@@ -1197,7 +1197,7 @@ char **av; + if (!detached) + { + /* reopen tty. must do this, because fd 0 may be RDONLY */ +- if ((n = secopen(attach_tty, O_RDWR, 0)) < 0) ++ if ((n = secopen(attach_tty, O_RDWR | O_NONBLOCK, 0)) < 0) + Panic(0, "Cannot reopen '%s' - please check.", attach_tty); + } + else diff --git a/app-misc/screen/files/4.0.2-windowlist-multiuser-fix.patch b/app-misc/screen/files/4.0.2-windowlist-multiuser-fix.patch new file mode 100644 index 0000000..09848e9 --- /dev/null +++ b/app-misc/screen/files/4.0.2-windowlist-multiuser-fix.patch @@ -0,0 +1,12 @@ +diff -Nur screen-4.0.2.orig/process.c screen-4.0.2/process.c +--- screen-4.0.2.orig/process.c 2003-09-18 14:53:54.000000000 +0200 ++++ screen-4.0.2/process.c 2005-07-06 19:55:08.370772955 +0200 +@@ -4841,7 +4841,7 @@ + s = buf; + for (display = displays; display; display = display->d_next) + { +- if (D_user == olddisplay->d_user) ++ if (olddisplay && D_user == olddisplay->d_user) + continue; + for (cv = D_cvlist; cv; cv = cv->c_next) + if (Layer2Window(cv->c_layer) == p) diff --git a/app-misc/screen/files/screen-4.0.1-int-overflow-fix.patch b/app-misc/screen/files/screen-4.0.1-int-overflow-fix.patch new file mode 100644 index 0000000..4a40c8d --- /dev/null +++ b/app-misc/screen/files/screen-4.0.1-int-overflow-fix.patch @@ -0,0 +1,31 @@ +--- ansi.c.orig 2003-09-08 10:24:44.000000000 -0400 ++++ ansi.c 2003-11-29 10:41:15.000000000 -0500 +@@ -559,7 +559,7 @@ + { + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': +- if (curr->w_NumArgs < MAXARGS) ++ if (curr->w_NumArgs >= 0 && curr->w_NumArgs < MAXARGS) + { + if (curr->w_args[curr->w_NumArgs] < 100000000) + curr->w_args[curr->w_NumArgs] = +--- resize.c.orig 2003-09-08 10:26:31.000000000 -0400 ++++ resize.c 2003-11-29 10:41:50.000000000 -0500 +@@ -682,6 +682,17 @@ + if (wi == 0) + he = hi = 0; + ++ if (wi > 1000) ++ { ++ Msg(0, "Window width too large, truncated"); ++ wi = 1000; ++ } ++ if (he > 1000) ++ { ++ Msg(0, "Window height too large, truncated"); ++ he = 1000; ++ } ++ + if (p->w_width == wi && p->w_height == he && p->w_histheight == hi) + { + debug("ChangeWindowSize: No change.\n"); diff --git a/app-misc/screen/files/screen-4.0.1-vsprintf.patch b/app-misc/screen/files/screen-4.0.1-vsprintf.patch new file mode 100644 index 0000000..b2f7a20 --- /dev/null +++ b/app-misc/screen/files/screen-4.0.1-vsprintf.patch @@ -0,0 +1,13 @@ +--- screen-4.0.1/configure.in 2003-06-03 07:58:24.000000000 -0400 ++++ screen-4.0.1/configure.in.agriffis 2004-01-13 12:07:37.000000000 -0500 +@@ -1206,7 +1206,9 @@ + rm -f /tmp/conftest* + + AC_MSG_CHECKING(for vsprintf) +-AC_TRY_LINK(,[vsprintf(0,0,0);], AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS), AC_MSG_RESULT(no)) ++AC_TRY_LINK([#include <stdarg.h>],[va_list valist; vsprintf(0,0,valist);], ++ [AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS)], ++ [AC_MSG_RESULT(no)]) + + AC_HEADER_DIRENT + diff --git a/app-misc/screen/files/screen-4.0.3-config.h-autoconf-2.62.patch b/app-misc/screen/files/screen-4.0.3-config.h-autoconf-2.62.patch new file mode 100644 index 0000000..5605fda --- /dev/null +++ b/app-misc/screen/files/screen-4.0.3-config.h-autoconf-2.62.patch @@ -0,0 +1,14 @@ +compability for sys-devel/autoconf-2.62 + +https://bugs.gentoo.org/show_bug.cgi?id=217311 + +--- screen/config.h.in ++++ screen/config.h.in +@@ -563,7 +563,6 @@ + * If you are on a SYS V machine that restricts filename length to 14 + * characters, you may need to enforce that by setting NAME_MAX to 14 + */ +-#undef NAME_MAX /* KEEP_UNDEF_HERE override system value */ + #undef NAME_MAX + + /* diff --git a/app-misc/screen/files/screen-4.0.3-crosscompile.patch b/app-misc/screen/files/screen-4.0.3-crosscompile.patch new file mode 100644 index 0000000..17026ad --- /dev/null +++ b/app-misc/screen/files/screen-4.0.3-crosscompile.patch @@ -0,0 +1,598 @@ +--- configure.in~ 2008-11-23 17:43:48.000000000 +0000 ++++ configure.in 2008-11-23 17:43:48.000000000 +0000 +@@ -46,6 +46,7 @@ + AC_PROG_GCC_TRADITIONAL + AC_ISC_POSIX + ++AC_MSG_CHECKING([for compiler sanity]) + AC_TRY_RUN(main(){exit(0);},,[ + if test $CC != cc ; then + AC_NOTE(Your $CC failed - restarting with CC=cc) +@@ -54,22 +55,17 @@ + export CC + exec $0 $configure_args + fi +-]) +- +-AC_TRY_RUN(main(){exit(0);},, +-exec 5>&2 +-eval $ac_link +-AC_NOTE(CC=$CC; CFLAGS=$CFLAGS; LIBS=$LIBS;) +-AC_NOTE($ac_compile) +-AC_MSG_ERROR(Can't run the compiler - sorry)) ++],AC_MSG_WARN([skipping test due to crosscompilation])) + ++AC_MSG_CHECKING([if compiler sets exit status]) + AC_TRY_RUN([ + main() + { + int __something_strange_(); + __something_strange_(0); + } +-],AC_MSG_ERROR(Your compiler does not set the exit status - sorry)) ++],AC_MSG_ERROR(Your compiler does not set the exit status - sorry),, ++AC_MSG_WARN(skipping test due to crosscompilation)) + + AC_PROG_AWK + +@@ -103,6 +99,7 @@ + dnl + dnl **** special unix variants **** + dnl ++AH_TEMPLATE(ISC,[]) + if test -n "$ISC"; then + AC_DEFINE(ISC) LIBS="$LIBS -linet" + fi +@@ -114,11 +111,13 @@ + dnl fi + dnl fi + ++AH_TEMPLATE([sysV68],[]) + if test -f /sysV68 ; then + AC_DEFINE(sysV68) + fi + + AC_CHECKING(for MIPS) ++AH_TEMPLATE([MIPS],[]) + if test -f /lib/libmld.a || test -f /usr/lib/libmld.a || test -f /usr/lib/cmplrs/cc/libmld.a; then + oldlibs="$LIBS" + test -f /bin/mx || LIBS="$LIBS -lmld" # for nlist. But not on alpha. +@@ -132,6 +131,8 @@ + AC_CHECKING(wait3) + AC_TRY_LINK(,[wait3();], , + AC_CHECKING(wait2) ++AH_TEMPLATE([USE_WAIT2],[On RISCOS we prefer wait2() over wait3(). rouilj@sni-usa.com]) ++dnl TODO(Hannes) shipped config.h.in wraps the define in #ifdef BSDWAIT + AC_TRY_LINK(,[wait2();], + dnl John Rouillard (rouilj@sni-usa.com): + dnl need -I/usr/include/bsd in RISCOS otherwise sockets are broken, no +@@ -154,9 +155,11 @@ + oldlibs="$LIBS" + LIBS="$LIBS -lpyr" + AC_CHECKING(Pyramid OSX) ++AH_TEMPLATE([OSX], [Pyramid OSX]) + AC_TRY_LINK(,[open_controlling_pty("")], AC_DEFINE(OSX), LIBS="$oldlibs") + fi + ++AH_TEMPLATE([POSIX],[Define POSIX if your system supports IEEE Std 1003.1-1988 (POSIX).]) + dnl ghazi@caip.rutgers.edu (Kaveh R. Ghazi): + dnl BBN butterfly is not POSIX, but a MACH BSD system. + dnl Do not define POSIX and TERMIO. +@@ -183,6 +186,7 @@ + fi + + AC_CHECKING(for System V) ++AH_TEMPLATE([SYSV], [Define SYSV if your machine is SYSV complient (Sys V, HPUX, A/UX)]) + AC_TRY_COMPILE( + [#include <sys/types.h> + #include <signal.h> +@@ -226,6 +230,9 @@ + dnl + + AC_CHECKING(BSD job jontrol) ++AH_TEMPLATE([BSDJOBS], ++[Define BSDJOBS if you have BSD-style job control (both process ++ groups and a tty that deals correctly with them)]) + AC_TRY_LINK( + [#include <sys/types.h> + #include <sys/ioctl.h> +@@ -246,6 +253,10 @@ + dnl **** setreuid(), seteuid() **** + dnl + AC_CHECKING(setreuid) ++AH_TEMPLATE([HAVE_SETREUID], ++[If your system has the calls setreuid() and setregid(), ++ define HAVE_SETREUID. Otherwise screen will use a forked process to ++ safely create output files without retaining any special privileges.]) + AC_TRY_LINK(,[ + #ifdef __hpux + setresuid(0, 0, 0); +@@ -260,6 +271,9 @@ + dnl Solaris seteuid doesn't change the saved uid, bad for + dnl multiuser screen sessions + AC_CHECKING(seteuid) ++AH_TEMPLATE([HAVE_SETEUID], ++[If your system supports BSD4.4's seteuid() and setegid(), define ++ HAVE_SETEUID.]) + AC_TRY_LINK(,[ + #if defined(linux) || defined(NeXT) || defined(_AUX_SOURCE) || defined(AUX) || defined(ultrix) || (defined(sun) && defined(SVR4)) || defined(ISC) || defined(sony_news) + seteuid_is_broken(0); +@@ -284,6 +298,8 @@ + dnl + + AC_CHECKING(fifos) ++AC_CACHE_CHECK([usable fifos], ++ [screen_cv_sys_fifo_usable], + AC_TRY_RUN([ + #include <sys/types.h> + #include <sys/stat.h> +@@ -348,12 +364,14 @@ + exit(1); + exit(0); + } +-], AC_NOTE(- your fifos are usable) fifo=1, +-AC_NOTE(- your fifos are not usable)) +-rm -f /tmp/conftest* ++], screen_cv_sys_fifo_usable=yes, screen_cv_sys_fifo_usable=no)) + +-if test -n "$fifo"; then +-AC_CHECKING(for broken fifo implementation) ++if test X"$screen_cv_sys_fifo_usable" = Xyes; then ++AH_TEMPLATE([BROKEN_PIPE], ++[Define this if your system exits select() immediatly if a pipe is ++ opened read-only and no writer has opened it.]) ++AC_CACHE_CHECK([broken fifo implementation], ++ [screen_cv_sys_fifo_broken_impl], + AC_TRY_RUN([ + #include <sys/types.h> + #include <fcntl.h> +@@ -398,9 +416,11 @@ + exit(1); + exit(0); + } +-], AC_NOTE(- your implementation is ok), +-AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1) +-rm -f /tmp/conftest* ++], screen_cv_sys_fifo_broken_impl=no, ++screen_cv_sys_fifo_broken_impl=yes)) ++if test X"$screen_cv_sys_fifo_broken_impl" = Xyes; then ++ AC_DEFINE(BROKEN_PIPE) ++fi + fi + + dnl +@@ -410,6 +430,8 @@ + dnl + + AC_CHECKING(sockets) ++AC_CACHE_CHECK([sockets are usable], ++ [screen_cv_sys_sockets_usable], + AC_TRY_RUN([ + #include <sys/types.h> + #include <sys/socket.h> +@@ -460,12 +482,16 @@ + exit(1); + exit(0); + } +-], AC_NOTE(- your sockets are usable) sock=1, +-AC_NOTE(- your sockets are not usable)) +-rm -f /tmp/conftest* ++], screen_cv_sys_sockets_usable=yes, ++screen_cv_sys_sockets_usable=no)) + +-if test -n "$sock"; then ++if test X"$screen_cv_sys_sockets_usable" = Xyes; then + AC_CHECKING(socket implementation) ++AH_TEMPLATE([SOCK_NOT_IN_FS], ++[Define this if the unix-domain socket implementation doesn't ++ create a socket in the filesystem.]) ++AC_CACHE_CHECK([if sockets are not stored in the filesystem], ++ [screen_cv_sys_sockets_nofs], + AC_TRY_RUN([ + #include <sys/types.h> + #include <sys/stat.h> +@@ -491,22 +517,25 @@ + close(s); + exit(0); + } +-],AC_NOTE(- you are normal), +-AC_NOTE(- unix domain sockets are not kept in the filesystem) +-AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1) +-rm -f /tmp/conftest* ++], screen_cv_sys_sockets_nofs=no, ++screen_cv_sys_sockets_nofs=yes)) ++ ++if test X"$screen_cv_sys_sockets_nofs" = Xyes; then ++ AC_DEFINE(SOCK_NOT_IN_FS) ++fi + fi + + + dnl + dnl **** choose sockets or fifos **** + dnl +-if test -n "$fifo"; then +- if test -n "$sock"; then +- if test -n "$nore"; then ++AH_TEMPLATE([NAMEDPIPE], [Define this if your system supports named pipes.]) ++if test X"$screen_cv_sys_fifo_usable" = Xyes; then ++ if test X"$screen_cv_sys_sockets_usable" = Xyes; then ++ if test X"$screen_cv_sys_sockets_nofs" = Xyes; then + AC_NOTE(- hmmm... better take the fifos) + AC_DEFINE(NAMEDPIPE) +- elif test -n "$fifobr"; then ++ elif test X"$screen_cv_sys_fifo_broken_impl" = Xyes; then + AC_NOTE(- as your fifos are broken lets use the sockets.) + else + AC_NOTE(- both sockets and fifos usable. let's take fifos.) +@@ -516,7 +545,7 @@ + AC_NOTE(- using named pipes, of course) + AC_DEFINE(NAMEDPIPE) + fi +-elif test -n "$sock"; then ++elif test X"$screen_cv_sys_sockets_usable" = Xyes; then + AC_NOTE(- using unix-domain sockets, of course) + else + AC_MSG_ERROR(you have neither usable sockets nor usable pipes -> no screen) +@@ -526,7 +555,11 @@ + dnl **** check the select implementation **** + dnl + +-AC_CHECKING(select return value) ++AH_TEMPLATE([SELECT_BROKEN], ++[If the select return value doesn't treat a descriptor that is ++ usable for reading and writing as two hits, define SELECT_BROKEN.]) ++AC_CACHE_CHECK([for broken select return value], ++ [screen_cv_sys_select_broken_retval], + AC_TRY_RUN([ + #include <sys/types.h> + #include <sys/stat.h> +@@ -625,17 +658,26 @@ + exit(1); + exit(0); + } +-],AC_NOTE(- select is ok), +-AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN)) ++], screen_cv_sys_select_broken_retval=no, ++screen_cv_sys_select_broken_retval=yes)) ++if test X"$screen_cv_sys_select_broken_retval" = Xyes; then ++ AC_DEFINE(SELECT_BROKEN) ++fi + + dnl + dnl **** termcap or terminfo **** + dnl ++AH_TEMPLATE([TERMINFO], ++[Define TERMINFO if your machine emulates the termcap routines ++ with the terminfo database. ++ Thus the .screenrc file is parsed for ++ the command 'terminfo' and not 'termcap']) ++ + AC_CHECKING(for tgetent) + AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, + olibs="$LIBS" +-LIBS="-lcurses $olibs" + AC_CHECKING(libcurses) ++AC_CHECK_LIB(ncursesw,tgetent) + AC_TRY_LINK(,[ + #ifdef __hpux + __sorry_hpux_libcurses_is_totally_broken_in_10_10(); +@@ -654,24 +696,39 @@ + AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, + AC_MSG_ERROR(!!! no tgetent - no screen)))))) + +-AC_TRY_RUN([ ++AC_CACHE_CHECK([using terminfo database],[screen_cv_sys_terminfo_used], ++ AC_TRY_RUN([ + main() + { + exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); +-}], AC_NOTE(- you use the termcap database), +-AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO)) ++} ++ ], screen_cv_sys_terminfo_used=no, ++ screen_cv_sys_terminfo_used=yes) ++) ++ ++if test X"$screen_cv_sys_terminfo_used" = Xyes; then ++ AC_DEFINE(TERMINFO) ++fi ++ + AC_CHECKING(ospeed) ++AH_TEMPLATE([NEED_OSPEED],[If your library does not define ospeed, define this.]) + AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED)) + + dnl + dnl **** PTY specific things **** + dnl ++AH_TEMPLATE([HAVE_DEV_PTC], ++[define HAVE_DEV_PTC if you have a /dev/ptc character special ++ device.]) + AC_CHECKING(for /dev/ptc) + if test -r /dev/ptc; then + AC_DEFINE(HAVE_DEV_PTC) + fi + + AC_CHECKING(for SVR4 ptys) ++AH_TEMPLATE([HAVE_SVR4_PTYS], ++[define HAVE_SVR4_PTYS if you have a /dev/ptmx character special ++ device and support the ptsname(), grantpt(), unlockpt() functions.]) + sysvr4ptys= + if test -c /dev/ptmx ; then + AC_TRY_LINK([],[ptsname(0);grantpt(0);unlockpt(0);],[AC_DEFINE(HAVE_SVR4_PTYS) +@@ -687,6 +744,13 @@ + fi + + AC_CHECKING(for ptyranges) ++AH_TEMPLATE([PTYRANGE0], ++[define PTYRANGE0 and or PTYRANGE1 if you want to adapt screen ++ to unusual environments. E.g. For SunOs the defaults are "qpr" and ++ "0123456789abcdef". For SunOs 4.1.2 ++ #define PTYRANGE0 "pqrstuvwxyzPQRST" ++ is recommended by Dan Jacobson.]) ++AH_TEMPLATE([PTYRANGE1],[]) + if test -d /dev/ptym ; then + pdir='/dev/ptym' + else +@@ -850,20 +914,39 @@ + dnl + dnl **** loadav **** + dnl ++ ++AH_TEMPLATE([LOADAV], ++[If you want the "time" command to display the current load average ++ define LOADAV. Maybe you must install screen with the needed ++ privileges to read /dev/kmem. ++ Note that NLIST_ stuff is only checked, when getloadavg() is not available. ++]) ++AH_TEMPLATE([LOADAV_NUM]) ++AH_TEMPLATE([LOADAV_TYPE]) ++AH_TEMPLATE([LOADAV_SCALE]) ++AH_TEMPLATE([LOADAV_GETLOADAVG]) ++AH_TEMPLATE([LOADAV_UNIX]) ++AH_TEMPLATE([LOADAV_AVENRUN]) ++AH_TEMPLATE([LOADAV_USE_NLIST64]) ++ ++AH_TEMPLATE([NLIST_DECLARED]) ++AH_TEMPLATE([NLIST_STRUCT]) ++AH_TEMPLATE([NLIST_NAME_UNION]) ++ + AC_CHECKING(for libutil(s)) +-test -f /usr/lib/libutils.a && LIBS="$LIBS -lutils" +-test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil" ++dnl I have no idea whether "login" is an appropriate symbol to check for here - Hannes ++AC_CHECK_LIB(utils,login) ++AC_CHECK_LIB(util,login) + + AC_CHECKING(getloadavg) + AC_TRY_LINK(,[getloadavg((double *)0, 0);], + AC_DEFINE(LOADAV_GETLOADAVG) load=1, +-if test -f /usr/lib/libkvm.a ; then + olibs="$LIBS" +-LIBS="$LIBS -lkvm" ++AC_CHECK_LIB(kvm,kvm_open, + AC_CHECKING(getloadavg with -lkvm) + AC_TRY_LINK(,[getloadavg((double *)0, 0);], + AC_DEFINE(LOADAV_GETLOADAVG) load=1, LIBS="$olibs") +-fi ++) + ) + + if test -z "$load" ; then +@@ -1005,6 +1088,11 @@ + dnl + dnl **** signal handling **** + dnl ++ ++AH_TEMPLATE([SIGVOID], ++[Define SIGVOID if your signal handlers return void. On older ++ systems, signal returns int, but on newer ones, it returns void.]) ++ + if test -n "$posix" ; then + + dnl POSIX has reliable signals with void return type. +@@ -1014,6 +1102,7 @@ + else + + AC_CHECKING(return type of signal handlers) ++AH_TEMPLATE([USESIGSET], [Define USESIGSET if you have sigset for BSD 4.1 reliable signals.]) + AC_TRY_COMPILE( + [#include <sys/types.h> + #include <signal.h> +@@ -1033,6 +1122,9 @@ + #endif + ], AC_DEFINE(USESIGSET)) + AC_CHECKING(signal implementation) ++AH_TEMPLATE([SYSVSIGS], ++[Define SYSVSIGS if signal handlers must be reinstalled after ++ they have been called.]) + AC_TRY_RUN([ + #include <sys/types.h> + #include <signal.h> +@@ -1075,13 +1167,14 @@ + dnl + + AC_CHECKING(for crypt and sec libraries) +-test -f /lib/libcrypt_d.a || test -f /usr/lib/libcrypt_d.a && LIBS="$LIBS -lcrypt_d" ++dnl I have no idea whether "crypt" is an appropriate symbol to check for here - Hannes ++AC_CHECK_LIB(crypt_d,crypt) + oldlibs="$LIBS" +-LIBS="$LIBS -lcrypt" + AC_CHECKING(crypt) + AC_TRY_LINK(,,,LIBS="$oldlibs") +-test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec" +-test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow" ++AC_CHECK_LIB(crypt,crypt) ++AC_CHECK_LIB(sec,crypt) ++AC_CHECK_LIB(shadow,getspnam) + oldlibs="$LIBS" + LIBS="$LIBS -lsun" + AC_CHECKING(IRIX sun library) +@@ -1104,6 +1197,13 @@ + dnl **** misc things **** + dnl + AC_CHECKING(wait union) ++AH_TEMPLATE([BSDWAIT], ++[Define BSDWAIT if your system defines a 'union wait' in <sys/wait.h> ++ ++ Only allow BSDWAIT i.e. wait3 on nonposix systems, since ++ posix implies wait(3) and waitpid(3). vdlinden@fwi.uva.nl ++ TODO(Hannes) shipped config.h.in does that with a #ifdef ++]) + AC_TRY_COMPILE([#include <sys/types.h> + #include <sys/wait.h> + ],[ +@@ -1114,6 +1214,13 @@ + #endif + ],AC_DEFINE(BSDWAIT)) + ++AH_TEMPLATE([TERMIO], ++[Define TERMIO if you have struct termio instead of struct sgttyb. ++ This is usually the case for SVID systems, where BSD uses sgttyb. ++ POSIX systems should define this anyway, even though they use ++ struct termios.]) ++ ++ + if test -z "$butterfly"; then + AC_CHECKING(for termio or termios) + AC_TRY_CPP([#include <termio.h>], AC_DEFINE(TERMIO), +@@ -1123,17 +1230,35 @@ + ) + fi + ++AH_TEMPLATE([CYTERMIO], [Define CYTERMIO if you have cyrillic termio modes.]) ++ + dnl AC_CHECK_HEADER(shadow.h, AC_DEFINE(SHADOWPW)) + AC_CHECKING(getspnam) ++AH_TEMPLATE([SHADOWPW], ++[If the passwords are stored in a shadow file and you want the ++ builtin lock to work properly, define SHADOWPW.]) + AC_TRY_LINK([#include <shadow.h>], [getspnam("x");],AC_DEFINE(SHADOWPW)) + + AC_CHECKING(getttyent) ++AH_TEMPLATE([GETTTYENT], ++[If your system has the new format /etc/ttys (like 4.3 BSD) and the ++ getttyent(3) library functions, define GETTTYENT.]) + AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT)) + + AC_CHECKING(fdwalk) ++AH_TEMPLATE([HAVE_FDWALK], ++[Newer versions of Solaris include fdwalk, which can greatly improve ++ the startup time of screen; otherwise screen spends a lot of time ++ closing file descriptors.]) + AC_TRY_LINK([#include <stdlib.h>], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK)) + +-AC_CHECKING(whether memcpy/memmove/bcopy handles overlapping arguments) ++AH_TEMPLATE([USEBCOPY], ++[Define USEBCOPY if the bcopy/memcpy from your system's C library ++ supports the overlapping of source and destination blocks. When ++ undefined, screen uses its own (probably slower) version of bcopy().]) ++ ++AC_CACHE_CHECK([if bcopy handles overlap], ++ [screen_cv_sys_bcopy_overlap], + AC_TRY_RUN([ + main() { + char buf[10]; +@@ -1146,7 +1271,21 @@ + if (strncmp(buf, "cdedef", 6)) + exit(1); + exit(0); /* libc version works properly. */ +-}], AC_DEFINE(USEBCOPY)) ++}], screen_cv_sys_bcopy_overlap=yes, ++screen_cv_sys_bcopy_overlap=no)) ++if test X"$screen_cv_sys_bcopy_overlap" = Xyes; then ++ AC_DEFINE(USEBCOPY) ++fi ++ ++AH_TEMPLATE([USEMEMMOVE], ++[SYSV machines may have a working memcpy() -- Oh, this is ++ quite unlikely. Tell me if you see one. ++ "But then, memmove() should work, if at all available" he thought... ++ Boing, never say "works everywhere" unless you checked SCO UNIX. ++ Their memove fails the test in the configure script. Sigh. (Juergen) ++]) ++AC_CACHE_CHECK([if memmove handles overlap], ++ [screen_cv_sys_memmove_overlap], + + AC_TRY_RUN([ + #define bcopy(s,d,l) memmove(d,s,l) +@@ -1161,9 +1300,15 @@ + if (strncmp(buf, "cdedef", 6)) + exit(1); + exit(0); /* libc version works properly. */ +-}], AC_DEFINE(USEMEMMOVE)) +- ++}], screen_cv_sys_memmove_overlap=yes, ++screen_cv_sys_memmove_overlap=no)) ++if test X"$screen_cv_sys_memmove_overlap" = Xyes; then ++ AC_DEFINE(USEMEMMOVE) ++fi + ++AH_TEMPLATE([USEMEMCPY],[]) ++AC_CACHE_CHECK([if memcpy handles overlap], ++ [screen_cv_sys_memcpy_overlap], + AC_TRY_RUN([ + #define bcopy(s,d,l) memcpy(d,s,l) + main() { +@@ -1177,9 +1322,19 @@ + if (strncmp(buf, "cdedef", 6)) + exit(1); + exit(0); /* libc version works properly. */ +-}], AC_DEFINE(USEMEMCPY)) ++}], screen_cv_sys_memcpy_overlap=yes, ++screen_cv_sys_memcpy_overlap=no)) ++if test X"$screen_cv_sys_memcpy_overlap" = Xyes; then ++ AC_DEFINE(USEMEMCPY) ++fi + + AC_MSG_CHECKING(long file names) ++AH_TEMPLATE([NAME_MAX], ++[If you are on a SYS V machine that restricts filename length to 14 ++ characters, you may need to enforce that by setting NAME_MAX to 14]) ++dnl TODO(Hannes) shipped config.h.in has ++dnl #undef NAME_MAX /* KEEP_UNDEF_HERE override system value */ ++dnl ahead of this + (echo 1 > /tmp/conftest9012345) 2>/dev/null + (echo 2 > /tmp/conftest9012346) 2>/dev/null + val=`cat /tmp/conftest9012345 2>/dev/null` +@@ -1192,6 +1347,10 @@ + rm -f /tmp/conftest* + + AC_MSG_CHECKING(for vsprintf) ++AH_TEMPLATE([USEVARARGS], ++[If your system has vsprintf() and requires the use of the macros in ++ "varargs.h" to use functions with variable arguments, ++ define USEVARARGS.]) + AC_TRY_LINK([#include <stdarg.h>],[va_list valist; vsprintf(0,0,valist);], + [AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS)], + [AC_MSG_RESULT(no)]) +@@ -1199,12 +1358,19 @@ + AC_HEADER_DIRENT + + AC_MSG_CHECKING(for setenv) ++AH_TEMPLATE([USESETENV], [If your system has setenv() and unsetenv() define USESETENV]) + AC_TRY_LINK(,[setenv((char *)0,(char *)0);unsetenv((char *)0);], AC_MSG_RESULT(yes);AC_DEFINE(USESETENV), + AC_MSG_RESULT(no) + AC_MSG_CHECKING(for putenv) ++AH_TEMPLATE([NEEDPUTENV], ++[If your system does not come with a setenv()/putenv()/getenv() ++ functions, you may bring in our own code by defining NEEDPUTENV.]) + AC_TRY_LINK(,[putenv((char *)0);unsetenv((char *)0);], AC_MSG_RESULT(yes) , AC_MSG_RESULT(no);AC_DEFINE(NEEDPUTENV) + )) + AC_MSG_CHECKING([for nl_langinfo(CODESET)]) ++AH_TEMPLATE([HAVE_NL_LANGINFO], ++[define HAVE_NL_LANGINFO if your system has the nl_langinfo() call ++ and <langinfo.h> defines CODESET.]) + AC_TRY_LINK([ + #include <langinfo.h> + ],[nl_langinfo(CODESET);], AC_MSG_RESULT(yes);AC_DEFINE(HAVE_NL_LANGINFO), AC_MSG_RESULT(no)) +@@ -1254,7 +1420,8 @@ + dnl Ptx bug workaround -- insert -lc after -ltermcap + test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq" + +-AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.)) ++AC_MSG_CHECKING(compiler sanity) ++AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.), AC_MSG_WARN(Skipping test due to crosscompilation)) + + ETCSCREENRC="\"/usr/local/etc/screenrc\"" + if test -n "$prefix"; then diff --git a/app-misc/screen/files/screen-4.0.3_p20070403-map.patch b/app-misc/screen/files/screen-4.0.3_p20070403-map.patch new file mode 100644 index 0000000..13ce119 --- /dev/null +++ b/app-misc/screen/files/screen-4.0.3_p20070403-map.patch @@ -0,0 +1,13 @@ +diff --git a/src/termcap.c b/src/termcap.c +index 01082cb..b96497d 100644 +--- a/src/termcap.c ++++ b/src/termcap.c +@@ -548,8 +548,6 @@ int map; + else + break; + } +- if (n < KMAP_KEYS) +- domap = 1; + if (map == 0 && domap) + return 0; + if (map && !domap) diff --git a/app-misc/screen/files/screenrc b/app-misc/screen/files/screenrc new file mode 100644 index 0000000..861a1d7 --- /dev/null +++ b/app-misc/screen/files/screenrc @@ -0,0 +1,356 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# /etc/screenrc +# +# This is the system wide screenrc. +# +# You can use this file to change the default behavior of screen system wide +# or copy it to ~/.screenrc and use it as a starting point for your own +# settings. +# +# Commands in this file are used to set options, bind screen functions to +# keys, redefine terminal capabilities, and to automatically establish one or +# more windows at the beginning of your screen session. +# +# This is not a comprehensive list of options, look at the screen manual for +# details on everything that you can put in this file. +# +# + +# ============================================================================== +# SCREEN SETTINGS +# ============================================================================== + +# ESCAPE - the COMMAND CHARACTER +# =============================================================== +# escape ^aa # default +# escape ^pp # suggested binding for emacs users + + +# PASSWORD +# =============================================================== +# This commands sets the *internal* password for the screen session. +# WARNING!! If this is set then a "lock" command will only let you in to the +# session after you enter the user's account password and then *also* +# the internal password for that session. This gives additional safety but, +# if you forget the internal password then you cannot resume your session. +# Use :password to generate a password +# password ODSJQf.4IJN7E # "1234" + + +# VARIABLES +# =============================================================== +# No annoying audible bell, using "visual bell" +# vbell on # default: off +# vbell_msg " -- Bell,Bell!! -- " # default: "Wuff,Wuff!!" + +# Automatically detach on hangup. + autodetach on # default: on + +# Don't display the copyright page + startup_message off # default: on + +# Uses nethack-style messages +# nethack on # default: off + +# Affects the copying of text regions + crlf off # default: off + +# Enable/disable multiuser mode. Standard screen operation is singleuser. +# In multiuser mode the commands acladd, aclchg, aclgrp and acldel can be used +# to enable (and disable) other user accessing this screen session. +# Requires suid-root. + multiuser off + +# Change default scrollback value for new windows + defscrollback 1000 # default: 100 + +# Define the time that all windows monitored for silence should +# wait before displaying a message. Default 30 seconds. + silencewait 15 # default: 30 + +# bufferfile: The file to use for commands +# "readbuf" ('<') and "writebuf" ('>'): + bufferfile $HOME/.screen_exchange +# +# hardcopydir: The directory which contains all hardcopies. +# hardcopydir ~/.hardcopy +# hardcopydir ~/.screen +# +# shell: Default process started in screen's windows. +# Makes it possible to use a different shell inside screen +# than is set as the default login shell. +# If begins with a '-' character, the shell will be started as a login shell. +# shell zsh +# shell bash +# shell ksh + shell -$SHELL + +# shellaka '> |tcsh' +# shelltitle '$ |bash' + +# emulate .logout message + pow_detach_msg "Screen session of \$LOGNAME \$:cr:\$:nl:ended." + +# caption always " %w --- %c:%s" +# caption always "%3n %t%? @%u%?%? [%h]%?%=%c" + +# advertise hardstatus support to $TERMCAP +# termcapinfo * '' 'hs:ts=\E_:fs=\E\\:ds=\E_\E\\' + +# set every new windows hardstatus line to somenthing descriptive +# defhstatus "screen: ^En (^Et)" + +# don't kill window after the process died +# zombie "^[" + +# ignore displays that block on output +defnonblock on + +# XTERM TWEAKS +# =============================================================== + +# xterm understands both im/ic and doesn't have a status line. +# Note: Do not specify im and ic in the real termcap/info file as +# some programs (e.g. vi) will not work anymore. + termcap xterm hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l + terminfo xterm hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l + +# 80/132 column switching must be enabled for ^AW to work +# change init sequence to not switch width + termcapinfo xterm Z0=\E[?3h:Z1=\E[?3l:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;4;6l + +# Make the output buffer large for (fast) xterms. +# termcapinfo xterm* OL=10000 + termcapinfo xterm* OL=100 + +# tell screen that xterm can switch to dark background and has function +# keys. + termcapinfo xterm 'VR=\E[?5h:VN=\E[?5l' + termcapinfo xterm 'k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~' + termcapinfo xterm 'kh=\EOH:kI=\E[2~:kD=\E[3~:kH=\EOF:kP=\E[5~:kN=\E[6~' + +# special xterm hardstatus: use the window title. + termcapinfo xterm 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007' + +#terminfo xterm 'vb=\E[?5h$<200/>\E[?5l' + termcapinfo xterm 'vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l' + +# emulate part of the 'K' charset + termcapinfo xterm 'XC=K%,%\E(B,[\304,\\\\\326,]\334,{\344,|\366,}\374,~\337' + +# xterm-52 tweaks: +# - uses background color for delete operations + termcapinfo xterm* be + +# Do not use xterm's alternative window buffer, it breaks scrollback (see bug #61195) + termcapinfo xterm|xterms|xs ti@:te=\E[2J + +# WYSE TERMINALS +# =============================================================== + +#wyse-75-42 must have flow control (xo = "terminal uses xon/xoff") +#essential to have it here, as this is a slow terminal. + termcapinfo wy75-42 xo:hs@ + +# New termcap sequences for cursor application mode. + termcapinfo wy* CS=\E[?1h:CE=\E[?1l:vi=\E[?25l:ve=\E[?25h:VR=\E[?5h:VN=\E[?5l:cb=\E[1K:CD=\E[1J + + +# OTHER TERMINALS +# =============================================================== + +# make hp700 termcap/info better + termcapinfo hp700 'Z0=\E[?3h:Z1=\E[?3l:hs:ts=\E[62"p\E[0$~\E[2$~\E[1$}:fs=\E[0}\E[61"p:ds=\E[62"p\E[1$~\E[61"p:ic@' + +# Extend the vt100 desciption by some sequences. + termcap vt100* ms:AL=\E[%dL:DL=\E[%dM:UP=\E[%dA:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC + terminfo vt100* ms:AL=\E[%p1%dL:DL=\E[%p1%dM:UP=\E[%p1%dA:DO=\E[%p1%dB:LE=\E[%p1%dD:RI=\E[%p1%dC + termcapinfo linux C8 +# old rxvt versions also need this +# termcapinfo rxvt C8 + + +# KEYBINDINGS +# ============================================================== +# The "bind" command assign keys to (internal) commands +# SCREEN checks all the keys you type; you type the key +# which is known as the "command character" then SCREEN +# eats this key, too, and checks whether this key is +# "bound" to a command. If so then SCREEN will execute it. +# +# The command "bind" allows you to chose which keys +# will be assigned to the commands. +# +# Some commands are bound to several keys - +# usually to both some letter and its corresponding +# control key combination, eg the command +# "(create) screen" is bound to both 'c' and '^C'. +# +# The following list shows the default bindings: +# +# break ^B b +# clear C +# colon : +# copy ^[ [ +# detach ^D d +# digraph ^V +# displays * +# dumptermcap . +# fit F +# flow ^F f +# focus ^I +# hardcopy h +# help ? +# history { } +# info i +# kill K k +# lastmsg ^M m +# license , +# log H +# login L +# meta x +# monitor M +# next ^@ ^N sp n +# number N +# only Q +# other ^X +# pow_break B +# pow_detach D +# prev ^H ^P p ^? +# quit \ +# readbuf < +# redisplay ^L l +# remove X +# removebuf = +# reset Z +# screen ^C c +# select " ' +# silence _ +# split S +# suspend ^Z z +# time ^T t +# title A +# vbell ^G +# version v +# width W +# windows ^W w +# wrap ^R r +# writebuf > +# xoff ^S s +# xon ^Q q +# ^] paste . +# - select - +# 0 select 0 +# 1 select 1 +# 2 select 2 +# 3 select 3 +# 4 select 4 +# 5 select 5 +# 6 select 6 +# 7 select 7 +# 8 select 8 +# 9 select 9 +# I login on +# O login off +# ] paste . +# + +# And here are the default bind commands if you need them: +# +# bind A title +# bind C clear +# bind D pow_detach +# bind F fit +# bind H log +# bind I login on +# bind K kill +# bind L login +# bind M monitor +# bind N number +# bind O login off +# bind Q only +# bind S split +# bind W width +# bind X remove +# bind Z reset + +# Let's remove some dangerous key bindings ... + bind k + bind ^k +# bind . dumptermcap # default + bind . +# bind ^\ quit # default + bind ^\ +# bind \\ quit # default + bind \\ +# bind ^h ??? # default + bind ^h +# bind h hardcopy # default + bind h + +# ... and make them better. + bind 'K' kill + bind 'I' login on + bind 'O' login off + bind '}' history + +# Yet another hack: +# Prepend/append register [/] to the paste if ^a^] is pressed. +# This lets me have autoindent mode in vi. + register [ "\033:se noai\015a" + register ] "\033:se ai\015a" + bind ^] paste [.] + + +# hardstatus alwaysignore +# hardstatus alwayslastline "%Lw" + +# Resize the current region. The space will be removed from or added to +# the region below or if there's not enough space from the region above. + bind = resize = + bind + resize +3 + bind - resize -3 +# bind _ resize max +# +# attrcolor u "-u b" +# attrcolor b "R" + +# STARTUP SCREENS +# =============================================================== +# Defines the time screen delays a new message when one message +# is currently displayed. The default is 1 second. +# msgminwait 2 + +# Time a message is displayed if screen is not disturbed by +# other activity. The dafault is 5 seconds: +# msgwait 2 + +# Briefly show the version number of this starting +# screen session - but only for *one* second: +# msgwait 1 +# version + +# Welcome the user: +# echo "welcome :-)" +# echo "I love you today." + +# Uncomment one/some following lines to automatically let +# SCREEN start some programs in the given window numbers: +# screen -t MAIL 0 mutt +# screen -t EDIT 1 vim +# screen -t GOOGLE 2 links http://www.google.com +# screen -t NEWS 3 slrn +# screen -t WWW 4 links http://www.math.fu-berlin.de/~guckes/ +# screen 5 +# screen 6 + +# Set the environment variable var to value string. If only var is specified, +# you'll be prompted to enter a value. If no parameters are specified, +# you'll be prompted for both variable and value. The environment is +# inherited by all subsequently forked shells. +# setenv PROMPT_COMMAND 'echo -n -e "\033k\033\134"' + +# Don't you want to start programs which need a DISPLAY ? +# setenv DISPLAY '' diff --git a/app-misc/screen/metadata.xml b/app-misc/screen/metadata.xml new file mode 100644 index 0000000..92b3c20 --- /dev/null +++ b/app-misc/screen/metadata.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>shell-tools</herd> +<maintainer> + <email>swegener@gentoo.org</email> + <description>Primary Maintainer</description> +</maintainer> +<longdescription> +Screen is a full-screen window manager that multiplexes a physical terminal +between several processes, typically interactive shells. Each virtual terminal +provides the functions of the DEC VT100 terminal and, in addition, several +control functions from the ANSI X3.64 (ISO 6429) and ISO 2022 standards (e.g., +insert/delete line and support for multiple character sets). There is a +scrollback history buffer for each virtual terminal and a copy-and-paste +mechanism that allows the user to move text regions between windows. When screen +is called, it creates a single window with a shell in it (or the specified +command) and then gets out of your way so that you can use the program as you +normally would. Then, at any time, you can create new (full-screen) windows with +other programs in them (including more shells), kill the current window, view a +list of the active windows, turn output logging on and off, copy text between +windows, view the scrollback history, switch between windows, etc. All windows +run their programs completely independent of each other. Programs continue to +run when their window is currently not visible and even when the whole screen +session is detached from the users terminal. +</longdescription> +<use> + <flag name='multiuser'>Enable multiuser support (by setting correct + permissions)</flag> + <flag name='nethack'>Express error messages in nethack style</flag> +</use> +</pkgmetadata> diff --git a/app-misc/screen/screen-4.0.3.ebuild b/app-misc/screen/screen-4.0.3.ebuild new file mode 100644 index 0000000..16681c5 --- /dev/null +++ b/app-misc/screen/screen-4.0.3.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3.ebuild,v 1.18 2008/06/07 19:05:56 swegener Exp $ + +WANT_AUTOCONF="2.5" + +inherit eutils flag-o-matic toolchain-funcs pam autotools + +DESCRIPTION="Screen is a full-screen window manager that multiplexes a physical terminal between several processes" +HOMEPAGE="http://www.gnu.org/software/screen/" +SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +IUSE="debug nethack pam selinux multiuser" + +RDEPEND=">=sys-libs/ncurses-5.2 + pam? ( virtual/pam ) + selinux? ( + sec-policy/selinux-screen + >=sec-policy/selinux-base-policy-20050821 + )" +DEPEND="${RDEPEND}" + +pkg_setup() { + # Make sure utmp group exists, as it's used later on. + enewgroup utmp 406 +} + +src_unpack() { + unpack ${A} + cd "${S}" + + # Bug 34599: integer overflow in 4.0.1 + # (Nov 29 2003 -solar) + epatch "${FILESDIR}"/screen-4.0.1-int-overflow-fix.patch + + # Bug 31070: configure problem which affects alpha + # (13 Jan 2004 agriffis) + epatch "${FILESDIR}"/screen-4.0.1-vsprintf.patch + + # uclibc doesnt have sys/stropts.h + if ! (echo '#include <sys/stropts.h>' | $(tc-getCC) -E - &>/dev/null) ; then + epatch "${FILESDIR}"/4.0.2-no-pty.patch + fi + + # Don't use utempter even if it is found on the system + epatch "${FILESDIR}"/4.0.2-no-utempter.patch + + # Don't link against libelf even if it is found on the system + epatch "${FILESDIR}"/4.0.2-no-libelf.patch + + # Patch for time function on 64bit systems + epatch "${FILESDIR}"/4.0.2-64bit-time.patch + + # Patch that makes %u work for windowlist -b formats + epatch "${FILESDIR}"/4.0.2-windowlist-multiuser-fix.patch + + # Open tty in non-blocking mode + epatch "${FILESDIR}"/4.0.2-nonblock.patch + + # compability for sys-devel/autoconf-2.62 + epatch "${FILESDIR}"/screen-4.0.3-config.h-autoconf-2.62.patch + + # crosscompile patch + if tc-is-cross-compiler ; then + epatch "${FILESDIR}"/"${P}"-crosscompile.patch + fi + + + + # Allow for more rendition (color/attribute) changes in status bars + sed -i \ + -e "s:#define MAX_WINMSG_REND 16:#define MAX_WINMSG_REND 64:" \ + screen.c \ + || die "sed screen.c failed" + + # Fix manpage. + sed -i \ + -e "s:/usr/local/etc/screenrc:/etc/screenrc:g" \ + -e "s:/usr/local/screens:/var/run/screen:g" \ + -e "s:/local/etc/screenrc:/etc/screenrc:g" \ + -e "s:/etc/utmp:/var/run/utmp:g" \ + -e "s:/local/screens/S-:/var/run/screen/S-:g" \ + doc/screen.1 \ + || die "sed doc/screen.1 failed" + + # reconfigure + eautoconf +} + +src_compile() { + append-flags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}" + + use nethack || append-flags "-DNONETHACK" + use debug && append-flags "-DDEBUG" + + econf \ + --with-socket-dir=/var/run/screen \ + --with-sys-screenrc=/etc/screenrc \ + --with-pty-mode=0620 \ + --with-pty-group=5 \ + --enable-rxvt_osc \ + --enable-telnet \ + --enable-colors256 \ + $(use_enable pam) \ + || die "econf failed" + + # Second try to fix bug 12683, this time without changing term.h + # The last try seemed to break screen at run-time. + # (16 Jan 2003 agriffis) + LC_ALL=POSIX make term.h || die "Failed making term.h" + + emake || die "emake failed" +} + +src_install() { + dobin screen || die "dobin failed" + keepdir /var/run/screen || die "keepdir failed" + + if use multiuser + then + fperms 4755 /usr/bin/screen || die "fperms failed" + else + fowners root:utmp /{usr/bin,var/run}/screen || die "fowners failed" + fperms 2755 /usr/bin/screen || die "fperms failed" + fi + + insinto /usr/share/screen + doins terminfo/{screencap,screeninfo.src} || die "doins failed" + insinto /usr/share/screen/utf8encodings + doins utf8encodings/?? || die "doins failed" + insinto /etc + doins "${FILESDIR}"/screenrc || die "doins failed" + + pamd_mimic_system screen auth || die "pamd_mimic_system failed" + + dodoc \ + README ChangeLog INSTALL TODO NEWS* patchlevel.h \ + doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} \ + || die "dodoc failed" + + doman doc/screen.1 || die "doman failed" + doinfo doc/screen.info* || die "doinfo failed" +} + +pkg_postinst() { + if use multiuser + then + chown root:0 "${ROOT}"/var/run/screen + chmod 0755 "${ROOT}"/var/run/screen + else + chown root:utmp "${ROOT}"/var/run/screen + chmod 0775 "${ROOT}"/var/run/screen + fi + + elog "Some dangerous key bindings have been removed or changed to more safe values." + elog "We enable some xterm hacks in our default screenrc, which might break some" + elog "applications. Please check /etc/screenrc for information on these changes." +} diff --git a/app-misc/tangogps/Manifest b/app-misc/tangogps/Manifest new file mode 100644 index 0000000..bf30dd8 --- /dev/null +++ b/app-misc/tangogps/Manifest @@ -0,0 +1,2 @@ +DIST tangogps-0.9.3.tar.gz 435517 RMD160 a8f3418c770e0915275aa8a253e0cfbdc55ff2d1 SHA1 08a78b535db38970c25153bbb5322e579dd94120 SHA256 d2a107e3a5ceaeeb15ab2e3d7cd308653b4ded8aaf8d3c0e0be3b64ba4e17cfc +EBUILD tangogps-0.9.3.ebuild 584 RMD160 3e17e5706352b76c7e7baf9dadc48db23929dc8b SHA1 0325ab9dc296c8d50a35421c78b445823d23ff10 SHA256 4cf4e735525c108702e5ef33f831de6a30e3b6f5b3b642d951f53ceedd506b65 diff --git a/app-misc/tangogps/tangogps-0.9.3.ebuild b/app-misc/tangogps/tangogps-0.9.3.ebuild new file mode 100644 index 0000000..62960d9 --- /dev/null +++ b/app-misc/tangogps/tangogps-0.9.3.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="tangoGPS is a lightweight and fast mapping application." +HOMEPAGE="http://www.tangogps.org/" +SRC_URI="http://www.tangogps.org/downloads/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~arm" +IUSE="" + +RDEPEND="x11-libs/gtk+ + sys-apps/dbus + gnome-base/gconf + net-misc/curl + >=sci-geosciences/gpsd-2.34 + >=dev-db/sqlite-3" +DEPEND="sys-devel/gettext + ${RDEPEND}" + +src_install() { + emake DESTDIR="${D}" install || die "install failed" +} + diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest new file mode 100644 index 0000000..673a751 --- /dev/null +++ b/dev-libs/dbus-glib/Manifest @@ -0,0 +1,5 @@ +AUX dbus-glib-configurable-examples.patch 2117 RMD160 cd51f89e777bb8d39e3a96aafa7262211dc1c743 SHA1 3f35b4d59d1eca660607fa703185e1e63760a103 SHA256 0267eca8112680b3751b4a213c6c57038ec413e44e35c259d77a3ee35581575d +AUX dbus-glib-crosscompile-dbus-binding-tool.patch 3731 RMD160 ec06673e07c29fb08e524e07724ffb705dd2857c SHA1 0af80b48f8da83ad20e83fb60f82f97c57ee7bcd SHA256 da0f54ee267d962ec3011bc20a5a9bad02b32d8dabbe9b368a41fa795b78e947 +AUX dbus-glib-introspection.patch 2572 RMD160 38798ef61f4145d48e16be64888c3bfb14cadf35 SHA1 8a6e76045ffc94b269b496df60988ed3b0b61849 SHA256 3c24232d968a1f60f26bf364a5f5ff140c82307f8696877996c8602a48c7984d +DIST dbus-glib-0.76.tar.gz 667547 RMD160 d01b5ef85c3e2717495849fdf8378bcf16c07f31 SHA1 f7bfe7c394559bee12f0adfffd333304d471779a SHA256 8bc083faaf3efdd444a8a44bbcbfea501a7b547736fda3c2d83bfdc9b5b672a3 +EBUILD dbus-glib-0.76.ebuild 2098 RMD160 174d735a504786e8ee569ff1ef06b210e26071d7 SHA1 2c2d13e76e83d3e7e0fda67e97fe62734a4e5dbb SHA256 15751c40b754ac71ddb3a51a597f241afc0cf1126a8c78c82a673813f0ffb712 diff --git a/dev-libs/dbus-glib/dbus-glib-0.76.ebuild b/dev-libs/dbus-glib/dbus-glib-0.76.ebuild new file mode 100644 index 0000000..1edb651 --- /dev/null +++ b/dev-libs/dbus-glib/dbus-glib-0.76.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.76.ebuild,v 1.1 2008/08/15 13:47:27 cardoe Exp $ + +inherit eutils multilib autotools + +DESCRIPTION="D-Bus bindings for glib" +HOMEPAGE="http://dbus.freedesktop.org/" +SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz" + +LICENSE="|| ( GPL-2 AFL-2.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="doc selinux debug" + +RDEPEND=">=sys-apps/dbus-1.1.0 + >=dev-libs/glib-2.6 + selinux? ( sys-libs/libselinux ) + >=dev-libs/libxml2-2.6.21" + # expat code now sucks.. libxml2 is the default +DEPEND="${RDEPEND} + dev-util/pkgconfig + doc? ( app-doc/doxygen app-text/xmlto )" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${PN}-introspection.patch + + # If we are crosscompiling we have to use the host version of the + # dbus-binding-tool, because it is executed during the make process. + epatch "${FILESDIR}/${PN}-configurable-examples.patch" + epatch "${FILESDIR}/${PN}-crosscompile-dbus-binding-tool.patch" + + eautoreconf || die "eautoreconf failed" +} + +src_compile() { + local myconf="" + + # We can skip the examples dir, because nothing of it is installed anyway + myconf="${myconf} --disable-examples" + + econf \ + $(use_enable selinux) \ + $(use_enable debug verbose-mode) \ + $(use_enable debug checks) \ + $(use_enable debug asserts) \ + --with-xml=libxml \ + --with-system-pid-file=/var/run/dbus.pid \ + --with-system-socket=/var/run/dbus/system_bus_socket \ + --with-session-socket-dir=/tmp \ + --with-dbus-user=messagebus \ + --localstatedir=/var \ + $(use_enable doc doxygen-docs) \ + --disable-xml-docs \ + ${myconf} \ + || die "econf failed" + + # after the compile, it uses a selinuxfs interface to + # check if the SELinux policy has the right support + use selinux && addwrite /selinux/access + + emake || die "make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + dodoc AUTHORS ChangeLog HACKING NEWS README +} diff --git a/dev-libs/dbus-glib/files/dbus-glib-configurable-examples.patch b/dev-libs/dbus-glib/files/dbus-glib-configurable-examples.patch new file mode 100644 index 0000000..886de35 --- /dev/null +++ b/dev-libs/dbus-glib/files/dbus-glib-configurable-examples.patch @@ -0,0 +1,46 @@ +Add a conditional to switch off the build of the package examples. + +--- configure.ac 2008-09-17 16:15:35.000000000 +0200 ++++ configure.ac.new 2008-09-17 16:19:07.000000000 +0200 +@@ -47,6 +47,7 @@ + AC_ISC_POSIX + AC_HEADER_STDC + ++AC_ARG_ENABLE(examples, AS_HELP_STRING([--enable-examples],[compile example code]),enable_examples=$enableval,enable_examples=$USE_MAINTAINER_MODE) + AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests],[enable unit test code]),enable_tests=$enableval,enable_tests=$USE_MAINTAINER_MODE) + AC_ARG_ENABLE(ansi, AS_HELP_STRING([--enable-ansi],[enable -ansi -pedantic gcc flags]),enable_ansi=$enableval,enable_ansi=no) + AC_ARG_ENABLE(verbose-mode, AS_HELP_STRING([--enable-verbose-mode],[support verbose debug mode]),enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE) +@@ -59,6 +60,13 @@ + + AC_ARG_WITH(introspect-xml, AS_HELP_STRING([--with-introspect-xml=[filename]],[Pass in a pregenerated dbus daemon introspection xml file (as generated by 'dbus-daemon --introspect') to use instead of querying the installed dbus daemon])) + ++dnl DBUS_BUILD_EXAMPLES controls wether we want to built the examples ++dnl in the examples/ subdir ++AM_CONDITIONAL(DBUS_BUILD_EXAMPLES, test x$enable_examples = xyes) ++if test x$enable_examples = xyes; then ++ AC_DEFINE(DBUS_BUILD_EXAMPLES,1,[Build example code]) ++fi ++ + dnl DBUS_BUILD_TESTS controls unit tests built in to .c files + dnl and also some stuff in the test/ subdir + AM_CONDITIONAL(DBUS_BUILD_TESTS, test x$enable_tests = xyes) +@@ -861,6 +869,7 @@ + echo " + Maintainer mode: ${USE_MAINTAINER_MODE} + gcc coverage profiling: ${enable_gcov} ++ Building example code: ${enable_examples} + Building unit tests: ${enable_tests} + Building verbose mode: ${enable_verbose_mode} + Building assertions: ${enable_asserts} + +--- dbus/Makefile.am 2008-05-14 12:21:15.000000000 +0200 ++++ dbus/Makefile.am.new 2008-09-17 16:34:01.000000000 +0200 +@@ -1,4 +1,8 @@ ++if DBUS_BUILD_EXAMPLES + SUBDIRS = . examples ++else ++SUBDIRS = ++endif + + INCLUDES = \ + -I$(top_srcdir) \ diff --git a/dev-libs/dbus-glib/files/dbus-glib-crosscompile-dbus-binding-tool.patch b/dev-libs/dbus-glib/files/dbus-glib-crosscompile-dbus-binding-tool.patch new file mode 100644 index 0000000..7242859 --- /dev/null +++ b/dev-libs/dbus-glib/files/dbus-glib-crosscompile-dbus-binding-tool.patch @@ -0,0 +1,91 @@ +We need to build the dbus-binding-tool with the host toolchain, +because we have to execute it later during the building process. + +--- configure.ac 2008-06-05 20:55:24.000000000 +0200 ++++ configure.ac.new 2008-09-17 14:09:58.000000000 +0200 +@@ -78,6 +78,9 @@ + AC_DEFINE(G_DISABLE_CHECKS,1,[Disable GLib public API sanity checking]) + fi + ++dnl Check if we are crosscompiling ++AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ]) ++ + #### gcc warning flags + + AC_DEFUN([AC_CC_TRY_FLAG], [ + +--- tools/Makefile.am 2008-09-17 16:57:54.000000000 +0200 ++++ tools/Makefile.am.new 2008-09-17 16:59:55.000000000 +0200 +@@ -3,8 +3,13 @@ + nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h + libdbus_glibdir = $(includedir)/dbus-1.0/dbus + ++if CROSS_COMPILING ++dbus-glib-bindings.h: dbus-bus-introspect.xml ++ dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml ++else + dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT) + $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml ++endif + + BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml + + +--- dbus/examples/Makefile.am 2008-05-14 12:21:15.000000000 +0200 ++++ dbus/examples/Makefile.am.new 2008-09-17 17:04:42.000000000 +0200 +@@ -1,5 +1,11 @@ + SUBDIRS = . statemachine + ++if CROSS_COMPILING ++DBUS_BINDING_TOOL=dbus-binding-tool ++else ++DBUS_BINDING_TOOL=$(top_builddir)/dbus/dbus-binding-tool ++endif ++ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ +@@ -21,7 +27,7 @@ + BUILT_SOURCES = example-service-glue.h + + example-service-glue.h: example-service.xml +- $(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml ++ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml + + + ## Makefile.am bits for another client/server pair +@@ -37,7 +43,7 @@ + BUILT_SOURCES += example-signal-emitter-glue.h + + example-signal-emitter-glue.h: example-signal-emitter.xml +- $(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml ++ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml + + CLEANFILES = $(BUILT_SOURCES) + + +--- dbus/examples/statemachine/Makefile.am 2008-05-14 12:21:15.000000000 +0200 ++++ dbus/examples/statemachine/Makefile.am.new 2008-09-17 17:06:59.000000000 +0200 +@@ -1,3 +1,9 @@ ++if CROSS_COMPILING ++DBUS_BINDING_TOOL=dbus-binding-tool ++else ++DBUS_BINDING_TOOL=$(top_builddir)/dbus/dbus-binding-tool ++endif ++ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ +@@ -26,10 +32,10 @@ + BUILT_SOURCES = statemachine-server-glue.h statemachine-glue.h + + statemachine-server-glue.h: statemachine-server.xml +- $(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=$@ $< ++ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=sm_server --mode=glib-server --output=$@ $< + + statemachine-glue.h: statemachine.xml +- $(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=$@ $< ++ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=sm_object --mode=glib-server --output=$@ $< + + sm-marshal.c: Makefile sm-marshal.list + @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body > $@.tmp && mv $@.tmp $@ diff --git a/dev-libs/dbus-glib/files/dbus-glib-introspection.patch b/dev-libs/dbus-glib/files/dbus-glib-introspection.patch new file mode 100644 index 0000000..4e65bda --- /dev/null +++ b/dev-libs/dbus-glib/files/dbus-glib-introspection.patch @@ -0,0 +1,78 @@ +diff -Npru dbus-glib-0.71-orig/tools/dbus-bus-introspect.xml dbus-glib-0.71/tools/dbus-bus-introspect.xml +--- tools/dbus-bus-introspect.xml 1969-12-31 17:00:00.000000000 -0700 ++++ tools/dbus-bus-introspect.xml 2006-07-24 14:32:01.000000000 -0600 +@@ -0,0 +1,74 @@ ++ <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" ++"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> ++<node> ++ <interface name="org.freedesktop.DBus.Introspectable"> ++ <method name="Introspect"> ++ <arg name="data" direction="out" type="s"/> ++ </method> ++ </interface> ++ <interface name="org.freedesktop.DBus"> ++ <method name="RequestName"> ++ <arg direction="in" type="s"/> ++ <arg direction="in" type="u"/> ++ <arg direction="out" type="u"/> ++ </method> ++ <method name="ReleaseName"> ++ <arg direction="in" type="s"/> ++ <arg direction="out" type="u"/> ++ </method> ++ <method name="StartServiceByName"> ++ <arg direction="in" type="s"/> ++ <arg direction="in" type="u"/> ++ <arg direction="out" type="u"/> ++ </method> ++ <method name="Hello"> ++ <arg direction="out" type="s"/> ++ </method> ++ <method name="NameHasOwner"> ++ <arg direction="in" type="s"/> ++ <arg direction="out" type="b"/> ++ </method> ++ <method name="ListNames"> ++ <arg direction="out" type="as"/> ++ </method> ++ <method name="AddMatch"> ++ <arg direction="in" type="s"/> ++ </method> ++ <method name="RemoveMatch"> ++ <arg direction="in" type="s"/> ++ </method> ++ <method name="GetNameOwner"> ++ <arg direction="in" type="s"/> ++ <arg direction="out" type="s"/> ++ </method> ++ <method name="ListQueuedOwners"> ++ <arg direction="in" type="s"/> ++ <arg direction="out" type="as"/> ++ </method> ++ <method name="GetConnectionUnixUser"> ++ <arg direction="in" type="s"/> ++ <arg direction="out" type="u"/> ++ </method> ++ <method name="GetConnectionUnixProcessID"> ++ <arg direction="in" type="s"/> ++ <arg direction="out" type="u"/> ++ </method> ++ <method name="GetConnectionSELinuxSecurityContext"> ++ <arg direction="in" type="s"/> ++ <arg direction="out" type="ay"/> ++ </method> ++ <method name="ReloadConfig"> ++ </method> ++ <signal name="NameOwnerChanged"> ++ <arg type="s"/> ++ <arg type="s"/> ++ <arg type="s"/> ++ </signal> ++ <signal name="NameLost"> ++ <arg type="s"/> ++ </signal> ++ <signal name="NameAcquired"> ++ <arg type="s"/> ++ </signal> ++ </interface> ++</node> diff --git a/dev-libs/efreet/Manifest b/dev-libs/efreet/Manifest new file mode 100644 index 0000000..be4170f --- /dev/null +++ b/dev-libs/efreet/Manifest @@ -0,0 +1,4 @@ +DIST efreet-0.5.0.050.tar.bz2 1073655 RMD160 28a617a4190330d314ecf7dcf9bd9513f6c074ed SHA1 035924a985cddda3351c89a5dc5de08be7117daf SHA256 8b37787db93e4d7d3ff0db9044cde26f81c60304132bda946c2d767fbe485559 +EBUILD efreet-0.5.0.050.ebuild 723 RMD160 dcb59b140dd89ed963587afe6dec27228b6eaf4b SHA1 e534c5a0fcc6edc26491faf845afee09a981c8f0 SHA256 91e1e1e79c71adf12c8db17a8a33f92af6da29259d373e56f36e63fa7193f255 +EBUILD efreet-20081114.ebuild 887 RMD160 4c7b422061c9957ac7a8de13743dca2cc43a5b64 SHA1 311beeb94882045df5bf1f4c1405fdf97168f5f7 SHA256 15ddf4291075cf9e907966edebda3eff07c419dc9892a03d52178a27e471f8e0 +EBUILD efreet-20090108.ebuild 887 RMD160 adeb73080a802aa32db90940380a851b12d2e803 SHA1 90392fba7aafa3060b0bf8c501d8db6c11d2abb6 SHA256 79aacf82b9554112aee82eb113e1b537fd3833102bd053a6d15bf5ab710f6a62 diff --git a/dev-libs/efreet/efreet-0.5.0.050.ebuild b/dev-libs/efreet/efreet-0.5.0.050.ebuild new file mode 100644 index 0000000..d8ba350 --- /dev/null +++ b/dev-libs/efreet/efreet-0.5.0.050.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="The Enlightenment efreet library." +HOMEPAGE="http://enlightenment.org" +SRC_URI="http://download.enlightenment.org/snapshots/2008-09-25/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm ~x86 ~amd64" +IUSE="hiddenvisibility" + +RDEPEND=">=x11-libs/ecore-0.9.9" +DEPEND=">=dev-util/pkgconfig-0.9.0" + +src_compile() { + local myconf + + myconf="${myconf} + $(use_enable hiddenvisibility hidden-visibility)" + + econf ${myconf}|| die "Configuration failed" + emake || die "Make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + dodoc AUTHORS NEWS README +} diff --git a/dev-libs/efreet/efreet-20081114.ebuild b/dev-libs/efreet/efreet-20081114.ebuild new file mode 100644 index 0000000..9cda321 --- /dev/null +++ b/dev-libs/efreet/efreet-20081114.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="The Enlightenment efreet library." +HOMEPAGE="http://enlightenment.org" +ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/${PN}" +ESVN_REVISION="r37634" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm ~x86 ~amd64" +IUSE="hiddenvisibility" + +inherit autotools subversion + +RDEPEND=">=x11-libs/ecore-0.9.9" +DEPEND=">=dev-util/pkgconfig-0.9.0" + +src_unpack() { + subversion_src_unpack + + cd "${S}" + + touch README + touch ABOUT-NLS + + eautoreconf || die "Autoreconf failed" +} + +src_compile() { + local myconf + + myconf="${myconf} + $(use_enable hiddenvisibility hidden-visibility)" + + econf ${myconf}|| die "Configuration failed" + emake || die "Make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + dodoc AUTHORS NEWS README +} diff --git a/dev-libs/efreet/efreet-20090108.ebuild b/dev-libs/efreet/efreet-20090108.ebuild new file mode 100644 index 0000000..97b7fc0 --- /dev/null +++ b/dev-libs/efreet/efreet-20090108.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="The Enlightenment efreet library." +HOMEPAGE="http://enlightenment.org" +ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/${PN}" +ESVN_REVISION="r38500" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm ~x86 ~amd64" +IUSE="hiddenvisibility" + +inherit autotools subversion + +RDEPEND=">=x11-libs/ecore-0.9.9" +DEPEND=">=dev-util/pkgconfig-0.9.0" + +src_unpack() { + subversion_src_unpack + + cd "${S}" + + touch README + touch ABOUT-NLS + + eautoreconf || die "Autoreconf failed" +} + +src_compile() { + local myconf + + myconf="${myconf} + $(use_enable hiddenvisibility hidden-visibility)" + + econf ${myconf}|| die "Configuration failed" + emake || die "Make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + dodoc AUTHORS NEWS README +} diff --git a/dev-libs/eina/Manifest b/dev-libs/eina/Manifest new file mode 100644 index 0000000..ebc0613 --- /dev/null +++ b/dev-libs/eina/Manifest @@ -0,0 +1,3 @@ +EBUILD eina-20081014.ebuild 1039 RMD160 5871679868b6bff6d72421fa41a2272ee5ebb10c SHA1 31ee40a8b6c515ae4e3c7467ad0b96d6528724bc SHA256 87e3d36da529c99697fc6edffa05afef883a40d5c90e9efa8f7e5714535153cc +EBUILD eina-20081211.ebuild 1040 RMD160 f9a03e32ed5a14253fc52fa4cb52a677b6ec08ee SHA1 320c691ac82f4c698546e540236bc4e57317a404 SHA256 565751ee14f56b0ed4fddb24773202c0c74c52d1c891a40a3d31d6dee93dc501 +EBUILD eina-20090108.ebuild 1040 RMD160 91cd6febc9a936d77e61a86d8f68b2cfa6f91fc1 SHA1 182c4156af33d4631dcd08995cc386c254335f52 SHA256 49d5211afce6b05745ee54b8bcfb4bd38cd019f6015505038fa12bcdefa1ee44 diff --git a/dev-libs/eina/eina-20081014.ebuild b/dev-libs/eina/eina-20081014.ebuild new file mode 100644 index 0000000..b9e301f --- /dev/null +++ b/dev-libs/eina/eina-20081014.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="Enlightenment eina library" +HOMEPAGE="http://www.enlightenment.org/" +ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/${PN}" +ESVN_REVISION="r36658" +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" +IUSE="mmx sse sse2 alitvec threads doc" + +inherit autotools subversion + +RDEPEND="" +DEPEND=">=dev-util/pkgconfig-0.9.0" + +S="${WORKDIR}/${PN}" + +src_unpack() { + subversion_src_unpack + + cd "${S}" + + eautoreconf || die "eautoreconf failed" +} + +src_compile() { + local myconf + + myconf="${myconf} + $(use_enable mmx cpu-mmx) \ + $(use_enable sse cpu-sse) \ + $(use_enable sse2 cpu-sse2) \ + $(use_enable altivec cpu-altivec) \ + $(use_enable threads pthread) \ + $(use_enable doc)" + + econf $myconf || die "econf failed" + emake || die "emake failed" +} + +src_install () { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog COPYING NEWS README +} diff --git a/dev-libs/eina/eina-20081211.ebuild b/dev-libs/eina/eina-20081211.ebuild new file mode 100644 index 0000000..c560adb --- /dev/null +++ b/dev-libs/eina/eina-20081211.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="Enlightenment eina library" +HOMEPAGE="http://www.enlightenment.org/" +ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/${PN}" +ESVN_REVISION="r38104" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" +IUSE="mmx sse sse2 alitvec threads doc" + +inherit autotools subversion + +RDEPEND="" +DEPEND=">=dev-util/pkgconfig-0.9.0" + +S="${WORKDIR}/${PN}" + +src_unpack() { + subversion_src_unpack + + cd "${S}" + + eautoreconf || die "eautoreconf failed" +} + +src_compile() { + local myconf + + myconf="${myconf} + $(use_enable mmx cpu-mmx) \ + $(use_enable sse cpu-sse) \ + $(use_enable sse2 cpu-sse2) \ + $(use_enable altivec cpu-altivec) \ + $(use_enable threads pthread) \ + $(use_enable doc)" + + econf $myconf || die "econf failed" + emake || die "emake failed" +} + +src_install () { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog COPYING NEWS README +} diff --git a/dev-libs/eina/eina-20090108.ebuild b/dev-libs/eina/eina-20090108.ebuild new file mode 100644 index 0000000..991610a --- /dev/null +++ b/dev-libs/eina/eina-20090108.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="Enlightenment eina library" +HOMEPAGE="http://www.enlightenment.org/" +ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/${PN}" +ESVN_REVISION="r38500" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" +IUSE="mmx sse sse2 alitvec threads doc" + +inherit autotools subversion + +RDEPEND="" +DEPEND=">=dev-util/pkgconfig-0.9.0" + +S="${WORKDIR}/${PN}" + +src_unpack() { + subversion_src_unpack + + cd "${S}" + + eautoreconf || die "eautoreconf failed" +} + +src_compile() { + local myconf + + myconf="${myconf} + $(use_enable mmx cpu-mmx) \ + $(use_enable sse cpu-sse) \ + $(use_enable sse2 cpu-sse2) \ + $(use_enable altivec cpu-altivec) \ + $(use_enable threads pthread) \ + $(use_enable doc)" + + econf $myconf || die "econf failed" + emake || die "emake failed" +} + +src_install () { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog COPYING NEWS README +} diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest new file mode 100644 index 0000000..bd83a8d --- /dev/null +++ b/dev-libs/libxml2/Manifest @@ -0,0 +1,6 @@ +AUX libxml2-2.7.2-CVE-2008-422x.patch 2983 RMD160 7453758b6b37d9f892d495fe9671551cdcc0cc3e SHA1 d8e6e917b8012f770d5f5a9e28a0651c45ad025f SHA256 5f836f30669410d496dc8ceee60307724b2a536a99ed710e94a3c5562634f8b6 +DIST libxml2-2.7.2.tar.gz 4790639 RMD160 2b14531007a705679c7814618dc15baed62bc574 SHA1 750b2bcd4ee3bf8595baf97e1881f1a57b1ef363 SHA256 c01bd621f771cdee349877f55cc841a1bdfb206b2cf5c9aa62aa6a9680e61980 +DIST xsts-2002-01-16.tar.gz 6894439 RMD160 e8905fe1451a1c367b0104af24edca73bad1db08 SHA1 ca6344e6c47f8c28231f5b213d0c8deb0311a409 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914 +DIST xsts-2004-01-14.tar.gz 2761085 RMD160 faff2d7826e47ae9968564bc83dab1b54c5e4bf6 SHA1 5896c2aa2cda464246306c5cf0577ed506eefaab SHA256 09bdf9f81f381ebf9bc158a9472e498e896f7a02eb7461146e9abe1b9493ca17 +EBUILD libxml2-2.7.2-r1.ebuild 3710 RMD160 c83dcd37cbb284cf05c4a40a7d8992aa7689a805 SHA1 188f41a1c3276403bba8e805e77540264ce1e46f SHA256 cbace02d704c4f3f1a91cc0044b5d75a274f6f9122330fd26851066178551014 +EBUILD libxml2-2.7.2.ebuild 3628 RMD160 5e97d8e50c2887fb0e8c0632c05df9a7e70560e7 SHA1 22e8f4e2fcd1edd44d6b6d908133092da19e447c SHA256 07de8e4a5da5ad578c5662d17914e8f8401c064711ce1f3115d12886856fc539 diff --git a/dev-libs/libxml2/files/libxml2-2.7.2-CVE-2008-422x.patch b/dev-libs/libxml2/files/libxml2-2.7.2-CVE-2008-422x.patch new file mode 100644 index 0000000..cbfbc9e --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.7.2-CVE-2008-422x.patch @@ -0,0 +1,100 @@ +Mon Nov 17 16:56:18 CET 2008 Daniel Veillard <daniel@...> (upstream revision 3803) + + * SAX2.c parser.c: fix for CVE-2008-4226, a memory overflow + when building gigantic text nodes, and a bit of cleanup + to better handled out of memory problem in that code. + * tree.c: fix for CVE-2008-4225, lack of testing leads to + a busy loop test assuming one have enough core memory. + +Index: SAX2.c +=================================================================== +--- SAX2.c (revision 3802) ++++ SAX2.c (revision 3803) +@@ -11,6 +11,7 @@ + #include "libxml.h" + #include <stdlib.h> + #include <string.h> ++#include <limits.h> + #include <libxml/xmlmemory.h> + #include <libxml/tree.h> + #include <libxml/parser.h> +@@ -26,6 +27,11 @@ + #include <libxml/HTMLtree.h> + #include <libxml/globals.h> + ++/* Define SIZE_T_MAX unless defined through <limits.h>. */ ++#ifndef SIZE_T_MAX ++# define SIZE_T_MAX ((size_t)-1) ++#endif /* !SIZE_T_MAX */ ++ + /* #define DEBUG_SAX2 */ + /* #define DEBUG_SAX2_TREE */ + +@@ -2455,9 +2461,14 @@ + (xmlDictOwns(ctxt->dict, lastChild->content))) { + lastChild->content = xmlStrdup(lastChild->content); + } ++ if ((size_t)ctxt->nodelen > SIZE_T_MAX - (size_t)len || ++ (size_t)ctxt->nodemem + (size_t)len > SIZE_T_MAX / 2) { ++ xmlSAX2ErrMemory(ctxt, "xmlSAX2Characters overflow prevented"); ++ return; ++ } + if (ctxt->nodelen + len >= ctxt->nodemem) { + xmlChar *newbuf; +- int size; ++ size_t size; + + size = ctxt->nodemem + len; + size *= 2; +Index: tree.c +=================================================================== +--- tree.c (revision 3802) ++++ tree.c (revision 3803) +@@ -14,7 +14,7 @@ + #include "libxml.h" + + #include <string.h> /* for memset() only ! */ +- ++#include <limits.h> + #ifdef HAVE_CTYPE_H + #include <ctype.h> + #endif +@@ -6996,7 +6996,13 @@ + case XML_BUFFER_ALLOC_DOUBLEIT: + /*take care of empty case*/ + newSize = (buf->size ? buf->size*2 : size + 10); +- while (size > newSize) newSize *= 2; ++ while (size > newSize) { ++ if (newSize > UINT_MAX / 2) { ++ xmlTreeErrMemory("growing buffer"); ++ return 0; ++ } ++ newSize *= 2; ++ } + break; + case XML_BUFFER_ALLOC_EXACT: + newSize = size+10; +Index: parser.c +=================================================================== +--- parser.c (revision 3802) ++++ parser.c (revision 3803) +@@ -4142,6 +4142,9 @@ + line = ctxt->input->line; + col = ctxt->input->col; + } ++ /* something really bad happened in the SAX callback */ ++ if (ctxt->instate != XML_PARSER_CONTENT) ++ return; + } + ctxt->input->cur = in; + if (*in == 0xD) { +@@ -4222,6 +4225,9 @@ + } + } + nbchar = 0; ++ /* something really bad happened in the SAX callback */ ++ if (ctxt->instate != XML_PARSER_CONTENT) ++ return; + } + count++; + if (count > 50) { diff --git a/dev-libs/libxml2/libxml2-2.7.2-r1.ebuild b/dev-libs/libxml2/libxml2-2.7.2-r1.ebuild new file mode 100644 index 0000000..7d396b5 --- /dev/null +++ b/dev-libs/libxml2/libxml2-2.7.2-r1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.2-r1.ebuild,v 1.7 2008/11/24 17:02:41 ranger Exp $ + +inherit libtool flag-o-matic eutils + +DESCRIPTION="Version 2 of the library to manipulate XML files" +HOMEPAGE="http://www.xmlsoft.org/" + +LICENSE="MIT" +SLOT="2" +KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd" +IUSE="bootstrap build debug doc examples ipv6 python readline test" + +XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" +XSTS_NAME_1="xmlschema2002-01-16" +XSTS_NAME_2="xmlschema2004-01-14" +XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" +XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" + +SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz + test? ( + ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} + ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} )" + +RDEPEND="sys-libs/zlib + python? ( dev-lang/python ) + readline? ( sys-libs/readline )" + +DEPEND="${RDEPEND} + hppa? ( >=sys-devel/binutils-2.15.92.0.2 )" + +src_unpack() { + unpack ${P}.tar.gz + cd "${S}" + + # Fix for CVE-2008-4225 and CVE-2008-4226, bug 245960 + epatch "${FILESDIR}/${P}-CVE-2008-422x.patch" + + if use test; then + cp "${DISTDIR}/${XSTS_TARBALL_1}" \ + "${DISTDIR}/${XSTS_TARBALL_2}" \ + "${S}"/xstc/ \ + || die "Failed to install test tarballs" + fi + + epunt_cxx +} + +src_compile() { + # USE zlib support breaks gnome2 + # (libgnomeprint for instance fails to compile with + # fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002). + + # The meaning of the 'debug' USE flag does not apply to the --with-debug + # switch (enabling the libxml2 debug module). See bug #100898. + + # --with-mem-debug causes unusual segmentation faults (bug #105120). + + local myconf="--with-zlib \ + $(use_with debug run-debug) \ + $(use_with readline) \ + $(use_with readline history) \ + $(use_enable ipv6)" + + if use python; then + myconf="$myconf \ + --with-python=${SYSROOT}/usr" + fi + + # Please do not remove, as else we get references to PORTAGE_TMPDIR + # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. + elibtoolize + + # filter seemingly problematic CFLAGS (#26320) + filter-flags -fprefetch-loop-arrays -funroll-loops + + econf $myconf || die "Configuration failed" + + # Patching the Makefiles to respect get_libdir + # Fixes BUG #86766, please keep this. + # Danny van Dyk <kugelfang@gentoo.org> 2005/03/26 + for x in $(find "${S}" -name "Makefile") ; do + sed \ + -e "s|^\(PYTHON_SITE_PACKAGES\ =\ \/usr\/\).*\(\/python.*\)|\1$(get_libdir)\2|g" \ + -i ${x} \ + || die "sed failed" + done + + emake || die "Compilation failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + + dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* + + if ! use doc; then + rm -rf "${D}"/usr/share/gtk-doc + rm -rf "${D}"/usr/share/doc/${P}/html + fi + + if ! use examples; then + rm -rf "${D}/usr/share/doc/${P}/examples" + rm -rf "${D}/usr/share/doc/${PN}-python-${PV}/examples" + fi +} + +pkg_postinst() { + # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not + # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. + if [[ "${ROOT}" != "/" ]] + then + elog "Skipping XML catalog creation for stage building (bug #208887)." + else + # need an XML catalog, so no-one writes to a non-existent one + CATALOG="${ROOT}etc/xml/catalog" + + # we dont want to clobber an existing catalog though, + # only ensure that one is there + # <obz@gentoo.org> + if [ ! -e ${CATALOG} ]; then + [ -d "${ROOT}etc/xml" ] || mkdir -p "${ROOT}etc/xml" + /usr/bin/xmlcatalog --create > ${CATALOG} + einfo "Created XML catalog in ${CATALOG}" + fi + fi +} diff --git a/dev-libs/libxml2/libxml2-2.7.2.ebuild b/dev-libs/libxml2/libxml2-2.7.2.ebuild new file mode 100644 index 0000000..6ec9aa8 --- /dev/null +++ b/dev-libs/libxml2/libxml2-2.7.2.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.2.ebuild,v 1.7 2008/10/05 17:35:59 jer Exp $ + +inherit libtool flag-o-matic eutils + +DESCRIPTION="Version 2 of the library to manipulate XML files" +HOMEPAGE="http://www.xmlsoft.org/" + +LICENSE="MIT" +SLOT="2" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd" +IUSE="bootstrap build debug doc examples ipv6 python readline test" + +XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" +XSTS_NAME_1="xmlschema2002-01-16" +XSTS_NAME_2="xmlschema2004-01-14" +XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" +XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" + +SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz + test? ( + ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} + ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} )" + +RDEPEND="sys-libs/zlib + python? ( dev-lang/python ) + readline? ( sys-libs/readline )" + +DEPEND="${RDEPEND} + hppa? ( >=sys-devel/binutils-2.15.92.0.2 )" + +src_unpack() { + unpack ${P}.tar.gz + cd "${S}" + + if use test; then + cp "${DISTDIR}/${XSTS_TARBALL_1}" \ + "${DISTDIR}/${XSTS_TARBALL_2}" \ + "${S}"/xstc/ \ + || die "Failed to install test tarballs" + fi + + epunt_cxx +} + +src_compile() { + # USE zlib support breaks gnome2 + # (libgnomeprint for instance fails to compile with + # fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002). + + # The meaning of the 'debug' USE flag does not apply to the --with-debug + # switch (enabling the libxml2 debug module). See bug #100898. + + # --with-mem-debug causes unusual segmentation faults (bug #105120). + + local myconf="--with-zlib \ + $(use_with debug run-debug) \ + $(use_with readline) \ + $(use_with readline history) \ + $(use_enable ipv6) \ + $(use_enable python)" + + if use python; then + myconf="$myconf \ + --with-python=${SYSROOT}/usr" + fi + + + # Please do not remove, as else we get references to PORTAGE_TMPDIR + # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. + elibtoolize + + # filter seemingly problematic CFLAGS (#26320) + filter-flags -fprefetch-loop-arrays -funroll-loops + + econf $myconf || die "Configuration failed" + + # Patching the Makefiles to respect get_libdir + # Fixes BUG #86766, please keep this. + # Danny van Dyk <kugelfang@gentoo.org> 2005/03/26 + for x in $(find "${S}" -name "Makefile") ; do + sed \ + -e "s|^\(PYTHON_SITE_PACKAGES\ =\ \/usr\/\).*\(\/python.*\)|\1$(get_libdir)\2|g" \ + -i ${x} \ + || die "sed failed" + done + + emake || die "Compilation failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + + dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* + + if ! use doc; then + rm -rf "${D}"/usr/share/gtk-doc + rm -rf "${D}"/usr/share/doc/${P}/html + fi + + if ! use examples; then + rm -rf "${D}/usr/share/doc/${P}/examples" + rm -rf "${D}/usr/share/doc/${PN}-python-${PV}/examples" + fi +} + +pkg_postinst() { + # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not + # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. + if [[ "${ROOT}" != "/" ]] + then + elog "Skipping XML catalog creation for stage building (bug #208887)." + else + # need an XML catalog, so no-one writes to a non-existent one + CATALOG="${ROOT}etc/xml/catalog" + + # we dont want to clobber an existing catalog though, + # only ensure that one is there + # <obz@gentoo.org> + if [ ! -e ${CATALOG} ]; then + [ -d "${ROOT}etc/xml" ] || mkdir -p "${ROOT}etc/xml" + /usr/bin/xmlcatalog --create > ${CATALOG} + einfo "Created XML catalog in ${CATALOG}" + fi + fi +} diff --git a/dev-libs/popt/ChangeLog b/dev-libs/popt/ChangeLog new file mode 100644 index 0000000..f077fb9 --- /dev/null +++ b/dev-libs/popt/ChangeLog @@ -0,0 +1,240 @@ +# ChangeLog for dev-libs/popt +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.62 2008/04/18 04:37:48 flameeyes Exp $ + +*popt-1.14 (18 Apr 2008) + + 18 Apr 2008; Diego Pettenò <flameeyes@gentoo.org> +popt-1.14.ebuild: + Version bump, and while at it drop the libtool .la file. Bugs about _this + version_ can come my way for now. + +*popt-1.13 (07 Jan 2008) + + 07 Jan 2008; Ryan Hill <dirtyepic@gentoo.org> +popt-1.13.ebuild: + Version bump. Fixes redefinition errors in headers when building packages + like xulrunner with GCC 4.3. + +*popt-1.12 (09 Dec 2007) + + 09 Dec 2007; Mike Frysinger <vapier@gentoo.org> + +files/popt-1.12-scrub-lame-gettext.patch, +popt-1.12.ebuild: + Version bump #199160 by Sandro Bonazzola. + + 11 Jun 2007; Raúl Porcel <armin76@gentoo.org> popt-1.10.7.ebuild: + alpha stable wrt #161177 + + 14 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml: + add <herd>no-herd</herd> + + 12 May 2007; Joshua Kinard <kumba@gentoo.org> popt-1.10.7.ebuild: + Stable on mips. + + 05 Mar 2007; Sandro Bonazzola <sanchan@gentoo.org> ChangeLog: + Removing myself from metadata.xml as I'm stepping back. + + 20 Jan 2007; Jeroen Roovers <jer@gentoo.org> popt-1.10.7.ebuild: + Stable for HPPA (bug #161177). + + 15 Jan 2007; Mike Frysinger <vapier@gentoo.org> + +files/popt-1.10.7-scrub-lame-gettext.patch, popt-1.10.7.ebuild: + Remove pointless gettext check #161988 by Christian Heim. + + 13 Jan 2007; Mike Frysinger <vapier@gentoo.org> popt-1.10.7.ebuild: + Cleanup patches and drop requirement for autotools. + + 13 Jan 2007; nixnut <nixnut@gentoo.org> popt-1.10.4-r3.ebuild, + popt-1.10.7.ebuild: + Stable on ppc wrt bug 161177 + + 11 Jan 2007; Markus Rothe <corsair@gentoo.org> popt-1.10.7.ebuild: + Stable on ppc64; bug #161177 + + 11 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> popt-1.10.7.ebuild: + Stable on sparc + + 10 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org> popt-1.10.4-r3.ebuild, + popt-1.10.7.ebuild: + Stable on amd64/x86 wrt bug #161177. + + 10 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> popt-1.10.4-r3.ebuild: + Stable on sparc wrt #161177 + + 09 Jan 2007; Sandro Bonazzola <sanchan@gentoo.org> popt-1.7-r1.ebuild, + -popt-1.10.4-r1.ebuild, -popt-1.10.4-r2.ebuild: + Removed obsolete 1.10.4 ebuilds, updating 1.7-r1 ebuild for autotools eclass + changes. Fix again bug #148187. + +*popt-1.10.7 (06 Dec 2006) + + 06 Dec 2006; Sandro Bonazzola <sanchan@gentoo.org> +popt-1.10.7.ebuild: + Version bump (bug #121862) thanks to Timothy Redaelli <drizzt@gentoo.org>. + + 08 Nov 2006; Timothy Redaelli <drizzt@gentoo.org> popt-1.10.4-r3.ebuild: + Keyworded ~ppc, wrt bug 121862. + + 07 Nov 2006; Sandro Bonazzola <sanchan@gentoo.org> popt-1.10.4-r3.ebuild: + Readding dropped keywords. + +*popt-1.10.4-r3 (07 Nov 2006) + + 07 Nov 2006; Sandro Bonazzola <sanchan@gentoo.org> + +files/popt-1.10.4-regression.patch, metadata.xml, +popt-1.10.4-r3.ebuild: + Version bump, including a fix for a regression found by wormo@gentoo.org and + fixed with a patch provided by drizzt@gentoo.org, last fix needed for bug + #121862. + + 05 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> popt-1.10.4-r2.ebuild: + Add ~alpha keyword. + + 03 Nov 2006; Jason Wever <weeve@gentoo.org> popt-1.10.4-r2.ebuild: + Added ~sparc keyword wrt bug #121862. + + 02 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> popt-1.10.4-r2.ebuild: + Add versioned dependencies over autoconf/automake. + + 24 Oct 2006; Fabian Groffen <grobian@gentoo.org> popt-1.7-r1.ebuild, + popt-1.10.4-r1.ebuild, popt-1.10.4-r2.ebuild: + Dropped ppc-macos keyword, see you in prefix. + +*popt-1.10.4-r2 (21 Oct 2006) + + 21 Oct 2006; Sandro Bonazzola <sanchan@gentoo.org> + files/popt-1.10.4-nls.patch, popt-1.10.4-r1.ebuild, + +popt-1.10.4-r2.ebuild: + Removed nls patch from 1.10.4-r1 now DEPENDing on gettext. Added 1.10.4-r2 + masked for testing, nls patch updated discarding any gettext reference. + + 17 Oct 2006; Roy Marples <uberlord@gentoo.org> popt-1.10.4-r1.ebuild: + Added ~sparc-fbsd keyword. + + 12 Oct 2006; Sandro Bonazzola <sanchan@gentoo.org> + files/popt-1.10.4-lib64.patch: + lib64 patch updated with the one provided by Roy Marples fixing bug #150984. + The patch solves both multilib behaviour and lib6464 previously fixed. + + 09 Oct 2006; Sandro Bonazzola <sanchan@gentoo.org> + +files/popt-1.10.4-nls.patch, popt-1.10.4-r1.ebuild: + Fix bug #150543. Patch provided by opensolaris.org, ported from popt-1.7 and + adapted for gentoo. Original patch available here: + http://cvs.opensolaris.org/source/xref/jds/Solaris/patches/popt-01-xgettext.diff + + 01 Oct 2006; Guy Martin <gmsoft@gentoo.org> popt-1.10.4-r1.ebuild: + Stable on hppa. + + 21 Sep 2006; Fabian Groffen <grobian@gentoo.org> popt-1.10.4-r1.ebuild: + Remove ppc-macos hack, upstream does this already. Marked ~ppc-macos + + 19 Sep 2006; <antarus@gentoo.org> popt-1.7-r1.ebuild: + Adding dep on automake to popt to fix stage1 ebuilds + + 13 Sep 2006; Aron Griffis <agriffis@gentoo.org> popt-1.10.4-r1.ebuild: + Mark 1.10.4-r1 ~ia64. #121862 + + 12 Sep 2006; Markus Rothe <corsair@gentoo.org> popt-1.10.4-r1.ebuild: + Added ~ppc64; bug #121862 + + 12 Sep 2006; Joshua Jackson <tsunam@gentoo.org> popt-1.10.4-r1.ebuild: + adding ~x86 as requested + + 11 Sep 2006; Sandro Bonazzola <sanchan@gentoo.org> + files/popt-1.10.4-lib64.patch, popt-1.10.4-r1.ebuild: + Fixing configure.ac patch using ${EGREP} instead of grep, fixing autoreconf + issues. Thanks to SpanKY <vapier@gentoo.org> for reporting and solving the + issue. Fix bug #147133 + + 10 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> popt-1.10.4-r1.ebuild: + Add ~x86-fbsd keyword as per bug #121862. + +*popt-1.10.4-r1 (10 Sep 2006) + + 10 Sep 2006; Sandro Bonazzola <sanchan@gentoo.org> + +files/popt-1.10.4-lib64.patch, -popt-1.10.4.ebuild, + +popt-1.10.4-r1.ebuild: + ebuild bump fixing bug #146988, bug #147066, bug #147044. Many thanks to + Patrick McLean for the patches and Diego Pettenò for the package masking. + +*popt-1.10.4 (09 Sep 2006) + + 09 Sep 2006; Sandro Bonazzola <sanchan@gentoo.org> metadata.xml, + +popt-1.10.4.ebuild: + Version bump, intially only for ~amd64. Partially resolve bug# 121862. + Taking over maintainership of the package. + + 07 Sep 2006; Steve Dibb <beandog@gentoo.org> +metadata.xml: + Add metadata + + 30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> popt-1.7-r1.ebuild: + Add ~x86-fbsd keyword. + + 25 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/popt-1.7-nls.patch, popt-1.7-r1.ebuild: + Add patch to link to libintl when not using GLIBC; depend on virtual/libintl + when using nls. + + 10 May 2005; Mike Frysinger <vapier@gentoo.org> + +files/popt-1.7-missing-tests.patch, popt-1.7-r1.ebuild: + Add a patch by Ryan Hill to remove incomplete tests #71610. + + 26 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> popt-1.7-r1.ebuild: + update source in src_unpack; use emake; tidy + + 15 Jun 2004; <solar@gentoo.org> popt-1.7-r1.ebuild, + files/popt-1.7-uclibc.patch: + added uclibc patch for configure target + +*popt-1.7-r1 (20 Mar 2003) + + 27 Mar 2003; Seemant Kulleen <seemant@gentoo.org> popt-1.7-r1.ebuild: + ok, this one actually does disable nls and also has a mips fix + + 27 Mar 2003; Seemant Kulleen <seemant@gentoo.org> popt-1.7-r1.ebuild: + gettext is no longer a REQUIRED dependency, though it's a quirky way of + disabling it -- tsk tsk @ the upstream authors + + 20 Mar 2003; Graham Forest <vladimir@gentoo.org> popt-1.7-r1.ebuild: + Removed usage of pic USE flag + + 21 Feb 2003; Zach Welch <zwelch@gentoo.org> : + Added arm to keywords. + + 11 Feb 2003; Guy Martin <gmsoft@gentoo.org> : + Added hppa to keywords. + + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords + +*popt-1.7 (19 Nov 2002) + + 09 Mar 2003; Aron Griffis <agriffis@gentoo.org> popt-1.7.ebuild: + Mark stable on alpha + + 6 Feb 2003; Luca Barbato <lu_zero@gentoo.org> : + added elibtoolize + + 19 Nov 2002; Mike Frysinger <vapier@gentoo.org> : + Version bump/added pic support + +*popt-1.6.3 (03 Mar 2002) + + 18 Jan 2003; Jan Seidel <tuxus@gentoo.org> : + Added mips to keywords + + 03 Oct 2002; Brad Cowan <bcowan@gentoo.org> popt-1.6.3.ebuild : + fixed nls compile problems per bug #8731 + + 01 Aug 2002; Mark Guertin <gerk@gentoo.org> libxml2-2.4.23.ebuild : + Added ppc to keywords + + 29 May 2002; Spider <spider@gentoo.org> popt-1.6.3.ebuild popt-1.5.ebuild : + fix bogus DESCRIPTION + +*popt-1.5 (01 Feb 2002) + + 01 Aug 2002; Mark Guertin <gerk@gentoo.org> libxml2-2.4.23.ebuild : + Added ppc to keywords + + 01 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest new file mode 100644 index 0000000..9c77734 --- /dev/null +++ b/dev-libs/popt/Manifest @@ -0,0 +1,6 @@ +AUX popt-1.12-scrub-lame-gettext.patch 847 RMD160 bab119791b9b8c7d4f86de2364ad3f27b9417370 SHA1 b2b8699db94f2ace88efc158da0f02a8890f0ea4 SHA256 62c66f1af2db0366a6efcfbca5c7702d65d86d8dbd4f1abad56a5fc265ca61a8 +AUX popt-1.13-crosscompile.patch 2813 RMD160 6bbda791634cd49d28858b77fb100e91aa78ba23 SHA1 c7e02743a537009f5d887e527ca57260612f4166 SHA256 cf09c56de7de5f00d6fd84d0b8cf22acc6663c0f5cfe7713edba2767435432bb +DIST popt-1.13.tar.gz 682438 RMD160 bcf9d493be05c909609d98f504b77268aadadff1 SHA1 658bf2d2ec25e97816f5920bb24048cf252d053a SHA256 722b939b14e8b510bbb24e3109a075c7d86b33bec05cb583e76769df9ef2661f +EBUILD popt-1.13.ebuild 997 RMD160 900247c1193075a69021e057b1c5a36d56c3b3ff SHA1 e20cb05d1a294be522f05655e97f8b541ab1d528 SHA256 1438334268e675da95dfd7759e4ba256670b434277c7c8e91c6c1c7fb3a0de8d +MISC ChangeLog 8961 RMD160 f30973b3190614c84732e581ac9d18f0c86b3686 SHA1 f2d0067dfb63d799cb13992fcf41ee0c1fde5816 SHA256 2288c7eeae7274934c8b1e266f20cb9cf7a25696346d3b036a482eb7a0dded9e +MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a diff --git a/dev-libs/popt/files/popt-1.12-scrub-lame-gettext.patch b/dev-libs/popt/files/popt-1.12-scrub-lame-gettext.patch new file mode 100644 index 0000000..a247bcb --- /dev/null +++ b/dev-libs/popt/files/popt-1.12-scrub-lame-gettext.patch @@ -0,0 +1,27 @@ +this serves no real purpose + +http://bugs.gentoo.org/161988 + +--- configure ++++ configure +@@ -20981,20 +20981,6 @@ + fi + + +-if test ! -f ../rpm.c +-then +- { echo "$as_me:$LINENO: checking for GNU xgettext" >&5 +-echo $ECHO_N "checking for GNU xgettext... $ECHO_C" >&6; } +- xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: +- *** GNU gettext is required. The latest version +- *** is always available from ftp://ftp.gnu.org/gnu/gettext/." >&5 +-echo "$as_me: error: +- *** GNU gettext is required. The latest version +- *** is always available from ftp://ftp.gnu.org/gnu/gettext/." >&2;} +- { (exit 1); exit 1; }; } +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +-fi + + { echo "$as_me:$LINENO: checking for setreuid" >&5 + echo $ECHO_N "checking for setreuid... $ECHO_C" >&6; } diff --git a/dev-libs/popt/files/popt-1.13-crosscompile.patch b/dev-libs/popt/files/popt-1.13-crosscompile.patch new file mode 100644 index 0000000..ceb8087 --- /dev/null +++ b/dev-libs/popt/files/popt-1.13-crosscompile.patch @@ -0,0 +1,92 @@ +--- configure.orig 2008-09-14 15:18:13.000000000 +0200 ++++ configure 2008-09-14 15:18:38.000000000 +0200 +@@ -20190,7 +20190,8 @@ + See \`config.log' for more details." >&5 + echo "$as_me: error: cannot run test program while cross compiling + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ #{ (exit 1); exit 1; }; } ++ } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20271,7 +20272,8 @@ + See \`config.log' for more details." >&5 + echo "$as_me: error: cannot run test program while cross compiling + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ #{ (exit 1); exit 1; }; } ++ } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20352,7 +20354,8 @@ + See \`config.log' for more details." >&5 + echo "$as_me: error: cannot run test program while cross compiling + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ #{ (exit 1); exit 1; }; } ++ } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20433,7 +20436,8 @@ + See \`config.log' for more details." >&5 + echo "$as_me: error: cannot run test program while cross compiling + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ #{ (exit 1); exit 1; }; } ++ } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20514,7 +20518,8 @@ + See \`config.log' for more details." >&5 + echo "$as_me: error: cannot run test program while cross compiling + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ #{ (exit 1); exit 1; }; } ++ } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20595,7 +20600,8 @@ + See \`config.log' for more details." >&5 + echo "$as_me: error: cannot run test program while cross compiling + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ #{ (exit 1); exit 1; }; } ++ } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20676,7 +20682,8 @@ + See \`config.log' for more details." >&5 + echo "$as_me: error: cannot run test program while cross compiling + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ #{ (exit 1); exit 1; }; } ++ } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20757,7 +20764,8 @@ + See \`config.log' for more details." >&5 + echo "$as_me: error: cannot run test program while cross compiling + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ #{ (exit 1); exit 1; }; } ++ } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20832,7 +20840,8 @@ + if test ".$ac_cv_va_copy" = .; then + { { echo "$as_me:$LINENO: error: no working implementation found" >&5 + echo "$as_me: error: no working implementation found" >&2;} +- { (exit 1); exit 1; }; } ++ #{ (exit 1); exit 1; }; } ++ } + fi + + fi diff --git a/dev-libs/popt/metadata.xml b/dev-libs/popt/metadata.xml new file mode 100644 index 0000000..54494c4 --- /dev/null +++ b/dev-libs/popt/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>no-herd</herd> +<maintainer> +<email>maintainer-needed@gentoo.org</email> +</maintainer> +</pkgmetadata> diff --git a/dev-libs/popt/popt-1.13.ebuild b/dev-libs/popt/popt-1.13.ebuild new file mode 100644 index 0000000..b60af45 --- /dev/null +++ b/dev-libs/popt/popt-1.13.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.13.ebuild,v 1.1 2008/01/07 06:00:49 dirtyepic Exp $ + +inherit eutils inherit autotools toolchain-funcs + +DESCRIPTION="Parse Options - Command line parser" +HOMEPAGE="http://rpm5.org/" +SRC_URI="http://rpm5.org/files/popt/${P}.tar.gz" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="nls" + +RDEPEND="nls? ( virtual/libintl )" +DEPEND="nls? ( sys-devel/gettext )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-1.12-scrub-lame-gettext.patch + if tc-is-cross-compiler; then + epatch "${FILESDIR}"/${PN}-1.13-crosscompile.patch + fi +} + +src_compile() { + econf \ + --without-included-gettext \ + $(use_enable nls) \ + || die + emake || die "emake failed" +} + +src_install() { + emake install DESTDIR="${D}" || die + dodoc CHANGES README +} diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest new file mode 100644 index 0000000..bbe3988 --- /dev/null +++ b/dev-python/gst-python/Manifest @@ -0,0 +1,3 @@ +AUX gst-python-0.10.9-lazy.patch 534 RMD160 912cd099a3f045305a6a9b33dd3bbc6aa422890c SHA1 a70a68be3e7f03b002f5a49e4685cf7d4daba264 SHA256 5a973c247741dcf2418c3f15427e9408295606ff3b2bf559ae7d82e060b18fee +DIST gst-python-0.10.13.tar.bz2 487848 RMD160 a61c7036b23f1793e5408c0baca54fd3f8bfa4fd SHA1 e2a82c2b27b2fc545d5bf0ffe1fceaa618bc79f5 SHA256 95007d53d6d9aa64019fa4e3647ec714bf1b08744536182b954bacd6c4daf7f8 +EBUILD gst-python-0.10.13.ebuild 1377 RMD160 818f7f42c87bfba6bea878829cc529ea9f145c7e SHA1 3d7f3bf29338973c0334a479c81cde5f3e056436 SHA256 e7863b757ac0d2c22fdf93f9456a2093b318d6898661550db869e57762984cba diff --git a/dev-python/gst-python/files/gst-python-0.10.9-lazy.patch b/dev-python/gst-python/files/gst-python-0.10.9-lazy.patch new file mode 100644 index 0000000..880d550 --- /dev/null +++ b/dev-python/gst-python/files/gst-python-0.10.9-lazy.patch @@ -0,0 +1,21 @@ +diff -ur gst-python-0.10.9.orig/configure.ac gst-python-0.10.9/configure.ac +--- gst-python-0.10.9.orig/configure.ac 2007-11-28 11:33:05.000000000 +0200 ++++ gst-python-0.10.9/configure.ac 2007-11-28 18:09:48.000000000 +0200 +@@ -363,6 +363,17 @@ + + AG_GST_VALGRIND_CHECK + ++AC_MSG_CHECKING([whether $LD accepts -z,lazy]) ++case `$LD -z,lazy -v 2>&1 </dev/null` in ++*GNU* | *'with BFD'*) ++ LDFLAGS="$LDFLAGS -Wl,-z,lazy" ++ AC_MSG_RESULT([yes]) ++ ;; ++*) ++ AC_MSG_RESULT([no]) ++ ;; ++esac ++ + AC_OUTPUT([ + Makefile + codegen/Makefile diff --git a/dev-python/gst-python/gst-python-0.10.13.ebuild b/dev-python/gst-python/gst-python-0.10.13.ebuild new file mode 100644 index 0000000..52b621d --- /dev/null +++ b/dev-python/gst-python/gst-python-0.10.13.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/gst-python/gst-python-0.10.13.ebuild,v 1.2 2008/12/09 11:41:52 ssuominen Exp $ + +NEED_PYTHON=2.4 + +inherit autotools eutils multilib python + +DESCRIPTION="A Python Interface to GStreamer" +HOMEPAGE="http://gstreamer.freedesktop.org" +SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2" + +LICENSE="LGPL-2" +SLOT="0.10" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="examples" + +RDEPEND="|| ( >=dev-python/pygobject-2.11.2 >=dev-python/pygtk-2.6.3 ) + >=media-libs/gstreamer-0.10.21 + >=media-libs/gst-plugins-base-0.10.21 + dev-libs/libxml2" +DEPEND="dev-util/pkgconfig" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-0.10.9-lazy.patch + + rm -f py-compile || die "rm failed." + ln -s $(type -P true) py-compile || die "ln failed." + + AT_M4DIR="common/m4" eautoreconf +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed." + dodoc AUTHORS ChangeLog NEWS README TODO + + if use examples; then + docinto examples + dodoc examples/* + fi +} + +pkg_postinst() { + python_version + python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/pygst.py + python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/gst-0.10 +} + +pkg_postrm() { + python_mod_cleanup +} diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest new file mode 100644 index 0000000..535509f --- /dev/null +++ b/dev-python/pygobject/Manifest @@ -0,0 +1,8 @@ +AUX precomputed-constants/armv4tl-softfloat-linux-gnueabi 708 RMD160 03472e6c674612e4ee4bd67a11d5aafd4d502d1c SHA1 99032095c5e9e654ba0e071391d74f5542780ab3 SHA256 ffd99d6c363a15c3625ae5d4c05561c3baf5cbbc2d354347dd6833e275adf478 +AUX pygobject-2.14.2-add-python-includes-switch.patch 1560 RMD160 b1801360d32aa19b40b751d2440b1ab29296d99d SHA1 01a30c87c4a8541324e374f8232650138740b694 SHA256 aff5ee5a8f732d8891d0cb08cad40a1aedcac5183be92c994aa6402db4c8908b +AUX pygobject-2.14.2-libffi.patch 796 RMD160 0aa01f1d2cdf602ab127658bd838f55a8db265dd SHA1 6f66c36aa071161b0ebc540cb4fbe4ebbecdf35a SHA256 23a2c96a3195fc6b46ed647ea7dea387076ee6eca97bd73415ddc4456898d759 +AUX pygobject-2.14.2-with-precomputed-constants.patch 1251 RMD160 6c3c561e863c7542b30593f75fe69cee94902283 SHA1 d6656b9986c3b89d61f988216a48fa2381c2b1b0 SHA256 86a2fbb0fbc95a1d19d6a806c085cd638286724ff509584147bac259ef951017 +DIST pygobject-2.14.2.tar.bz2 366808 RMD160 c9894695d745a9d859f3edfb9e2946ad8b4fec3d SHA1 e891c3f1ad0d6f737d6c51b9be3eb363f7d11cbc SHA256 79c5d3ab8f072f1d0b102b2bd6410b0dc383a008b5efad1750d8b6dadfde8c6e +DIST pygobject-2.15.4.tar.bz2 477302 RMD160 eecbf4a7969a7a81a50cf6e2b52d53d7d72d6b4e SHA1 dfc3f04a27243ac4c386bfd19e4c383dd419d040 SHA256 c746693328bfed7838a1f3bfac41b13d7f39a81ac961559cd0daf700fc677da7 +EBUILD pygobject-2.14.2.ebuild 3185 RMD160 ea36e9736304d9be634de5208b0c72de867ae461 SHA1 2ffcaef9ccfcb99b5efc342d01cc19604772752c SHA256 d8847b76c42fe28478a548dac658307e2d8851b93a10ad92445f39ebbd458a8f +EBUILD pygobject-2.15.4.ebuild 3018 RMD160 b21293bf981f46661e0f1d9a92264689c12a4f33 SHA1 3c992e6059571b4ee2564d444c3ec320c6fc8e92 SHA256 f7ad80983af4af764b4761f94cfa7cce3fd78e241eff20c2b2add97b61be0955 diff --git a/dev-python/pygobject/files/precomputed-constants/armv4tl-softfloat-linux-gnueabi b/dev-python/pygobject/files/precomputed-constants/armv4tl-softfloat-linux-gnueabi new file mode 100644 index 0000000..b397eb1 --- /dev/null +++ b/dev-python/pygobject/files/precomputed-constants/armv4tl-softfloat-linux-gnueabi @@ -0,0 +1,15 @@ +# This part is generated by generate-constants.c +G_MINFLOAT = 0.000000 +G_MINFLOAT = 0.000000 +G_MAXFLOAT = 340282346638528859811704183484516925440.000000 +G_MINDOUBLE = 0.000000 +G_MAXDOUBLE = 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.000000 +G_MINSHORT = -32768 +G_MAXSHORT = 32767 +G_MAXUSHORT = 65535 +G_MININT = -2147483648 +G_MAXINT = 2147483647 +G_MAXUINT = 4294967295 +G_MINLONG = -2147483648L +G_MAXLONG = 2147483647L +G_MAXULONG = 4294967295L diff --git a/dev-python/pygobject/files/pygobject-2.14.2-add-python-includes-switch.patch b/dev-python/pygobject/files/pygobject-2.14.2-add-python-includes-switch.patch new file mode 100644 index 0000000..64e5237 --- /dev/null +++ b/dev-python/pygobject/files/pygobject-2.14.2-add-python-includes-switch.patch @@ -0,0 +1,39 @@ +This work is heavily inspired by the patch found at +http://projects.linuxtogo.org/pipermail/openembedded-commits/2007-November/010079.html + +The rest was adaptation and cleaning out the remaining issues (cross compile). + +--- m4/python.m4 2008-05-23 18:42:11.000000000 +0200 ++++ m4/python.m4.new 2008-09-23 18:58:32.000000000 +0200 +@@ -43,6 +43,11 @@ + [AC_REQUIRE([AM_PATH_PYTHON]) + AC_MSG_CHECKING(for headers required to compile python extensions) + dnl deduce PYTHON_INCLUDES ++AC_ARG_WITH(python-includes, ++ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) ++if test x$py_exec_prefix != x; then ++PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" ++else + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` + if test -x "$PYTHON-config"; then +@@ -53,6 +58,7 @@ + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" + fi + fi ++fi + AC_SUBST(PYTHON_INCLUDES) + dnl check if the headers exist: + save_CPPFLAGS="$CPPFLAGS" + +--- configure.ac 2008-09-23 19:23:56.000000000 +0200 ++++ configure.ac.new 2008-09-23 19:24:10.000000000 +0200 +@@ -70,8 +70,6 @@ + AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) + + AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h]) +-py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES" + AC_TRY_COMPILE([#include <Python.h>], diff --git a/dev-python/pygobject/files/pygobject-2.14.2-libffi.patch b/dev-python/pygobject/files/pygobject-2.14.2-libffi.patch new file mode 100644 index 0000000..c037e06 --- /dev/null +++ b/dev-python/pygobject/files/pygobject-2.14.2-libffi.patch @@ -0,0 +1,21 @@ +diff -ru pygobject-2.14.2.orig/configure.ac pygobject-2.14.2/configure.ac +--- pygobject-2.14.2.orig/configure.ac 2008-05-23 12:51:11.000000000 -0400 ++++ pygobject-2.14.2/configure.ac 2008-07-04 13:45:30.088664555 -0400 +@@ -146,7 +146,7 @@ + dnl libffi + AC_MSG_CHECKING(for ffi.h) + AC_ARG_WITH(libffi, +- AC_HELP_STRING([--without-ffi], [Disable libffi support]), ++ AC_HELP_STRING([--without-libffi], [Disable libffi support]), + with_ffi=$withval, + with_ffi=auto) + if test x"$with_ffi" = xno ; then +@@ -170,7 +170,7 @@ + LIBS=$save_LIBS + fi + fi +-if test x"$with_ffi" != xauto && test x"$pygobject_ffi_h" != xyes ; then ++if test x"$with_ffi" == xyes && test x"$pygobject_ffi_h" != xyes ; then + AC_MSG_ERROR([libffi requested, but ffi.h not found]) + fi + AC_MSG_RESULT([$pygobject_ffi_h]) diff --git a/dev-python/pygobject/files/pygobject-2.14.2-with-precomputed-constants.patch b/dev-python/pygobject/files/pygobject-2.14.2-with-precomputed-constants.patch new file mode 100644 index 0000000..9035e7f --- /dev/null +++ b/dev-python/pygobject/files/pygobject-2.14.2-with-precomputed-constants.patch @@ -0,0 +1,33 @@ +--- configure.ac 2008-09-28 20:35:55.000000000 +0200 ++++ configure.ac.new 2008-09-28 20:36:13.000000000 +0200 +@@ -192,6 +192,15 @@ + + fi + ++dnl Sometimes we need precomputed constants because we cannot execute ++dnl 'gobject/generate-constants' ++AC_ARG_WITH(precomputed-constants, ++ [AC_HELP_STRING([--with-precomputed-constants@<:@=File containing output of generate-constants@:>@], ++ [include optinal switch to provide the precompute results of 'gobject/generate-constants' @<:@automatic@:>@])], ++ [precomputed_constants="$withval"]) ++AC_SUBST(precomputed_constants) ++AM_CONDITIONAL(HAVE_PRECOMPUTED_CONSTANTS, test "x$precomputed_constants" != "x") ++ + AC_CONFIG_FILES( + Makefile + pygobject-2.0.pc +--- gobject/Makefile.am 2008-09-28 20:47:24.000000000 +0200 ++++ gobject/Makefile.am.new 2008-09-28 21:00:47.000000000 +0200 +@@ -25,7 +25,11 @@ + rm -f constants.py + cp $(srcdir)/constants.py.in constants.py + chmod 644 constants.py +- $(top_builddir)/gobject/generate-constants$(EXEEXT) >> constants.py ++if HAVE_PRECOMPUTED_CONSTANTS ++ cat $(precomputed_constants) >> constants.py ++else ++ $(top_builddir)/gobject/generate-constants$(EXEEXT) >> constants.py ++endif + chmod 444 constants.py + + generate_constants_CFLAGS = $(GLIB_CFLAGS) diff --git a/dev-python/pygobject/pygobject-2.14.2.ebuild b/dev-python/pygobject/pygobject-2.14.2.ebuild new file mode 100644 index 0000000..174ba26 --- /dev/null +++ b/dev-python/pygobject/pygobject-2.14.2.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.14.2.ebuild,v 1.9 2008/09/25 14:01:58 jer Exp $ + +inherit gnome2 python autotools virtualx + +DESCRIPTION="GLib's GObject library bindings for Python" +HOMEPAGE="http://www.pygtk.org/" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" +IUSE="doc examples libffi" + +# glib higher dep than in configure.in comes from a runtime version check and ensures that +# timeout_add_seconds is available for any packages that depend on pygobject and use it +# python high dep for a fixed python-config, as aclocal.m4/configure in the tarball requires it to function properly +RDEPEND=">=dev-lang/python-2.4.4-r5 + >=dev-libs/glib-2.13.5 + !<dev-python/pygtk-2.9" +DEPEND="${RDEPEND} + doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) + >=dev-util/pkgconfig-0.12.0" + +DOCS="AUTHORS ChangeLog NEWS README" + +pkg_setup() { + if use libffi && ! built_with_use sys-devel/gcc libffi; then + eerror "libffi support not found in sys-devel/gcc." && die + fi + + G2CONF="${G2CONF} $(use_enable doc docs) $(use_with libffi)" + + # for cross compiling we need to specify the python include directory + if tc-is-cross-compiler ; then + G2CONF="${G2CONF} --with-python-includes=${SYSROOT}/usr" + G2CONF="${G2CONF} --with-precomputed-constants=${FILESDIR}/precomputed-constants/${CHOST}" + fi +} + +src_unpack() { + gnome2_src_unpack + + # enable a switch to specify precomputed constants because we can't execute generate-constants + epatch "${FILESDIR}/${P}-with-precomputed-constants.patch" + + # add a --python-includes flag + epatch "${FILESDIR}/${P}-add-python-includes-switch.patch" + + # fix libffi condition, fix bug #230751 + epatch "${FILESDIR}/${P}-libffi.patch" + + # fix bug #147285 - Robin H. Johnson <robbat2@gentoo.org> + # this is caused by upstream's automake-1.8 lacking some Gentoo-specific + # patches (for tmpfs amongst other things). Upstreams hit by this should + # move to newer automake versions ideally. + #AT_M4DIR="m4" eautomake + AT_M4DIR="m4" eautoreconf + + # disable pyc compiling + mv py-compile py-compile.orig + ln -s $(type -P true) py-compile +} + +src_test() { + Xemake check || die "tests failed" +} + +src_install() { + gnome2_src_install + + if use examples; then + insinto /usr/share/doc/${P} + doins -r examples + fi + + python_version + mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py \ + "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py-2.0 + mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth \ + "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth-2.0 +} + +pkg_postinst() { + python_version + python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0 + alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9] + alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9] + python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py +} + +pkg_postrm() { + python_version + python_mod_cleanup +} diff --git a/dev-python/pygobject/pygobject-2.15.4.ebuild b/dev-python/pygobject/pygobject-2.15.4.ebuild new file mode 100644 index 0000000..8556b1d --- /dev/null +++ b/dev-python/pygobject/pygobject-2.15.4.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.14.2.ebuild,v 1.9 2008/09/25 14:01:58 jer Exp $ + +inherit gnome2 python autotools virtualx + +DESCRIPTION="GLib's GObject library bindings for Python" +HOMEPAGE="http://www.pygtk.org/" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" +IUSE="doc examples libffi" + +# glib higher dep than in configure.in comes from a runtime version check and ensures that +# timeout_add_seconds is available for any packages that depend on pygobject and use it +# python high dep for a fixed python-config, as aclocal.m4/configure in the tarball requires it to function properly +RDEPEND=">=dev-lang/python-2.4.4-r5 + >=dev-libs/glib-2.13.5 + !<dev-python/pygtk-2.9" +DEPEND="${RDEPEND} + doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) + >=dev-util/pkgconfig-0.12.0" + +DOCS="AUTHORS ChangeLog NEWS README" + +pkg_setup() { + if use libffi && ! built_with_use sys-devel/gcc libffi; then + eerror "libffi support not found in sys-devel/gcc." && die + fi + + G2CONF="${G2CONF} $(use_enable doc docs) $(use_with libffi)" + + # for cross compiling we need to specify the python include directory + if tc-is-cross-compiler ; then + G2CONF="${G2CONF} --with-python-includes=${SYSROOT}/usr" + G2CONF="${G2CONF} --with-precomputed-constants=${FILESDIR}/precomputed-constants/${CHOST}" + fi +} + +src_unpack() { + gnome2_src_unpack + + # enable a switch to specify precomputed constants because we can't execute generate-constants + epatch "${FILESDIR}/${PN}-2.14.2-with-precomputed-constants.patch" + + # fix bug #147285 - Robin H. Johnson <robbat2@gentoo.org> + # this is caused by upstream's automake-1.8 lacking some Gentoo-specific + # patches (for tmpfs amongst other things). Upstreams hit by this should + # move to newer automake versions ideally. + #AT_M4DIR="m4" eautomake + AT_M4DIR="m4" eautoreconf + + # disable pyc compiling + mv py-compile py-compile.orig + ln -s $(type -P true) py-compile +} + +src_test() { + Xemake check || die "tests failed" +} + +src_install() { + gnome2_src_install + + if use examples; then + insinto /usr/share/doc/${P} + doins -r examples + fi + + python_version + mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py \ + "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py-2.0 + mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth \ + "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth-2.0 +} + +pkg_postinst() { + python_version + python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0 + alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9] + alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9] + python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py +} + +pkg_postrm() { + python_version + python_mod_cleanup +} diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest new file mode 100644 index 0000000..5ebe231 --- /dev/null +++ b/dev-util/strace/Manifest @@ -0,0 +1,6 @@ +AUX strace-4.5.12-libaio.patch 1552 RMD160 d4084416ed298ae07ea672569d04a22feb2f9188 SHA1 eec055eacba686d98bd36556be28eca96596b995 SHA256 6ea8fe265b9161ca708aa3b5fd31eee4584b9c7fcf829dcd8624a965fb048a78 +AUX strace-4.5.12-superh-update.patch 540 RMD160 4a021623687f0bbb6dc1e102ab5e304fea123857 SHA1 17c911fef9c8fb9cad0f9f671372ec4b9b29dd43 SHA256 267d553bec04725e3d723b3afe825c8307774d75c9f9424c6801048fc85712b9 +AUX strace-dont-use-REG_SYSCALL-for-sh.patch 630 RMD160 77a2ba5b252632970baafdb11ba7841a28b1fbec SHA1 d3cd6b7f22174a25a386deedd1441517106c528e SHA256 5a3f73e6671753d990b0782aa91b8f3204cc2857b9e45e20a2b87471207c17a3 +AUX strace-fix-arm-bad-syscall.patch 560 RMD160 56cbe4c575118f78efa40abc7fc84852e30d502c SHA1 d9c4a8687cff9d68ebf892880073bc5585dd87e7 SHA256 b7f57f8fc46af991046e87a6afd2468f337f4ba42f8b4a78fdb8278c47b92aa9 +DIST strace-4.5.15.tar.bz2 455607 RMD160 0c6aaa8820a0985d89b21a5da9578b27435c8906 SHA1 a6bd153eeb1a25a50bb5a1d92887a4911ec9ad48 SHA256 ba8c492c1b2033d4e2131f05df9e3780d4bc35bea87aa32a6052dd53a814e288 +EBUILD strace-4.5.15.ebuild 1238 RMD160 6c48013746829f09479fe0c73564a2ec6c6f3796 SHA1 1b3776fb67470ce4730a46baebae913b7e3b7263 SHA256 a62978f00f8ca61d6344e150f1b664d8aa9d711fb53a812828217e8b121c06e7 diff --git a/dev-util/strace/files/strace-4.5.12-libaio.patch b/dev-util/strace/files/strace-4.5.12-libaio.patch new file mode 100644 index 0000000..e24d3c3 --- /dev/null +++ b/dev-util/strace/files/strace-4.5.12-libaio.patch @@ -0,0 +1,60 @@ +Make libaio support a proper option and update the checks to support +both new and old versions of libaio. + +http://bugs.gentoo.org/103427 + +--- strace/configure.ac ++++ strace/configure.ac +@@ -170,6 +170,26 @@ + struct stat.st_rdev]) + AC_STAT64 + ++AC_ARG_ENABLE(libaio, ++ AC_HELP_STRING([--enable-libaio],[enable support for libaio @<:@default=auto@:>@]), ++ [enable_libaio=$enableval], ++ [enable_libaio=auto] ++) ++if test "x$enable_libaio" != "xno" ; then ++ AC_CHECK_HEADER([libaio.h],[have_libaio=yes],[have_libaio=no]) ++ if test "x$enable_libaio$have_libaio" = "xyesno" ; then ++ AC_MSG_ERROR(Could not detect libaio.h) ++ elif test "x$have_libaio" = "xyes" ; then ++ AC_DEFINE(HAVE_LIBAIO_H, 1, [System has libaio.h]) ++ AC_CHECK_MEMBERS([ ++ struct iocb.data, ++ struct iocb.aio_data, ++ struct iocb.key, ++ struct iocb.aio_key], ++ [], [], [#include <libaio.h>]) ++ fi ++fi ++ + AC_TYPE_SIGNAL + AC_TYPE_UID_T + AC_TYPE_MODE_T +--- strace/desc.c ++++ strace/desc.c +@@ -767,7 +767,11 @@ + continue; + } + tprintf("{%p, %u, %hu, %hu, %d}", ++#ifdef HAVE_STRUCT_IOCB_AIO_DATA ++ iocb.aio_data, iocb.aio_data, ++#else + iocb.data, iocb.key, ++#endif + iocb.aio_lio_opcode, + iocb.aio_reqprio, iocb.aio_fildes); + } +@@ -793,7 +797,11 @@ + #ifdef HAVE_LIBAIO_H + if (umove(tcp, tcp->u_arg[1], &iocb) == 0) { + tprintf("{%p, %u, %hu, %hu, %d}, ", ++#ifdef HAVE_STRUCT_IOCB_AIO_DATA ++ iocb.aio_data, iocb.aio_data, ++#else + iocb.data, iocb.key, ++#endif + iocb.aio_lio_opcode, + iocb.aio_reqprio, iocb.aio_fildes); + } else diff --git a/dev-util/strace/files/strace-4.5.12-superh-update.patch b/dev-util/strace/files/strace-4.5.12-superh-update.patch new file mode 100644 index 0000000..d402997 --- /dev/null +++ b/dev-util/strace/files/strace-4.5.12-superh-update.patch @@ -0,0 +1,24 @@ +Fix configure script to work with targets like 'sh4-unknown-linux-gnu' + +--- configure.ac ++++ configure.ac +@@ -91,14 +91,14 @@ + arch=hppa + AC_DEFINE([HPPA], 1, [Define for the HPPA architecture.]) + ;; +-sh) +- arch=sh +- AC_DEFINE([SH], 1, [Define for the SH architecture.]) +- ;; +-sh64) ++sh64*) + arch=sh64 + AC_DEFINE([SH64], 1, [Define for the SH64 architecture.]) + ;; ++sh*) ++ arch=sh ++ AC_DEFINE([SH], 1, [Define for the SH architecture.]) ++ ;; + x86?64*) + arch=x86_64 + AC_DEFINE([X86_64], 1, [Define for the AMD x86-64 architecture.]) diff --git a/dev-util/strace/files/strace-dont-use-REG_SYSCALL-for-sh.patch b/dev-util/strace/files/strace-dont-use-REG_SYSCALL-for-sh.patch new file mode 100644 index 0000000..9030ecc --- /dev/null +++ b/dev-util/strace/files/strace-dont-use-REG_SYSCALL-for-sh.patch @@ -0,0 +1,10 @@ +--- strace/process.c ++++ strace/process.c +@@ -2663,7 +2663,6 @@ const struct xlat struct_user_offsets[] + { 4*REG_GBR, "4*REG_GBR" }, + { 4*REG_MACH, "4*REG_MACH" }, + { 4*REG_MACL, "4*REG_MACL" }, +- { 4*REG_SYSCALL, "4*REG_SYSCALL" }, + { 4*REG_FPUL, "4*REG_FPUL" }, + { 4*REG_FPREG0, "4*REG_FPREG0" }, + { 4*(REG_FPREG0+1), "4*REG_FPREG1" }, diff --git a/dev-util/strace/files/strace-fix-arm-bad-syscall.patch b/dev-util/strace/files/strace-fix-arm-bad-syscall.patch new file mode 100644 index 0000000..125440d --- /dev/null +++ b/dev-util/strace/files/strace-fix-arm-bad-syscall.patch @@ -0,0 +1,20 @@ +http://www.fluff.org/ben/patches/strace/ + +--- strace-4.5.12-orig/syscall.c 2005-06-08 21:45:28.000000000 +0100 ++++ strace-4.5.12/syscall.c 2005-10-25 19:26:39.000000000 +0100 +@@ -1013,6 +1013,15 @@ struct tcb *tcp; + /* + * Note: we only deal with only 32-bit CPUs here. + */ ++ ++ if (!(tcp->flags & TCB_INSYSCALL) && ++ (tcp->flags & TCB_WAITEXECVE)) { ++ /* caught a fake syscall from the execve's exit */ ++ tcp->flags &= ~TCB_WAITEXECVE; ++ return 0; ++ } ++ ++ + if (regs.ARM_cpsr & 0x20) { + /* + * Get the Thumb-mode system call number diff --git a/dev-util/strace/strace-4.5.15.ebuild b/dev-util/strace/strace-4.5.15.ebuild new file mode 100644 index 0000000..cfc760c --- /dev/null +++ b/dev-util/strace/strace-4.5.15.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.15.ebuild,v 1.1 2007/01/17 06:45:56 vapier Exp $ + +inherit flag-o-matic autotools + +DESCRIPTION="A useful diagnostic, instructional, and debugging tool" +HOMEPAGE="http://sourceforge.net/projects/strace/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="static aio" + +DEPEND="aio? ( dev-libs/libaio )" + +src_unpack() { + unpack ${A} + cd "${S}" + + #epatch "${FILESDIR}"/${PN}-4.5.11-fbsd.patch + + # Fix SuperH support + epatch "${FILESDIR}"/strace-dont-use-REG_SYSCALL-for-sh.patch + epatch "${FILESDIR}"/${PN}-4.5.12-superh-update.patch + + # Fix building on older ARM machines + epatch "${FILESDIR}"/strace-fix-arm-bad-syscall.patch + + # Fix libaio support #103427 + epatch "${FILESDIR}"/${PN}-4.5.12-libaio.patch + + eautoreconf +} + +src_compile() { + filter-lfs-flags + + use static && append-ldflags -static + + econf $(use_enable aio libaio) || die + emake || die +} + +src_install() { + emake install DESTDIR="${D}" || die + dodoc ChangeLog CREDITS NEWS PORTING README* TODO +} + diff --git a/eclass/gst-plugins-bad.eclass b/eclass/gst-plugins-bad.eclass new file mode 100644 index 0000000..55c8f64 --- /dev/null +++ b/eclass/gst-plugins-bad.eclass @@ -0,0 +1,100 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-bad.eclass,v 1.13 2008/12/05 22:24:39 ssuominen Exp $ + +# +# Original Author: Saleem Abdulrasool <compnerd@gentoo.org> +# Based on the work of foser <foser@gentoo.org> and zaheerm <zaheerm@gentoo.org> +# Purpose: This elcass is designed to help package external gst-plugins per +# plugin rather than in a single package. +# + +# This list is current to gst-plugins-bad-0.10.4 except for: +# gst_v4l2 - moved to gst-plugins-bad-0.10.5 (not in >=gst-plugins-bad-0.10.4) +# But it must stay in this list until all <gst-plugins-bad-0.10.4 +# are removed +# drac at gentoo.org: +# This list is current to gst-plugins-bad-0.10.5 except for: +# Not present in 0.10.5 - wavpack +my_gst_plugins_bad="opengl vcd x alsa amrwb bz2 cdaudio directfb dts divx faac +faad gsm gst_v4l2 ivorbis jack ladspa libmms mpeg2enc musepack musicbrainz +mythtv nas neon timidity wildmidi sdl sdltest sndfile soundtouch spc swfdec +theoradec x264 xvid dvb wavpack quicktime dc1394 metadata fbdev soup dirac mplex +ofa oss4 apexsink celt dvdnav jp2k twolame" + +#qtdemux spped tta + +inherit eutils gst-plugins10 + +MY_PN="gst-plugins-bad" +MY_P=${MY_PN}-${PV} + +SRC_URI="http://gstreamer.freedesktop.org/src/gst-plugins-bad/${MY_P}.tar.bz2" + +# added to remove circular deps +# 6/2/2006 - zaheerm +if [ "${PN}" != "${MY_PN}" ]; then +RDEPEND="=media-libs/gstreamer-0.10* + =media-libs/gst-plugins-base-0.10* + >=dev-libs/glib-2.6 + >=dev-libs/liboil-0.3" +DEPEND="sys-apps/sed + sys-devel/gettext" +fi +S=${WORKDIR}/${MY_P} + +gst-plugins-bad_src_unpack() { + local makefiles + + unpack ${A} + + gst-plugins10_find_plugin_dir + cd ${S} + + # Remove generation of any other Makefiles except the plugin's Makefile + if [[ -d "${S}/sys/${GST_PLUGINS_BUILD_DIR}" ]] ; then + makefiles="Makefile sys/Makefile sys/${GST_PLUGINS_BUILD_DIR}/Makefile" + elif [[ -d "${S}/ext/${GST_PLUGINS_BUILD_DIR}" ]] ; then + makefiles="Makefile ext/Makefile ext/${GST_PLUGINS_BUILD_DIR}/Makefile" + fi + + sed -e "s:ac_config_files=.*:ac_config_files='${makefiles}':" \ + -i ${S}/configure +} + +gst-plugins-bad_src_configure() { + local plugin gst_conf + + einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..." + + for plugin in ${GST_PLUGINS_BUILD} ; do + my_gst_plugins_bad="${my_gst_plugins_bad/${plugin}/}" + done + + for plugin in ${my_gst_plugins_bad} ; do + gst_conf="${gst_conf} --disable-${plugin}" + done + + for plugin in ${GST_PLUGINS_BUILD} ; do + gst_conf="${gst_conf} --enable-${plugin}" + done + + cd ${S} + econf ${@} --with-package-name="Gentoo GStreamer Ebuild" --with-package-origin="http://www.gentoo.org" ${gst_conf} || die "configure failed" +} + +gst-plugins-bad_src_compile() { + gst-plugins-bad_src_configure ${@} + + gst-plugins10_find_plugin_dir + emake || die "compile failure" +} + +gst-plugins-bad_src_install() { + gst-plugins10_find_plugin_dir + einstall || die "install failed" + + [[ -e README ]] && dodoc README +} + +EXPORT_FUNCTIONS src_unpack src_compile src_install diff --git a/eclass/gst-plugins-base.eclass b/eclass/gst-plugins-base.eclass new file mode 100644 index 0000000..ada8ae9 --- /dev/null +++ b/eclass/gst-plugins-base.eclass @@ -0,0 +1,133 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-base.eclass,v 1.9 2008/06/29 14:49:31 drac Exp $ + +# Author : foser <foser@gentoo.org> + +# gst-plugins eclass +# +# eclass to make external gst-plugins emergable on a per-plugin basis +# to solve the problem with gst-plugins generating far too much unneeded deps +# +# 3rd party applications using gstreamer now should depend on a set of plugins as +# defined in the source, in case of spider usage obtain recommended plugins to use from +# Gentoo developers responsible for gstreamer <gnome@gentoo.org>, the application developer +# or the gstreamer team. + +inherit eutils gst-plugins10 + + +### +# variable declarations +### + +MY_PN=gst-plugins-base +MY_P=${MY_PN}-${PV} +# All relevant configure options for gst-plugins +# need a better way to extract these +# gst-plugins-base 0.9 +# update: gst_v4l2 is part of -good, not -base, remove when 0.10.15 is only +# version in tree. -drac +# update: no configure option tests, remove when 0.10.15 is only version in +# tree. -drac +my_gst_plugins_base="x xvideo xshm gst_v4l gst_v4l2 alsa cdparanoia gnome_vfs +gio libvisual ogg oggtest theora vorbis vorbistest tests examples freetypetest pango" + +#SRC_URI="mirror://gnome/sources/gst-plugins/${PV_MAJ_MIN}/${MY_P}.tar.bz2" +SRC_URI="http://gstreamer.freedesktop.org/src/gst-plugins-base/${MY_P}.tar.bz2" + +S=${WORKDIR}/${MY_P} + +# added to remove circular deps +# 6/2/2006 - zaheerm +if [ "${PN}" != "${MY_PN}" ]; then +RDEPEND="=media-libs/gst-plugins-base-0.10*" +DEPEND=">=sys-apps/sed-4 + dev-util/pkgconfig" +fi + +### +# public functions +### + +gst-plugins-base_src_configure() { + + # disable any external plugin besides the plugin we want + local plugin gst_conf + + einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..." + + for plugin in ${GST_PLUGINS_BUILD}; do + my_gst_plugins_base=${my_gst_plugins_base/${plugin}/} + done + for plugin in ${my_gst_plugins_base}; do + gst_conf="${gst_conf} --disable-${plugin} " + done + for plugin in ${GST_PLUGINS_BUILD}; do + gst_conf="${gst_conf} --enable-${plugin} " + done + + cd ${S} + econf ${@} --with-package-name="Gentoo GStreamer Ebuild" --with-package-origin="http://www.gentoo.org" ${gst_conf} || die "./configure failure" + +} + +### +# public inheritable functions +### + +gst-plugins-base_src_unpack() { + + local makefiles + + unpack ${A} + + # Link with the syswide installed gst-libs if needed + gst-plugins10_find_plugin_dir + sed -e "s:\$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces:${ROOT}/usr/$(get_libdir)/libgstinterfaces:" \ + -e "s:\${top_builddir}/gst-libs/gst/interfaces/libgstinterfaces:${ROOT}/usr/$(get_libdir)/libgstinterfaces:" \ + -e "s:\$(top_builddir)/gst-libs/gst/audio/libgstaudio:${ROOT}/usr/$(get_libdir)/libgstaudio:" \ + -e "s:\${top_builddir}/gst-libs/gst/audio/libgstaudio:${ROOT}/usr/$(get_libdir)/libgstaudio:" \ + -e "s:\$(top_builddir)/gst-libs/gst/riff/libgstriff:${ROOT}/usr/$(get_libdir)/libgstriff:" \ + -e "s:\${top_builddir}/gst-libs/gst/riff/libgstriff:${ROOT}/usr/$(get_libdir)/libgstriff:" \ + -e "s:\$(top_builddir)/gst-libs/gst/tag/libgsttag:${ROOT}/usr/$(get_libdir)/libgsttag:" \ + -e "s:\${top_builddir}/gst-libs/gst/tag/libgsttag:${ROOT}/usr/$(get_libdir)/libgsttag:" \ + -e "s:\$(top_builddir)/gst-libs/gst/video/libgstvideo:${ROOT}/usr/$(get_libdir)/libgstvideo:" \ + -e "s:\${top_builddir}/gst-libs/gst/video/libgstvideo:${ROOT}/usr/$(get_libdir)/libgstvideo:" \ + -e "s:\$(top_builddir)/gst-libs/gst/netbuffer/libgstnetbuffer:${ROOT}/usr/$(get_libdir)/libgstnetbuffer:" \ + -e "s:\${top_builddir}/gst-libs/gst/netbuffer/libgstnetbuffer:${ROOT}/usr/$(get_libdir)/libgstnetbuffer:" \ + -e "s:\$(top_builddir)/gst-libs/gst/rtp/libgstrtp:${ROOT}/usr/$(get_libdir)/libgstrtp:" \ + -e "s:\${top_builddir}/gst-libs/gst/rtp/libgstrtp:${ROOT}/usr/$(get_libdir)/libgstrtp:" \ + -i Makefile.in + cd ${S} + + # Remove generation of any other Makefiles except the plugin's Makefile + if [ -d "${S}/sys/${GST_PLUGINS_BUILD_DIR}" ]; then + makefiles="Makefile sys/Makefile sys/${GST_PLUGINS_BUILD_DIR}/Makefile" + elif [ -d "${S}/ext/${GST_PLUGINS_BUILD_DIR}" ]; then + makefiles="Makefile ext/Makefile ext/${GST_PLUGINS_BUILD_DIR}/Makefile" + fi + sed -e "s:ac_config_files=.*:ac_config_files='${makefiles}':" \ + -i ${S}/configure + +} + +gst-plugins-base_src_compile() { + + gst-plugins-base_src_configure ${@} + + gst-plugins10_find_plugin_dir + emake || die "compile failure" + +} + +gst-plugins-base_src_install() { + + gst-plugins10_find_plugin_dir + einstall || die + + [[ -e README ]] && dodoc README +} + + +EXPORT_FUNCTIONS src_unpack src_compile src_install diff --git a/eclass/gst-plugins-good.eclass b/eclass/gst-plugins-good.eclass new file mode 100644 index 0000000..734361a --- /dev/null +++ b/eclass/gst-plugins-good.eclass @@ -0,0 +1,115 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-good.eclass,v 1.16 2008/12/05 20:39:36 ssuominen Exp $ + +# Author : foser <foser@gentoo.org>, zaheerm <zaheerm@gentoo.org> + +# gst-plugins-good eclass +# +# eclass to make external gst-plugins emergable on a per-plugin basis +# to solve the problem with gst-plugins generating far too much unneeded deps +# +# 3rd party applications using gstreamer now should depend on a set of plugins as +# defined in the source, obtain recommended plugins to use from +# Gentoo developers responsible for gstreamer <gnome@gentoo.org>, the application developer +# or the gstreamer team. + +inherit eutils gst-plugins10 + + +### +# variable declarations +### + +MY_PN=gst-plugins-good +MY_P=${MY_PN}-${PV} +# All relevant configure options for gst-plugins +# need a better way to extract these +# gst-plugins-base 0.9 + +# This list is current to gst-plugins-good-0.10.6 +my_gst_plugins_good="gconf gconftool oss aalib aalibtest cairo cdio esd esdtest +flac jpeg ladspa libcaca libdv libpng dv1394 shout2 shout2test speex annodex hal +x taglib gdk_pixbuf gst_v4l2 sunaudio xshm xvideo zlib wavpack soup pulse bz2" + +#SRC_URI="mirror://gnome/sources/gst-plugins/${PV_MAJ_MIN}/${MY_P}.tar.bz2" +SRC_URI="http://gstreamer.freedesktop.org/src/gst-plugins-good/${MY_P}.tar.bz2" + +S=${WORKDIR}/${MY_P} +# added to remove circular deps +# 6/2/2006 - zaheerm +if [ "${PN}" != "${MY_PN}" ]; then +RDEPEND="=media-libs/gst-plugins-base-0.10*" +DEPEND=">=sys-apps/sed-4 + dev-util/pkgconfig" +fi + +### +# public functions +### + +gst-plugins-good_src_configure() { + + # disable any external plugin besides the plugin we want + local plugin gst_conf + + einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..." + + for plugin in ${GST_PLUGINS_BUILD}; do + my_gst_plugins_good=${my_gst_plugins_good/${plugin}/} + done + for plugin in ${my_gst_plugins_good}; do + gst_conf="${gst_conf} --disable-${plugin} " + done + for plugin in ${GST_PLUGINS_BUILD}; do + gst_conf="${gst_conf} --enable-${plugin} " + done + + cd ${S} + econf ${@} --with-package-name="Gentoo GStreamer Ebuild" --with-package-origin="http://www.gentoo.org" ${gst_conf} || die "./configure failure" + +} + +### +# public inheritable functions +### + +gst-plugins-good_src_unpack() { + + local makefiles + + unpack ${A} + + # Link with the syswide installed gst-libs if needed + gst-plugins10_find_plugin_dir + cd ${S} + + # Remove generation of any other Makefiles except the plugin's Makefile + if [ -d "${S}/sys/${GST_PLUGINS_BUILD_DIR}" ]; then + makefiles="Makefile sys/Makefile sys/${GST_PLUGINS_BUILD_DIR}/Makefile" + elif [ -d "${S}/ext/${GST_PLUGINS_BUILD_DIR}" ]; then + makefiles="Makefile ext/Makefile ext/${GST_PLUGINS_BUILD_DIR}/Makefile" + fi + sed -e "s:ac_config_files=.*:ac_config_files='${makefiles}':" \ + -i ${S}/configure + +} + +gst-plugins-good_src_compile() { + + gst-plugins-good_src_configure ${@} + + gst-plugins10_find_plugin_dir + emake || die "compile failure" + +} + +gst-plugins-good_src_install() { + + gst-plugins10_find_plugin_dir + einstall || die + + [[ -e README ]] && dodoc README +} + +EXPORT_FUNCTIONS src_unpack src_compile src_install diff --git a/eclass/gst-plugins-ugly.eclass b/eclass/gst-plugins-ugly.eclass new file mode 100644 index 0000000..eaf61b6 --- /dev/null +++ b/eclass/gst-plugins-ugly.eclass @@ -0,0 +1,113 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-ugly.eclass,v 1.12 2008/12/05 21:45:58 ssuominen Exp $ + +# Author : foser <foser@gentoo.org> + +# gst-plugins-ugly eclass +# +# eclass to make external gst-plugins emergable on a per-plugin basis +# to solve the problem with gst-plugins generating far too much unneeded deps +# +# 3rd party applications using gstreamer now should depend on a set of plugins as +# defined in the source, in case of spider usage obtain recommended plugins to use from +# Gentoo developers responsible for gstreamer <gnome@gentoo.org>, the application developer +# or the gstreamer team. + +inherit eutils gst-plugins10 + + +### +# variable declarations +### + +MY_PN=gst-plugins-ugly +MY_P=${MY_PN}-${PV} +# All relevant configure options for gst-plugins +# need a better way to extract these +# gst-plugins-base 0.9 +my_gst_plugins_ugly="a52dec amrnb cdio dvdread dvdnav lame id3tag mad mpeg2dec sidplay" + +#SRC_URI="mirror://gnome/sources/gst-plugins/${PV_MAJ_MIN}/${MY_P}.tar.bz2" +SRC_URI="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/${MY_P}.tar.bz2" + +S=${WORKDIR}/${MY_P} + +# added to remove circular deps +# 6/2/2006 - zaheerm +if [ "${PN}" != "${MY_PN}" ]; then +RDEPEND="=media-libs/gst-plugins-base-0.10*" +DEPEND=">=sys-apps/sed-4 + dev-util/pkgconfig" +fi + +### +# public functions +### + +gst-plugins-ugly_src_configure() { + + # disable any external plugin besides the plugin we want + local plugin gst_conf + + einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..." + + for plugin in ${GST_PLUGINS_BUILD}; do + my_gst_plugins_ugly=${my_gst_plugins_ugly/${plugin}/} + done + for plugin in ${my_gst_plugins_ugly}; do + gst_conf="${gst_conf} --disable-${plugin} " + done + for plugin in ${GST_PLUGINS_BUILD}; do + gst_conf="${gst_conf} --enable-${plugin} " + done + + cd ${S} + econf ${@} --with-package-name="Gentoo GStreamer Ebuild" --with-package-origin="http://www.gentoo.org" ${gst_conf} || die "./configure failure" + +} + +### +# public inheritable functions +### + +gst-plugins-ugly_src_unpack() { + + local makefiles + + unpack ${A} + + # Link with the syswide installed gst-libs if needed + gst-plugins10_find_plugin_dir + cd ${S} + + # Remove generation of any other Makefiles except the plugin's Makefile + if [ -d "${S}/sys/${GST_PLUGINS_BUILD_DIR}" ]; then + makefiles="Makefile sys/Makefile sys/${GST_PLUGINS_BUILD_DIR}/Makefile" + elif [ -d "${S}/ext/${GST_PLUGINS_BUILD_DIR}" ]; then + makefiles="Makefile ext/Makefile ext/${GST_PLUGINS_BUILD_DIR}/Makefile" + fi + sed -e "s:ac_config_files=.*:ac_config_files='${makefiles}':" \ + -i ${S}/configure + +} + +gst-plugins-ugly_src_compile() { + + gst-plugins-ugly_src_configure ${@} + + gst-plugins10_find_plugin_dir + emake || die "compile failure" + +} + +gst-plugins-ugly_src_install() { + + gst-plugins10_find_plugin_dir + einstall || die + + [[ -e README ]] && dodoc README +} + + +EXPORT_FUNCTIONS src_unpack src_compile src_install diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass new file mode 100644 index 0000000..f05c743 --- /dev/null +++ b/eclass/kernel-2.eclass @@ -0,0 +1,1087 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.215 2008/08/07 02:05:49 mpagano Exp $ + +# Description: kernel.eclass rewrite for a clean base regarding the 2.6 +# series of kernel with back-compatibility for 2.4 +# +# Original author: John Mylchreest <johnm@gentoo.org> +# Maintainer: kernel-misc@gentoo.org +# +# Please direct your bugs to the current eclass maintainer :) + +# added functionality: +# unipatch - a flexible, singular method to extract, add and remove patches. + +# A Couple of env vars are available to effect usage of this eclass +# These are as follows: +# +# K_USEPV - When setting the EXTRAVERSION variable, it should +# add PV to the end. +# this is useful for thigns like wolk. IE: +# EXTRAVERSION would be something like : -wolk-4.19-r1 +# K_NOSETEXTRAVERSION - if this is set then EXTRAVERSION will not be +# automatically set within the kernel Makefile +# K_NOUSENAME - if this is set then EXTRAVERSION will not include the +# first part of ${PN} in EXTRAVERSION +# K_NOUSEPR - if this is set then EXTRAVERSION will not include the +# anything based on ${PR}. +# K_PREPATCHED - if the patchset is prepatched (ie: mm-sources, +# ck-sources, ac-sources) it will use PR (ie: -r5) as +# the patchset version for +# and not use it as a true package revision +# K_EXTRAEINFO - this is a new-line seperated list of einfo displays in +# postinst and can be used to carry additional postinst +# messages +# K_EXTRAELOG - same as K_EXTRAEINFO except using elog instead of einfo +# K_EXTRAEWARN - same as K_EXTRAEINFO except using ewarn instead of einfo +# K_SYMLINK - if this is set, then forcably create symlink anyway +# +# K_DEFCONFIG - Allow specifying a different defconfig target. +# If length zero, defaults to "defconfig". +# K_WANT_GENPATCHES - Apply genpatches to kernel source. Provide any +# combination of "base" and "extras" +# K_GENPATCHES_VER - The version of the genpatches tarball(s) to apply. +# A value of "5" would apply genpatches-2.6.12-5 to +# my-sources-2.6.12.ebuild +# K_SECURITY_UNSUPPORTED- If set, this kernel is unsupported by Gentoo Security + +# H_SUPPORTEDARCH - this should be a space separated list of ARCH's which +# can be supported by the headers ebuild + +# UNIPATCH_LIST - space delimetered list of patches to be applied to the +# kernel +# UNIPATCH_EXCLUDE - an addition var to support exlusion based completely +# on "<passedstring>*" and not "<passedno#>_*" +# - this should _NOT_ be used from the ebuild as this is +# reserved for end users passing excludes from the cli +# UNIPATCH_DOCS - space delimemeted list of docs to be installed to +# the doc dir +# UNIPATCH_STRICTORDER - if this is set places patches into directories of +# order, so they are applied in the order passed + +inherit eutils toolchain-funcs versionator multilib +EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst pkg_postinst + +# Added by Daniel Ostrow <dostrow@gentoo.org> +# This is an ugly hack to get around an issue with a 32-bit userland on ppc64. +# I will remove it when I come up with something more reasonable. +[[ ${PROFILE_ARCH} == "ppc64" ]] && CHOST="powerpc64-${CHOST#*-}" + +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then + export CTARGET=${CATEGORY/cross-} +fi + +HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ ${HOMEPAGE}" +LICENSE="GPL-2" + +# No need to run scanelf/strip on kernel sources/headers (bug #134453). +RESTRICT="binchecks strip" + +# set LINUX_HOSTCFLAGS if not already set +[[ -z ${LINUX_HOSTCFLAGS} ]] && \ + LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include" + +# debugging functions +#============================================================== +# this function exists only to help debug kernel-2.eclass +# if you are adding new functionality in, put a call to it +# at the start of src_unpack, or during SRC_URI/dep generation. +debug-print-kernel2-variables() { + debug-print "PVR: ${PVR}" + debug-print "CKV: ${CKV}" + debug-print "OKV: ${OKV}" + debug-print "KV: ${KV}" + debug-print "KV_FULL: ${KV_FULL}" + debug-print "RELEASETYPE: ${RELEASETYPE}" + debug-print "RELEASE: ${RELEASE}" + debug-print "UNIPATCH_LIST_DEFAULT: ${UNIPATCH_LIST_DEFAULT} " + debug-print "UNIPATCH_LIST_GENPATCHES: ${UNIPATCH_LIST_GENPATCHES} " + debug-print "UNIPATCH_LIST: ${UNIPATCH_LIST}" + debug-print "S: ${S}" + debug-print "KERNEL_URI: ${KERNEL_URI}" +} + +#Eclass functions only from here onwards ... +#============================================================== +handle_genpatches() { + local tarball + [[ -z ${K_WANT_GENPATCHES} || -z ${K_GENPATCHES_VER} ]] && return -1 + + for i in ${K_WANT_GENPATCHES} ; do + tarball="genpatches-${OKV}-${K_GENPATCHES_VER}.${i}.tar.bz2" + GENPATCHES_URI="${GENPATCHES_URI} mirror://gentoo/${tarball}" + UNIPATCH_LIST_GENPATCHES="${UNIPATCH_LIST_GENPATCHES} ${DISTDIR}/${tarball}" + done +} + +detect_version() { + # this function will detect and set + # - OKV: Original Kernel Version (2.6.0/2.6.0-test11) + # - KV: Kernel Version (2.6.0-gentoo/2.6.0-test11-gentoo-r1) + # - EXTRAVERSION: The additional version appended to OKV (-gentoo/-gentoo-r1) + + if [[ -n ${KV_FULL} ]]; then + # we will set this for backwards compatibility. + KV=${KV_FULL} + + # we know KV_FULL so lets stop here. but not without resetting S + S=${WORKDIR}/linux-${KV_FULL} + return + fi + + # CKV is used as a comparison kernel version, which is used when + # PV doesnt reflect the genuine kernel version. + # this gets set to the portage style versioning. ie: + # CKV=2.6.11_rc4 + CKV=${CKV:-${PV}} + OKV=${OKV:-${CKV}} + OKV=${OKV/_beta/-test} + OKV=${OKV/_rc/-rc} + OKV=${OKV/-r*} + OKV=${OKV/_p*} + + KV_MAJOR=$(get_version_component_range 1 ${OKV}) + KV_MINOR=$(get_version_component_range 2 ${OKV}) + KV_PATCH=$(get_version_component_range 3 ${OKV}) + + if [[ ${KV_MAJOR}${KV_MINOR}${KV_PATCH} -ge 269 ]]; then + KV_EXTRA=$(get_version_component_range 4- ${OKV}) + KV_EXTRA=${KV_EXTRA/[-_]*} + else + KV_PATCH=$(get_version_component_range 3- ${OKV}) + fi + KV_PATCH=${KV_PATCH/[-_]*} + + KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2" + + RELEASE=${CKV/${OKV}} + RELEASE=${RELEASE/_beta} + RELEASE=${RELEASE/_rc/-rc} + RELEASE=${RELEASE/_pre/-pre} + kernel_is ge 2 6 && RELEASE=${RELEASE/-pre/-git} + RELEASETYPE=${RELEASE//[0-9]} + + # Now we know that RELEASE is the -rc/-git + # and RELEASETYPE is the same but with its numerics stripped + # we can work on better sorting EXTRAVERSION. + # first of all, we add the release + EXTRAVERSION="${RELEASE}" + debug-print "0 EXTRAVERSION:${EXTRAVERSION}" + [[ -n ${KV_EXTRA} ]] && EXTRAVERSION=".${KV_EXTRA}${EXTRAVERSION}" + + debug-print "1 EXTRAVERSION:${EXTRAVERSION}" + if [[ -n "${K_NOUSEPR}" ]]; then + # Don't add anything based on PR to EXTRAVERSION + debug-print "1.0 EXTRAVERSION:${EXTRAVERSION}" + elif [[ -n ${K_PREPATCHED} ]]; then + debug-print "1.1 EXTRAVERSION:${EXTRAVERSION}" + EXTRAVERSION="${EXTRAVERSION}-${PN/-*}${PR/r}" + elif [[ "${ETYPE}" = "sources" ]]; then + debug-print "1.2 EXTRAVERSION:${EXTRAVERSION}" + # For some sources we want to use the PV in the extra version + # This is because upstream releases with a completely different + # versioning scheme. + case ${PN/-*} in + wolk) K_USEPV=1;; + vserver) K_USEPV=1;; + esac + + [[ -z "${K_NOUSENAME}" ]] && EXTRAVERSION="${EXTRAVERSION}-${PN/-*}" + [[ -n "${K_USEPV}" ]] && EXTRAVERSION="${EXTRAVERSION}-${PV//_/-}" + [[ -n "${PR//r0}" ]] && EXTRAVERSION="${EXTRAVERSION}-${PR}" + fi + debug-print "2 EXTRAVERSION:${EXTRAVERSION}" + + # The only messing around which should actually effect this is for KV_EXTRA + # since this has to limit OKV to MAJ.MIN.PAT and strip EXTRA off else + # KV_FULL evaluates to MAJ.MIN.PAT.EXT.EXT after EXTRAVERSION + if [[ -n ${KV_EXTRA} ]]; then + OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" + KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${CKV}.bz2 + mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.tar.bz2" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.bz2" + fi + + # We need to set this using OKV, but we need to set it before we do any + # messing around with OKV based on RELEASETYPE + KV_FULL=${OKV}${EXTRAVERSION} + + # we will set this for backwards compatibility. + S=${WORKDIR}/linux-${KV_FULL} + KV=${KV_FULL} + + # -rc-git pulls can be achieved by specifying CKV + # for example: + # CKV="2.6.11_rc3_pre2" + # will pull: + # linux-2.6.10.tar.bz2 & patch-2.6.11-rc3.bz2 & patch-2.6.11-rc3-git2.bz2 + + if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then + OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))" + KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/patch-${CKV//_/-}.bz2 + mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.bz2" + fi + + if [[ ${RELEASETYPE} == -git ]]; then + KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/snapshots/patch-${OKV}${RELEASE}.bz2 + mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.bz2" + fi + + if [[ ${RELEASETYPE} == -rc-git ]]; then + OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))" + KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2 + mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2 + mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2 ${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2" + fi + + debug-print-kernel2-variables + + handle_genpatches +} + +kernel_is() { + [[ -z ${OKV} ]] && detect_version + local operator test value x=0 y=0 z=0 + + case ${1} in + lt) operator="-lt"; shift;; + gt) operator="-gt"; shift;; + le) operator="-le"; shift;; + ge) operator="-ge"; shift;; + eq) operator="-eq"; shift;; + *) operator="-eq";; + esac + + for x in ${@}; do + for((y=0; y<$((3 - ${#x})); y++)); do value="${value}0"; done + value="${value}${x}" + z=$((${z} + 1)) + + case ${z} in + 1) for((y=0; y<$((3 - ${#KV_MAJOR})); y++)); do test="${test}0"; done; + test="${test}${KV_MAJOR}";; + 2) for((y=0; y<$((3 - ${#KV_MINOR})); y++)); do test="${test}0"; done; + test="${test}${KV_MINOR}";; + 3) for((y=0; y<$((3 - ${#KV_PATCH})); y++)); do test="${test}0"; done; + test="${test}${KV_PATCH}";; + *) die "Error in kernel-2_kernel_is(): Too many parameters.";; + esac + done + + [ ${test} ${operator} ${value} ] && return 0 || return 1 +} + +kernel_is_2_4() { + kernel_is 2 4 +} + +kernel_is_2_6() { + kernel_is 2 6 || kernel_is 2 5 +} + +# Capture the sources type and set DEPENDs +if [[ ${ETYPE} == sources ]]; then + DEPEND="!build? ( sys-apps/sed + >=sys-devel/binutils-2.11.90.0.31 + >=sys-libs/ncurses-5.2 + sys-devel/make )" + RDEPEND="virtual/dev-manager" + + PROVIDE="virtual/linux-sources" + kernel_is gt 2 4 && PROVIDE="${PROVIDE} virtual/alsa" + + SLOT="${PVR}" + DESCRIPTION="Sources for the ${KV_MAJOR}.${KV_MINOR} linux kernel" + IUSE="symlink build" +elif [[ ${ETYPE} == headers ]]; then + DESCRIPTION="Linux system headers" + + # Since we should NOT honour KBUILD_OUTPUT in headers + # lets unset it here. + unset KBUILD_OUTPUT + + if [[ ${CTARGET} = ${CHOST} ]]; then + DEPEND="!virtual/os-headers" + PROVIDE="virtual/os-headers" + SLOT="0" + else + SLOT="${CTARGET}" + fi +else + eerror "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\"" + die "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\"" +fi + +# Cross-compile support functions +#============================================================== +kernel_header_destdir() { + [[ ${CTARGET} == ${CHOST} ]] \ + && echo /usr/include \ + || echo /usr/${CTARGET}/usr/include +} + +cross_pre_c_headers() { + use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] +} + +env_setup_xmakeopts() { + # Kernel ARCH != portage ARCH + export KARCH=$(tc-arch-kernel) + + # When cross-compiling, we need to set the ARCH/CROSS_COMPILE + # variables properly or bad things happen ! + xmakeopts="ARCH=${KARCH}" + if [[ ${CTARGET} != ${CHOST} ]] && ! cross_pre_c_headers ; then + xmakeopts="${xmakeopts} CROSS_COMPILE=${CTARGET}-" + elif type -p ${CHOST}-ar > /dev/null ; then + xmakeopts="${xmakeopts} CROSS_COMPILE=${CHOST}-" + fi + export xmakeopts +} + +# Unpack functions +#============================================================== +unpack_2_4() { + # this file is required for other things to build properly, + # so we autogenerate it + make -s mrproper ${xmakeopts} || die "make mrproper failed" + make -s symlinks ${xmakeopts} || die "make symlinks failed" + make -s include/linux/version.h ${xmakeopts} || die "make include/linux/version.h failed" + echo ">>> version.h compiled successfully." +} + +unpack_2_6() { + # this file is required for other things to build properly, so we + # autogenerate it ... generate a .config to keep version.h build from + # spitting out an annoying warning + make -s mrproper ${xmakeopts} 2>/dev/null \ + || die "make mrproper failed" + + # quick fix for bug #132152 which triggers when it cannot include linux + # headers (ie, we have not installed it yet) + if ! make -s defconfig ${xmakeopts} &>/dev/null 2>&1 ; then + touch .config + eerror "make defconfig failed." + eerror "assuming you dont have any headers installed yet and continuing" + epause 5 + fi + + make -s include/linux/version.h ${xmakeopts} 2>/dev/null \ + || die "make include/linux/version.h failed" + rm -f .config >/dev/null +} + +universal_unpack() { + cd ${WORKDIR} + unpack linux-${OKV}.tar.bz2 + if [[ -d "linux" ]]; then + mv linux linux-${KV_FULL} \ + || die "Unable to move source tree to ${KV_FULL}." + elif [[ "${OKV}" != "${KV_FULL}" ]]; then + mv linux-${OKV} linux-${KV_FULL} \ + || die "Unable to move source tree to ${KV_FULL}." + fi + cd "${S}" + + # remove all backup files + find . -iname "*~" -exec rm {} \; 2> /dev/null + + # fix a problem on ppc where TOUT writes to /usr/src/linux breaking sandbox + # only do this for kernel < 2.6.27 since this file does not exist in later + # kernels + if [[ ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} < 2.6.27 ]] + then + sed -i \ + -e 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \ + "${S}"/arch/ppc/Makefile + fi +} + +unpack_set_extraversion() { + cd "${S}" + sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" Makefile + cd "${OLDPWD}" +} + +# Should be done after patches have been applied +# Otherwise patches that modify the same area of Makefile will fail +unpack_fix_install_path() { + cd "${S}" + sed -i -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' Makefile +} + +# Compile Functions +#============================================================== +compile_headers() { + env_setup_xmakeopts + + # if we couldnt obtain HOSTCFLAGS from the Makefile, + # then set it to something sane + local HOSTCFLAGS=$(getfilevar HOSTCFLAGS "${S}"/Makefile) + HOSTCFLAGS=${HOSTCFLAGS:--Wall -Wstrict-prototypes -O2 -fomit-frame-pointer} + + if kernel_is 2 4; then + yes "" | make oldconfig ${xmakeopts} + echo ">>> make oldconfig complete" + make dep ${xmakeopts} + elif kernel_is 2 6; then + # 2.6.18 introduces headers_install which means we dont need any + # of this crap anymore :D + kernel_is ge 2 6 18 && return 0 + + # autoconf.h isnt generated unless it already exists. plus, we have + # no guarantee that any headers are installed on the system... + [[ -f ${ROOT}/usr/include/linux/autoconf.h ]] \ + || touch include/linux/autoconf.h + + # if K_DEFCONFIG isn't set, force to "defconfig" + # needed by mips + if [[ -z ${K_DEFCONFIG} ]]; then + if [[ $(KV_to_int ${KV}) -ge $(KV_to_int 2.6.16) ]]; then + case ${CTARGET} in + powerpc64*) K_DEFCONFIG="ppc64_defconfig";; + powerpc*) K_DEFCONFIG="pmac32_defconfig";; + *) K_DEFCONFIG="defconfig";; + esac + else + K_DEFCONFIG="defconfig" + fi + fi + + # if there arent any installed headers, then there also isnt an asm + # symlink in /usr/include/, and make defconfig will fail, so we have + # to force an include path with $S. + HOSTCFLAGS="${HOSTCFLAGS} -I${S}/include/" + ln -sf asm-${KARCH} "${S}"/include/asm + cross_pre_c_headers && return 0 + + make ${K_DEFCONFIG} HOSTCFLAGS="${HOSTCFLAGS}" ${xmakeopts} || die "defconfig failed (${K_DEFCONFIG})" + if compile_headers_tweak_config ; then + yes "" | make oldconfig HOSTCFLAGS="${HOSTCFLAGS}" ${xmakeopts} || die "2nd oldconfig failed" + fi + make prepare HOSTCFLAGS="${HOSTCFLAGS}" ${xmakeopts} || die "prepare failed" + make prepare-all HOSTCFLAGS="${HOSTCFLAGS}" ${xmakeopts} || die "prepare failed" + fi +} + +compile_headers_tweak_config() { + # some targets can be very very picky, so let's finesse the + # .config based upon any info we may have + case ${CTARGET} in + sh*) + sed -i '/CONFIG_CPU_SH/d' .config + echo "CONFIG_CPU_SH${CTARGET:2:1}=y" >> .config + return 0;; + esac + + # no changes, so lets do nothing + return 1 +} + +# install functions +#============================================================== +install_universal() { + #fix silly permissions in tarball + cd ${WORKDIR} + chown -R root:0 * + chmod -R a+r-w+X,u+w * + cd ${OLDPWD} +} + +install_headers() { + local ddir=$(kernel_header_destdir) + + # 2.6.18 introduces headers_install which means we dont need any + # of this crap anymore :D + if kernel_is ge 2 6 18 ; then + env_setup_xmakeopts + emake headers_install INSTALL_HDR_PATH="${D}"/${ddir}/.. ${xmakeopts} || die + + # let other packages install some of these headers + rm -rf "${D}"/${ddir}/sound #alsa-headers + rm -rf "${D}"/${ddir}/scsi #glibc/uclibc/etc... + return 0 + fi + + # Do not use "linux/*" as that can cause problems with very long + # $S values where the cmdline to cp is too long + cd "${S}" + dodir ${ddir}/linux + cp -pPR "${S}"/include/linux "${D}"/${ddir}/ || die + rm -rf "${D}"/${ddir}/linux/modules + + # Handle multilib headers and crap + local multi_dirs="" multi_defs="" + case $(tc-arch-kernel) in + sparc64) + multi_dirs="sparc sparc64" + multi_defs="!__arch64__ __arch64__" + ;; + x86_64) + multi_dirs="i386 x86_64" + multi_defs="__i386__ __x86_64__" + ;; + ppc64) + multi_dirs="ppc ppc64" + multi_defs="!__powerpc64__ __powerpc64__" + ;; + s390x) + multi_dirs="s390 s390x" + multi_defs="!__s390x__ __s390x__" + ;; + arm) + dodir ${ddir}/asm + cp -pPR "${S}"/include/asm/* "${D}"/${ddir}/asm + [[ ! -e ${D}/${ddir}/asm/arch ]] && ln -sf arch-ebsa285 "${D}"/${ddir}/asm/arch + [[ ! -e ${D}/${ddir}/asm/proc ]] && ln -sf proc-armv "${D}"/${ddir}/asm/proc + ;; + powerpc) + dodir ${ddir}/asm + cp -pPR "${S}"/include/asm/* ${D}/${ddir}/asm + if [[ -e "${S}"/include/asm-ppc ]] ; then + dodir ${ddir}/asm-ppc + cp -pPR "${S}"/include/asm-ppc/* ${D}/${ddir}/asm-ppc + fi + ;; + *) + dodir ${ddir}/asm + cp -pPR "${S}"/include/asm/* ${D}/${ddir}/asm + ;; + esac + if [[ -n ${multi_dirs} ]] ; then + local d ml_inc="" + for d in ${multi_dirs} ; do + dodir ${ddir}/asm-${d} + cp -pPR "${S}"/include/asm-${d}/* ${D}/${ddir}/asm-${d}/ || die "cp asm-${d} failed" + + ml_inc="${ml_inc} ${multi_defs%% *}:${ddir}/asm-${d}" + multi_defs=${multi_defs#* } + done + create_ml_includes ${ddir}/asm ${ml_inc} + fi + + if kernel_is 2 6; then + dodir ${ddir}/asm-generic + cp -pPR "${S}"/include/asm-generic/* ${D}/${ddir}/asm-generic + fi + + # clean up + find "${D}" -name '*.orig' -exec rm -f {} \; + + cd ${OLDPWD} +} + +install_sources() { + local file + + cd "${S}" + dodir /usr/src + echo ">>> Copying sources ..." + + file="$(find ${WORKDIR} -iname "docs" -type d)" + if [[ -n ${file} ]]; then + for file in $(find ${file} -type f); do + echo "${file//*docs\/}" >> "${S}"/patches.txt + echo "===================================================" >> "${S}"/patches.txt + cat ${file} >> "${S}"/patches.txt + echo "===================================================" >> "${S}"/patches.txt + echo "" >> "${S}"/patches.txt + done + fi + + if [[ ! -f ${S}/patches.txt ]]; then + # patches.txt is empty so lets use our ChangeLog + [[ -f ${FILESDIR}/../ChangeLog ]] && \ + echo "Please check the ebuild ChangeLog for more details." \ + > "${S}"/patches.txt + fi + + mv ${WORKDIR}/linux* ${D}/usr/src +} + +# pkg_preinst functions +#============================================================== +preinst_headers() { + local ddir=$(kernel_header_destdir) + [[ -L ${ddir}/linux ]] && rm ${ddir}/linux + [[ -L ${ddir}/asm ]] && rm ${ddir}/asm +} + +# pkg_postinst functions +#============================================================== +postinst_sources() { + local MAKELINK=0 + + # if we have USE=symlink, then force K_SYMLINK=1 + use symlink && K_SYMLINK=1 + + # if we are to forcably symlink, delete it if it already exists first. + if [[ ${K_SYMLINK} > 0 ]]; then + [[ -h ${ROOT}usr/src/linux ]] && rm ${ROOT}usr/src/linux + MAKELINK=1 + fi + + # if the link doesnt exist, lets create it + [[ ! -h ${ROOT}usr/src/linux ]] && MAKELINK=1 + + if [[ ${MAKELINK} == 1 ]]; then + cd ${ROOT}usr/src + ln -sf linux-${KV_FULL} linux + cd ${OLDPWD} + fi + + # Don't forget to make directory for sysfs + [[ ! -d ${ROOT}sys ]] && kernel_is 2 6 && mkdir ${ROOT}sys + + echo + elog "If you are upgrading from a previous kernel, you may be interested" + elog "in the following document:" + elog " - General upgrade guide: http://www.gentoo.org/doc/en/kernel-upgrade.xml" + echo + + # if K_EXTRAEINFO is set then lets display it now + if [[ -n ${K_EXTRAEINFO} ]]; then + echo ${K_EXTRAEINFO} | fmt | + while read -s ELINE; do einfo "${ELINE}"; done + fi + + # if K_EXTRAELOG is set then lets display it now + if [[ -n ${K_EXTRAELOG} ]]; then + echo ${K_EXTRAELOG} | fmt | + while read -s ELINE; do elog "${ELINE}"; done + fi + + # if K_EXTRAEWARN is set then lets display it now + if [[ -n ${K_EXTRAEWARN} ]]; then + echo ${K_EXTRAEWARN} | fmt | + while read -s ELINE; do ewarn "${ELINE}"; done + fi + + # optionally display security unsupported message + if [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then + echo + ewarn "${PN} is UNSUPPORTED by Gentoo Security." + ewarn "This means that it is likely to be vulnerable to recent security issues." + ewarn "For specific information on why this kernel is unsupported, please read:" + ewarn "http://www.gentoo.org/proj/en/security/kernel.xml" + fi + + # warn sparc users that they need to do cross-compiling with >= 2.6.25(bug #214765) + KV_MAJOR=$(get_version_component_range 1 ${OKV}) + KV_MINOR=$(get_version_component_range 2 ${OKV}) + KV_PATCH=$(get_version_component_range 3 ${OKV}) + if [[ "$(tc-arch)" = "sparc" ]] \ + && [[ ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.24 ]] + then + echo + elog "NOTE: Since 2.6.25 the kernel Makefile has changed in a way that" + elog "you now need to do" + elog " make CROSS_COMPILE=sparc64-unknown-linux-gnu-" + elog "instead of just" + elog " make" + elog "to compile the kernel. For more information please browse to" + elog "https://bugs.gentoo.org/show_bug.cgi?id=214765" + echo + fi +} + +postinst_headers() { + elog "Kernel headers are usually only used when recompiling your system libc, as" + elog "such, following the installation of newer headers, it is advised that you" + elog "re-merge your system libc." + elog "Failure to do so will cause your system libc to not make use of newer" + elog "features present in the updated kernel headers." +} + +# pkg_setup functions +#============================================================== +setup_headers() { + [[ -z ${H_SUPPORTEDARCH} ]] && H_SUPPORTEDARCH=${PN/-*/} + for i in ${H_SUPPORTEDARCH}; do + [[ $(tc-arch) == "${i}" ]] && H_ACCEPT_ARCH="yes" + done + + if [[ ${H_ACCEPT_ARCH} != "yes" ]]; then + echo + eerror "This version of ${PN} does not support $(tc-arch)." + eerror "Please merge the appropriate sources, in most cases" + eerror "(but not all) this will be called $(tc-arch)-headers." + die "Package unsupported for $(tc-arch)" + fi +} + +# unipatch +#============================================================== +unipatch() { + local i x y z extention PIPE_CMD UNIPATCH_DROP KPATCH_DIR PATCH_DEPTH ELINE + local STRICT_COUNT PATCH_LEVEL myLC_ALL myLANG extglob_bak + + # set to a standard locale to ensure sorts are ordered properly. + myLC_ALL="${LC_ALL}" + myLANG="${LANG}" + LC_ALL="C" + LANG="" + + [ -z "${KPATCH_DIR}" ] && KPATCH_DIR="${WORKDIR}/patches/" + [ ! -d ${KPATCH_DIR} ] && mkdir -p ${KPATCH_DIR} + + # We're gonna need it when doing patches with a predefined patchlevel + extglob_bak=$(shopt -p extglob) + shopt -s extglob + + # This function will unpack all passed tarballs, add any passed patches, and remove any passed patchnumbers + # usage can be either via an env var or by params + # although due to the nature we pass this within this eclass + # it shall be by param only. + # -z "${UNIPATCH_LIST}" ] && UNIPATCH_LIST="${@}" + UNIPATCH_LIST="${@}" + + #unpack any passed tarballs + for i in ${UNIPATCH_LIST}; do + if echo ${i} | grep -qs -e "\.tar" -e "\.tbz" -e "\.tgz" ; then + if [ -n "${UNIPATCH_STRICTORDER}" ]; then + unset z + STRICT_COUNT=$((10#${STRICT_COUNT} + 1)) + for((y=0; y<$((6 - ${#STRICT_COUNT})); y++)); + do z="${z}0"; + done + PATCH_ORDER="${z}${STRICT_COUNT}" + + mkdir -p "${KPATCH_DIR}/${PATCH_ORDER}" + pushd "${KPATCH_DIR}/${PATCH_ORDER}" >/dev/null + unpack ${i##*/} + popd >/dev/null + else + pushd "${KPATCH_DIR}" >/dev/null + unpack ${i##*/} + popd >/dev/null + fi + + [[ ${i} == *:* ]] && echo ">>> Strict patch levels not currently supported for tarballed patchsets" + else + extention=${i/*./} + extention=${extention/:*/} + PIPE_CMD="" + case ${extention} in + bz2) PIPE_CMD="bzip2 -dc";; + patch) PIPE_CMD="cat";; + diff) PIPE_CMD="cat";; + gz|Z|z) PIPE_CMD="gzip -dc";; + ZIP|zip) PIPE_CMD="unzip -p";; + *) UNIPATCH_DROP="${UNIPATCH_DROP} ${i/:*/}";; + esac + + PATCH_LEVEL=${i/*([^:])?(:)} + i=${i/:*/} + x=${i/*\//} + x=${x/\.${extention}/} + + if [ -n "${PIPE_CMD}" ]; then + if [ ! -r "${i}" ]; then + echo + eerror "FATAL: unable to locate:" + eerror "${i}" + eerror "for read-only. The file either has incorrect permissions" + eerror "or does not exist." + die Unable to locate ${i} + fi + + if [ -n "${UNIPATCH_STRICTORDER}" ]; then + unset z + STRICT_COUNT=$((10#${STRICT_COUNT} + 1)) + for((y=0; y<$((6 - ${#STRICT_COUNT})); y++)); + do z="${z}0"; + done + PATCH_ORDER="${z}${STRICT_COUNT}" + + mkdir -p ${KPATCH_DIR}/${PATCH_ORDER}/ + $(${PIPE_CMD} ${i} > ${KPATCH_DIR}/${PATCH_ORDER}/${x}.patch${PATCH_LEVEL}) + else + $(${PIPE_CMD} ${i} > ${KPATCH_DIR}/${x}.patch${PATCH_LEVEL}) + fi + fi + fi + done + + #populate KPATCH_DIRS so we know where to look to remove the excludes + x=${KPATCH_DIR} + KPATCH_DIR="" + for i in $(find ${x} -type d | sort -n); do + KPATCH_DIR="${KPATCH_DIR} ${i}" + done + + #so now lets get rid of the patchno's we want to exclude + UNIPATCH_DROP="${UNIPATCH_EXCLUDE} ${UNIPATCH_DROP}" + for i in ${UNIPATCH_DROP}; do + ebegin "Excluding Patch #${i}" + for x in ${KPATCH_DIR}; do rm -f ${x}/${i}* 2>/dev/null; done + eend $? + done + + # and now, finally, we patch it :) + for x in ${KPATCH_DIR}; do + for i in $(find ${x} -maxdepth 1 -iname "*.patch*" -or -iname "*.diff*" | sort -n); do + STDERR_T="${T}/${i/*\//}" + STDERR_T="${STDERR_T/.patch*/.err}" + + [ -z ${i/*.patch*/} ] && PATCH_DEPTH=${i/*.patch/} + #[ -z ${i/*.diff*/} ] && PATCH_DEPTH=${i/*.diff/} + + if [ -z "${PATCH_DEPTH}" ]; then PATCH_DEPTH=0; fi + + ebegin "Applying ${i/*\//} (-p${PATCH_DEPTH}+)" + while [ ${PATCH_DEPTH} -lt 5 ]; do + echo "Attempting Dry-run:" >> ${STDERR_T} + echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i}" >> ${STDERR_T} + echo "=======================================================" >> ${STDERR_T} + if [ $(patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i} >> ${STDERR_T}) $? -eq 0 ]; then + echo "Attempting patch:" > ${STDERR_T} + echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch -f < ${i}" >> ${STDERR_T} + echo "=======================================================" >> ${STDERR_T} + if [ $(patch -p${PATCH_DEPTH} --no-backup-if-mismatch -f < ${i} >> ${STDERR_T}) "$?" -eq 0 ]; then + eend 0 + rm ${STDERR_T} + break + else + eend 1 + eerror "Failed to apply patch ${i/*\//}" + eerror "Please attach ${STDERR_T} to any bug you may post." + die "Failed to apply ${i/*\//}" + fi + else + PATCH_DEPTH=$((${PATCH_DEPTH} + 1)) + fi + done + if [ ${PATCH_DEPTH} -eq 5 ]; then + eend 1 + eerror "Please attach ${STDERR_T} to any bug you may post." + die "Unable to dry-run patch." + fi + done + done + + # This is a quick, and kind of nasty hack to deal with UNIPATCH_DOCS which + # sit in KPATCH_DIR's. This is handled properly in the unipatch rewrite, + # which is why I'm not taking too much time over this. + local tmp + for i in ${UNIPATCH_DOCS}; do + tmp="${tmp} ${i//*\/}" + cp -f ${i} ${T}/ + done + UNIPATCH_DOCS="${tmp}" + + # clean up KPATCH_DIR's - fixes bug #53610 + for x in ${KPATCH_DIR}; do rm -Rf ${x}; done + + LC_ALL="${myLC_ALL}" + LANG="${myLANG}" + eval ${extglob_bak} +} + +# getfilevar accepts 2 vars as follows: +# getfilevar <VARIABLE> <CONFIGFILE> +# pulled from linux-info + +getfilevar() { + local workingdir basefname basedname xarch=$(tc-arch-kernel) + + if [[ -z ${1} ]] && [[ ! -f ${2} ]]; then + echo -e "\n" + eerror "getfilevar requires 2 variables, with the second a valid file." + eerror " getfilevar <VARIABLE> <CONFIGFILE>" + else + workingdir=${PWD} + basefname=$(basename ${2}) + basedname=$(dirname ${2}) + unset ARCH + + cd ${basedname} + echo -e "include ${basefname}\ne:\n\t@echo \$(${1})" | \ + make ${BUILD_FIXES} -s -f - e 2>/dev/null + cd ${workingdir} + + ARCH=${xarch} + fi +} + +detect_arch() { + # This function sets ARCH_URI and ARCH_PATCH + # with the neccessary info for the arch sepecific compatibility + # patchsets. + + local ALL_ARCH LOOP_ARCH COMPAT_URI i + + # COMPAT_URI is the contents of ${ARCH}_URI + # ARCH_URI is the URI for all the ${ARCH}_URI patches + # ARCH_PATCH is ARCH_URI broken into files for UNIPATCH + + ARCH_URI="" + ARCH_PATCH="" + ALL_ARCH="ALPHA AMD64 ARM HPPA IA64 M68K MIPS PPC PPC64 S390 SH SPARC X86" + + for LOOP_ARCH in ${ALL_ARCH}; do + COMPAT_URI="${LOOP_ARCH}_URI" + COMPAT_URI="${!COMPAT_URI}" + + [[ -n ${COMPAT_URI} ]] && \ + ARCH_URI="${ARCH_URI} $(echo ${LOOP_ARCH} | tr '[:upper:]' '[:lower:]')? ( ${COMPAT_URI} )" + + if [[ ${LOOP_ARCH} == "$(echo $(tc-arch-kernel) | tr '[:lower:]' '[:upper:]')" ]]; then + for i in ${COMPAT_URI}; do + ARCH_PATCH="${ARCH_PATCH} ${DISTDIR}/${i/*\//}" + done + fi + done +} + +# sparc nastiness +#============================================================== +# This script generates the files in /usr/include/asm for sparc systems +# during installation of sys-kernel/linux-headers. +# Will no longer be needed when full 64 bit support is used on sparc64 +# systems. +# +# Shamefully ripped from Debian +# ---------------------------------------------------------------------- + +# Idea borrowed from RedHat's kernel package + +# This is gonna get replaced by something in multilib.eclass soon... +# --eradicator +generate_sparc_asm() { + local name + + cd $1 || die + mkdir asm + + for h in `( ls asm-sparc; ls asm-sparc64 ) | grep '\.h$' | sort -u`; do + name="$(echo $h | tr a-z. A-Z_)" + # common header + echo "/* All asm/ files are generated and point to the corresponding + * file in asm-sparc or asm-sparc64. + */ + +#ifndef __SPARCSTUB__${name}__ +#define __SPARCSTUB__${name}__ +" > asm/${h} + + # common for sparc and sparc64 + if [ -f asm-sparc/$h -a -f asm-sparc64/$h ]; then + echo "#ifdef __arch64__ +#include <asm-sparc64/$h> +#else +#include <asm-sparc/$h> +#endif +" >> asm/${h} + + # sparc only + elif [ -f asm-sparc/$h ]; then +echo "#ifndef __arch64__ +#include <asm-sparc/$h> +#endif +" >> asm/${h} + + # sparc64 only + else +echo "#ifdef __arch64__ +#include <asm-sparc64/$h> +#endif +" >> asm/${h} + fi + + # common footer + echo "#endif /* !__SPARCSTUB__${name}__ */" >> asm/${h} + done + return 0 +} + +headers___fix() { + # Voodoo to partially fix broken upstream headers. + # note: do not put inline/asm/volatile together (breaks "inline asm volatile") + sed -i \ + -e '/^\#define.*_TYPES_H/{:loop n; bloop}' \ + -e 's:\<\([us]\(8\|16\|32\|64\)\)\>:__\1:g' \ + -e "s/\([[:space:]]\)inline\([[:space:](]\)/\1__inline__\2/g" \ + -e "s/\([[:space:]]\)asm\([[:space:](]\)/\1__asm__\2/g" \ + -e "s/\([[:space:]]\)volatile\([[:space:](]\)/\1__volatile__\2/g" \ + "$@" +} + +# common functions +#============================================================== +kernel-2_src_unpack() { + universal_unpack + debug-print "Doing unipatch" + + [[ -n ${UNIPATCH_LIST} || -n ${UNIPATCH_LIST_DEFAULT} || -n ${UNIPATCH_LIST_GENPATCHES} ]] && \ + unipatch "${UNIPATCH_LIST_DEFAULT} ${UNIPATCH_LIST_GENPATCHES} ${UNIPATCH_LIST}" + + debug-print "Doing premake" + + # allow ebuilds to massage the source tree after patching but before + # we run misc `make` functions below + [[ $(type -t kernel-2_hook_premake) == "function" ]] && kernel-2_hook_premake + + debug-print "Doing unpack_set_extraversion" + + [[ -z ${K_NOSETEXTRAVERSION} ]] && unpack_set_extraversion + unpack_fix_install_path + + # Setup xmakeopts and cd into sourcetree. + env_setup_xmakeopts + cd "${S}" + + # We dont need a version.h for anything other than headers + # at least, I should hope we dont. If this causes problems + # take out the if/fi block and inform me please. + # unpack_2_6 should now be 2.6.17 safe anyways + if [[ ${ETYPE} == headers ]]; then + kernel_is 2 4 && unpack_2_4 + kernel_is 2 6 && unpack_2_6 + fi +} + +kernel-2_src_compile() { + cd "${S}" + [[ ${ETYPE} == headers ]] && compile_headers +} + +kernel-2_pkg_preinst() { + [[ ${ETYPE} == headers ]] && preinst_headers +} + +kernel-2_src_install() { + install_universal + [[ ${ETYPE} == headers ]] && install_headers + [[ ${ETYPE} == sources ]] && install_sources +} + +kernel-2_pkg_postinst() { + [[ ${ETYPE} == headers ]] && postinst_headers + [[ ${ETYPE} == sources ]] && postinst_sources +} + +kernel-2_pkg_setup() { + if kernel_is 2 4; then + if [ "$( gcc-major-version )" -eq "4" ] ; then + echo + ewarn "Be warned !! >=sys-devel/gcc-4.0.0 isn't supported with linux-2.4!" + ewarn "Either switch to another gcc-version (via gcc-config) or use a" + ewarn "newer kernel that supports gcc-4." + echo + ewarn "Also be aware that bugreports about gcc-4 not working" + ewarn "with linux-2.4 based ebuilds will be closed as INVALID!" + echo + epause 10 + fi + fi + + ABI="${KERNEL_ABI}" + [[ ${ETYPE} == headers ]] && setup_headers + [[ ${ETYPE} == sources ]] && echo ">>> Preparing to unpack ..." +} diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass new file mode 100644 index 0000000..437019e --- /dev/null +++ b/eclass/subversion.eclass @@ -0,0 +1,468 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.60 2008/05/27 09:49:09 zlin Exp $ + +# @ECLASS: subversion.eclass +# @MAINTAINER: +# Akinori Hattori <hattya@gentoo.org> +# Bo Ørsted Andresen <zlin@gentoo.org> +# +# Original Author: Akinori Hattori <hattya@gentoo.org> +# +# @BLURB: The subversion eclass is written to fetch software sources from subversion repositories +# @DESCRIPTION: +# The subversion eclass provides functions to fetch, patch and bootstrap +# software sources from subversion repositories. + +inherit eutils + +ESVN="${ECLASS}" + +EXPORT_FUNCTIONS src_unpack pkg_preinst + +DESCRIPTION="Based on the ${ECLASS} eclass" + +DEPEND="dev-util/subversion + net-misc/rsync" + +# @ECLASS-VARIABLE: ESVN_STORE_DIR +# @DESCRIPTION: +# subversion sources store directory. Users may override this in /etc/make.conf +[[ -z ${ESVN_STORE_DIR} ]] && ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src" + +# @ECLASS-VARIABLE: ESVN_FETCH_CMD +# @DESCRIPTION: +# subversion checkout command +ESVN_FETCH_CMD="svn checkout" + +# @ECLASS-VARIABLE: ESVN_UPDATE_CMD +# @DESCRIPTION: +# subversion update command +ESVN_UPDATE_CMD="svn update" + +# @ECLASS-VARIABLE: ESVN_SWITCH_CMD +# @DESCRIPTION: +# subversion switch command +ESVN_SWITCH_CMD="svn switch" + +# @ECLASS-VARIABLE: ESVN_OPTIONS +# @DESCRIPTION: +# the options passed to checkout or update. If you want a specific revision see +# ESVN_REPO_URI instead of using -rREV. +ESVN_OPTIONS="${ESVN_OPTIONS:-}" + +# @ECLASS-VARIABLE: ESVN_REPO_URI +# @DESCRIPTION: +# repository uri +# +# e.g. http://foo/trunk, svn://bar/trunk, svn://bar/branch/foo@1234 +# +# supported protocols: +# http:// +# https:// +# svn:// +# svn+ssh:// +# +# to peg to a specific revision, append @REV to the repo's uri +ESVN_REPO_URI="${ESVN_REPO_URI:-}" + +# @ECLASS-VARIABLE: ESVN_REVISION +# @DESCRIPTION: +# User configurable revision checkout or update to from the repository +# +# Useful for live svn or trunk svn ebuilds allowing the user to peg +# to a specific revision +# +# Note: This should never be set in an ebuild! +ESVN_REVISION="${ESVN_REVISION:-}" + +# @ECLASS-VARIABLE: ESVN_PROJECT +# @DESCRIPTION: +# project name of your ebuild (= name space) +# +# subversion eclass will check out the subversion repository like: +# +# ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/} +# +# so if you define ESVN_REPO_URI as http://svn.collab.net/repo/svn/trunk or +# http://svn.collab.net/repo/svn/trunk/. and PN is subversion-svn. +# it will check out like: +# +# ${ESVN_STORE_DIR}/subversion/trunk +# +# this is not used in order to declare the name of the upstream project. +# so that you can declare this like: +# +# # jakarta commons-loggin +# ESVN_PROJECT=commons/logging +# +# default: ${PN/-svn}. +ESVN_PROJECT="${ESVN_PROJECT:-${PN/-svn}}" + +# @ECLASS-VARIABLE: ESVN_BOOTSTRAP +# @DESCRIPTION: +# bootstrap script or command like autogen.sh or etc.. +ESVN_BOOTSTRAP="${ESVN_BOOTSTRAP:-}" + +# @ECLASS-VARIABLE: ESVN_PATCHES +# @DESCRIPTION: +# subversion eclass can apply patches in subversion_bootstrap(). +# you can use regexp in this variable like *.diff or *.patch or etc. +# NOTE: patches will be applied before ESVN_BOOTSTRAP is processed. +# +# Patches are searched both in ${PWD} and ${FILESDIR}, if not found in either +# location, the installation dies. +ESVN_PATCHES="${ESVN_PATCHES:-}" + +# @ECLASS-VARIABLE: ESVN_RESTRICT +# @DESCRIPTION: +# this should be a space delimited list of subversion eclass features to +# restrict. +# export) +# don't export the working copy to S. +ESVN_RESTRICT="${ESVN_RESTRICT:-}" + +# @ECLASS-VARIABLE: ESVN_OFFLINE +# @DESCRIPTION: +# Set this variable to a non-empty value to disable the automatic updating of +# an svn source tree. This is intended to be set outside the subversion source +# tree by users. +ESVN_OFFLINE="${ESVN_OFFLINE:-${ESCM_OFFLINE}}" + +# @ECLASS-VARIABLE: ESVN_UP_FREQ +# @DESCRIPTION: +# Set the minimum number of hours between svn up'ing in any given svn module. This is particularly +# useful for split KDE ebuilds where we want to ensure that all submodules are compiled for the same +# revision. It should also be kept user overrideable. +ESVN_UP_FREQ="${ESVN_UP_FREQ:=}" + +# @ECLASS-VARIABLE: ESCM_LOGDIR +# @DESCRIPTION: +# User configuration variable. If set to a path such as e.g. /var/log/scm any +# package inheriting from subversion.eclass will record svn revision to +# ${CATEGORY}/${PN}.log in that path in pkg_preinst. This is not supposed to be +# set by ebuilds/eclasses. It defaults to empty so users need to opt in. +ESCM_LOGDIR="${ESCM_LOGDIR:=}" + +# @FUNCTION: subversion_fetch +# @USAGE: [repo_uri] [destination] +# @DESCRIPTION: +# Wrapper function to fetch sources from subversion via svn checkout or svn update, +# depending on whether there is an existing working copy in ${ESVN_STORE_DIR}. +# +# Can take two optional parameters: +# repo_uri - a repository URI. default is ESVN_REPO_URI. +# destination - a check out path in S. +subversion_fetch() { + local repo_uri="$(subversion__get_repository_uri "${1:-${ESVN_REPO_URI}}")" + local revision="$(subversion__get_peg_revision "${1:-${ESVN_REPO_URI}}")" + local S_dest="${2}" + + if [[ -z ${repo_uri} ]]; then + die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." + fi + + [[ -n "${ESVN_REVISION}" ]] && revision="${ESVN_REVISION}" + + # check for the protocol + local protocol="${repo_uri%%:*}" + + case "${protocol}" in + http|https) + # We have to fake the ROOT variable for built_with_use to work in + # e.g. cross-compile environments. + OLDROOT=${ROOT} + ROOT="/" + if ! built_with_use --missing true -o dev-util/subversion webdav-neon webdav-serf || \ + built_with_use --missing false dev-util/subversion nowebdav ; then + echo + eerror "In order to emerge this package, you need to" + eerror "reinstall Subversion with support for WebDAV." + eerror "Subversion requires either Neon or Serf to support WebDAV." + echo + die "${ESVN}: reinstall Subversion with support for WebDAV." + fi + # Reset the ROOT variable to the original one + ROOT=${OLDROOT} + ;; + svn|svn+ssh) + ;; + *) + die "${ESVN}: fetch from '${protocol}' is not yet implemented." + ;; + esac + + addread "/etc/subversion" + addwrite "${ESVN_STORE_DIR}" + + if [[ ! -d ${ESVN_STORE_DIR} ]]; then + debug-print "${FUNCNAME}: initial checkout. creating subversion directory" + mkdir -p "${ESVN_STORE_DIR}" || die "${ESVN}: can't mkdir ${ESVN_STORE_DIR}." + fi + + cd "${ESVN_STORE_DIR}" || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}" + + local wc_path="$(subversion__get_wc_path "${repo_uri}")" + local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion" + + [[ -n "${revision}" ]] && options="${options} -r ${revision}" + + if [[ "${ESVN_OPTIONS}" = *-r* ]]; then + ewarn "\${ESVN_OPTIONS} contains -r, this usage is unsupported. Please" + ewarn "see \${ESVN_REPO_URI}" + fi + + debug-print "${FUNCNAME}: wc_path = \"${wc_path}\"" + debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\"" + debug-print "${FUNCNAME}: options = \"${options}\"" + + if [[ ! -d ${wc_path}/.svn ]]; then + if [[ -n ${ESVN_OFFLINE} ]]; then + ewarn "ESVN_OFFLINE cannot be used when the there is no existing checkout." + fi + # first check out + einfo "subversion check out start -->" + einfo " repository: ${repo_uri}${revision:+@}${revision}" + + debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}${revision:+@}${revision}" + + mkdir -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}." + cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}" + ${ESVN_FETCH_CMD} ${options} "${repo_uri}${revision:+@}${revision}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}." + + elif [[ -n ${ESVN_OFFLINE} ]]; then + subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy." + if [[ -n ${ESVN_REVISION} && ${ESVN_REVISION} != ${ESVN_WC_REVISION} ]]; then + die "${ESVN}: You requested off-line updating and revision ${ESVN_REVISION} but only revision ${ESVN_WC_REVISION} is available locally." + fi + einfo "Fetching disabled: Using existing repository copy at revision ${ESVN_WC_REVISION}." + else + subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy." + + local esvn_up_freq= + if [[ -n ${ESVN_UP_FREQ} ]]; then + if [[ -n ${ESVN_UP_FREQ//[[:digit:]]} ]]; then + die "${ESVN}: ESVN_UP_FREQ must be an integer value corresponding to the minimum number of hours between svn up." + elif [[ -z $(find "${wc_path}/.svn/entries" -mmin "+$((ESVN_UP_FREQ*60))") ]]; then + einfo "Fetching disabled since ${ESVN_UP_FREQ} hours has not passed since last update." + einfo "Using existing repository copy at revision ${ESVN_WC_REVISION}." + esvn_up_freq=no_update + fi + fi + + if [[ -z ${esvn_up_freq} ]]; then + if [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then + einfo "subversion switch start -->" + einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}" + einfo " new repository: ${repo_uri}${revision:+@}${revision}" + + debug-print "${FUNCNAME}: ${ESVN_SWITCH_CMD} ${options} ${repo_uri}" + + cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" + ${ESVN_SWITCH_CMD} ${options} ${repo_uri} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}" + else + # update working copy + einfo "subversion update start -->" + einfo " repository: ${repo_uri}${revision:+@}${revision}" + + debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}" + + cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" + ${ESVN_UPDATE_CMD} ${options} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}." + fi + fi + fi + + einfo " working copy: ${wc_path}" + + if ! has "export" ${ESVN_RESTRICT}; then + cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" + + local S="${S}/${S_dest}" + mkdir -p "${S}" + + # export to the ${WORKDIR} + #* "svn export" has a bug. see http://bugs.gentoo.org/119236 + #* svn export . "${S}" || die "${ESVN}: can't export to ${S}." + rsync -rlpgo --exclude=".svn/" . "${S}" || die "${ESVN}: can't export to ${S}." + fi + + echo +} + +# @FUNCTION: subversion_bootstrap +# @DESCRIPTION: +# Apply patches in ${ESVN_PATCHES} and run ${ESVN_BOOTSTRAP} if specified. +subversion_bootstrap() { + if has "export" ${ESVN_RESTRICT}; then + return + fi + + cd "${S}" + + if [[ -n ${ESVN_PATCHES} ]]; then + einfo "apply patches -->" + + local patch fpatch + + for patch in ${ESVN_PATCHES}; do + if [[ -f ${patch} ]]; then + epatch "${patch}" + + else + for fpatch in ${FILESDIR}/${patch}; do + if [[ -f ${fpatch} ]]; then + epatch "${fpatch}" + + else + die "${ESVN}: ${patch} not found" + + fi + done + + fi + done + + echo + fi + + if [[ -n ${ESVN_BOOTSTRAP} ]]; then + einfo "begin bootstrap -->" + + if [[ -f ${ESVN_BOOTSTRAP} && -x ${ESVN_BOOTSTRAP} ]]; then + einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}" + eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP." + + else + einfo " bootstrap with command: ${ESVN_BOOTSTRAP}" + eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP." + + fi + fi +} + +# @FUNCTION: subversion_src_unpack +# @DESCRIPTION: +# default src_unpack. fetch and bootstrap. +subversion_src_unpack() { + subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch." + subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." +} + +# @FUNCTION: subversion_wc_info +# @USAGE: [repo_uri] +# @RETURN: ESVN_WC_URL, ESVN_WC_ROOT, ESVN_WC_UUID, ESVN_WC_REVISION and ESVN_WC_PATH +# @DESCRIPTION: +# Get svn info for the specified repo_uri. The default repo_uri is ESVN_REPO_URI. +# +# The working copy information on the specified repository URI are set to +# ESVN_WC_* variables. +subversion_wc_info() { + local repo_uri="$(subversion__get_repository_uri "${1:-${ESVN_REPO_URI}}")" + local wc_path="$(subversion__get_wc_path "${repo_uri}")" + + debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" + debug-print "${FUNCNAME}: wc_path = ${wc_path}" + + if [[ ! -d ${wc_path} ]]; then + return 1 + fi + + export ESVN_WC_URL="$(subversion__svn_info "${wc_path}" "URL")" + export ESVN_WC_ROOT="$(subversion__svn_info "${wc_path}" "Repository Root")" + export ESVN_WC_UUID="$(subversion__svn_info "${wc_path}" "Repository UUID")" + export ESVN_WC_REVISION="$(subversion__svn_info "${wc_path}" "Revision")" + export ESVN_WC_PATH="${wc_path}" +} + +## -- Private Functions + +## -- subversion__svn_info() ------------------------------------------------- # +# +# param $1 - a target. +# param $2 - a key name. +# +subversion__svn_info() { + local target="${1}" + local key="${2}" + + env LC_ALL=C svn info "${target}" | grep -i "^${key}" | cut -d" " -f2- +} + +## -- subversion__get_repository_uri() --------------------------------------- # +# +# param $1 - a repository URI. +subversion__get_repository_uri() { + local repo_uri="${1}" + + debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" + + if [[ -z ${repo_uri} ]]; then + die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." + fi + + # delete trailing slash + if [[ -z ${repo_uri##*/} ]]; then + repo_uri="${repo_uri%/}" + fi + + repo_uri="${repo_uri%@*}" + + echo "${repo_uri}" +} + +## -- subversion__get_wc_path() ---------------------------------------------- # +# +# param $1 - a repository URI. +subversion__get_wc_path() { + local repo_uri="$(subversion__get_repository_uri "${1}")" + + debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" + + echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}" +} + +## -- subversion__get_peg_revision() ----------------------------------------- # +# +# param $1 - a repository URI. +subversion__get_peg_revision() { + local repo_uri="${1}" + + debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" + + # repo_uri has peg revision ? + if [[ ${repo_uri} != *@* ]]; then + debug-print "${FUNCNAME}: repo_uri does not have a peg revision." + fi + + local peg_rev= + [[ ${repo_uri} = *@* ]] && peg_rev="${repo_uri##*@}" + + debug-print "${FUNCNAME}: peg_rev = ${peg_rev}" + + echo "${peg_rev}" +} + +# @FUNCTION: subversion_pkg_preinst +# @USAGE: [repo_uri] +# @DESCRIPTION: +# Log the svn revision of source code. Doing this in pkg_preinst because we +# want the logs to stick around if packages are uninstalled without messing with +# config protection. +subversion_pkg_preinst() { + local pkgdate=$(date "+%Y%m%d %H:%M:%S") + subversion_wc_info "${1:-${ESVN_REPO_URI}}" + if [[ -n ${ESCM_LOGDIR} ]]; then + local dir="${ROOT}/${ESCM_LOGDIR}/${CATEGORY}" + if [[ ! -d ${dir} ]]; then + mkdir -p "${dir}" || \ + eerror "Failed to create '${dir}' for logging svn revision to '${PORTDIR_SCM}'" + fi + local logmessage="svn: ${pkgdate} - ${PF}:${SLOT} was merged at revision ${ESVN_WC_REVISION}" + if [[ -d ${dir} ]]; then + echo "${logmessage}" >> "${dir}/${PN}.log" + else + eerror "Could not log the message '${logmessage}' to '${dir}/${PN}.log'" + fi + fi +} diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest new file mode 100644 index 0000000..0a11084 --- /dev/null +++ b/gnome-base/gconf/Manifest @@ -0,0 +1,4 @@ +AUX gconf-2.24.0-automagic-ldap.patch 2442 RMD160 adc1d7e7f8209da674fca5ac6ad91628887535b3 SHA1 ddf6759e0316b811f1d152294cd7de3b3330f62d SHA256 d960ab342d8224853ac689256e910ad8855031a721c73304aa32d5810443798d +AUX gconf-2.24.0-no-gconfd.patch 787 RMD160 bbcd0e1dd0f49053522e703c33a9befb392b2203 SHA1 ccc94c4766a29f1bb3f16c1d1995996ba682686a SHA256 f8352648276d2a2dab162ddade55ec0371e7c4f8bc3834de246fda8c32c66d3c +DIST GConf-2.24.0.tar.bz2 1467817 RMD160 b4016275e9dffa248620303bc2241f6c0081be06 SHA1 e93ff2609c0278075acabdf609f42aa406e20c8e SHA256 990003904ee13b2fd98a61d55fa4d0fcb30fb233454a036bb9465f42d1acbb1b +EBUILD gconf-2.24.0.ebuild 2380 RMD160 5598f2c0b52c1f47027f088a0468fff11d41b015 SHA1 e9076446c72752d058f4abcfe55f247fbcf08f74 SHA256 d24f56838f13c3fad2cca4af4ed8769d0687208914e9025fcfc28bc69a612f00 diff --git a/gnome-base/gconf/files/gconf-2.24.0-automagic-ldap.patch b/gnome-base/gconf/files/gconf-2.24.0-automagic-ldap.patch new file mode 100644 index 0000000..678c5fb --- /dev/null +++ b/gnome-base/gconf/files/gconf-2.24.0-automagic-ldap.patch @@ -0,0 +1,90 @@ +--- + * make openldap support optional and auto-detected + + configure.in | 65 +++++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 43 insertions(+), 22 deletions(-) + +Index: b/configure.in +=================================================================== +--- a/configure.in ++++ b/configure.in +@@ -207,36 +207,57 @@ AC_CHECK_HEADERS(syslog.h sys/wait.h) + + AC_CHECK_FUNCS(getuid sigaction fsync fchmod fdwalk) + ++dnl ************************************************** ++dnl LDAP support. ++dnl ************************************************** ++ ++AC_ARG_WITH(openldap, ++ AS_HELP_STRING([--with-openldap], ++ [Enable LDAP backend @<:@default=auto@:>@]), ++ ,with_openldap=auto) + + LDAP_LIBS= +-AC_CHECK_HEADER(ldap.h, [ ++ ++if test "x$with_openldap" != "xno"; then ++ AC_CHECK_HEADER(ldap.h, [ + AC_CHECK_LIB(ldap, ldap_init, AC_CHECK_LIB(lber, ber_free, [LDAP_LIBS="-lldap -llber"])) + ]) +-AC_SUBST(LDAP_LIBS) +-AM_CONDITIONAL(LDAP_SUPPORT, test -n "$LDAP_LIBS") + +-dnl ************************************************** +-dnl LDAP support. +-dnl ************************************************** +-if test "$os_win32" != yes; then ++ if test "x$os_win32" != "xyes"; then ++ SAVE_CFLAGS="$CFLAGS" ++ SAVE_LIBS="$LIBS" ++ LDAP_CFLAGS="-DLDAP_DEPRECATED" ++ CFLAGS="$CFLAGS $LDAP_CFLAGS" ++ LIBS="$LIBS $LDAP_LIBS" ++ AC_CHECK_FUNCS(ldap_ntlm_bind) ++ CFLAGS="$SAVE_CFLAGS" ++ LIBS="$SAVE_LIBS" ++ ++ else # Win32 ++ LDAP_CFLAGS="-DLDAP_DEPRECATED" ++ LDAP_LIBS="-lwldap32" ++ AC_SUBST(LDAP_CFLAGS) ++ AC_SUBST(LDAP_LIBS) ++ AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support]) ++ msg_ldap="yes" ++ ++ fi # Win32 ++ ++ if test -z "$LDAP_LIBS"; then ++ if test "x$with_openldap" = "xyes"; then ++ AC_MSG_ERROR([*** LDAP support explicitely requested but not found ***]) ++ else ++ AC_MSG_WARN([*** LDAP support not found ***]) ++ fi ++ fi + +-SAVE_CFLAGS="$CFLAGS" +-SAVE_LIBS="$LIBS" +-LDAP_CFLAGS="-DLDAP_DEPRECATED" +-CFLAGS="$CFLAGS $LDAP_CFLAGS" +-LIBS="$LIBS $LDAP_LIBS" +-AC_CHECK_FUNCS(ldap_ntlm_bind) +-CFLAGS="$SAVE_CFLAGS" +-LIBS="$SAVE_LIBS" +- +-else # Win32 +-LDAP_CFLAGS="-DLDAP_DEPRECATED" +-LDAP_LIBS="-lwldap32" ++ have_ldap=yes ++else ++ have_ldap=no ++fi + AC_SUBST(LDAP_CFLAGS) + AC_SUBST(LDAP_LIBS) +-AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support]) +-msg_ldap="yes" +-fi # Win32 ++AM_CONDITIONAL(LDAP_SUPPORT, [test -n "$LDAP_LIBS"]) + + IT_PROG_INTLTOOL([0.35.0]) + diff --git a/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch b/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch new file mode 100644 index 0000000..8ca6a0d --- /dev/null +++ b/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch @@ -0,0 +1,19 @@ +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN GConf-2.23.2.old/gconf/gconftool.c GConf-2.23.2/gconf/gconftool.c +--- GConf-2.23.2.old/gconf/gconftool.c 2008-06-28 05:27:33.000000000 -0400 ++++ GConf-2.23.2/gconf/gconftool.c 2008-09-23 10:20:00.000000000 -0400 +@@ -856,6 +856,7 @@ main (int argc, char** argv) + { + g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n")); + makefile_install_mode = FALSE; ++ return 0; + } + + if (makefile_uninstall_mode && +@@ -863,6 +864,7 @@ main (int argc, char** argv) + { + g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n")); + makefile_uninstall_mode = FALSE; ++ return 0; + } + + if (makefile_install_mode || makefile_uninstall_mode) diff --git a/gnome-base/gconf/gconf-2.24.0.ebuild b/gnome-base/gconf/gconf-2.24.0.ebuild new file mode 100644 index 0000000..5555a96 --- /dev/null +++ b/gnome-base/gconf/gconf-2.24.0.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/gnome-base/gconf/gconf-2.24.0.ebuild,v 1.1 2008/10/20 19:59:44 eva Exp $ + +inherit autotools eutils gnome2 + +MY_PN=GConf +MY_P=${MY_PN}-${PV} +PVP=(${PV//[-\._]/ }) + +DESCRIPTION="Gnome Configuration System and Daemon" +HOMEPAGE="http://www.gnome.org/" +SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="debug doc ldap" + +# FIXME: add policykit support +RDEPEND=">=dev-libs/glib-2.14 + >=x11-libs/gtk+-2.8.16 + >=dev-libs/dbus-glib-0.74 + >=sys-apps/dbus-1 + >=gnome-base/orbit-2.4 + >=dev-libs/libxml2-2 + ldap? ( net-nds/openldap )" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.35 + >=dev-util/pkgconfig-0.9 + >=dev-util/gtk-doc-am-1.10 + doc? ( >=dev-util/gtk-doc-1 )" + +DOCS="AUTHORS ChangeLog NEWS README TODO" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + G2CONF="${G2CONF} + --enable-gtk + --disable-defaults-service + $(use_enable debug) + $(use_with ldap openldap)" + #$(use_enable policykit defaults-service) + kill_gconf +} + +src_unpack() { + gnome2_src_unpack + + # fix bug #193442, GNOME bug #498934 + epatch "${FILESDIR}/${P}-automagic-ldap.patch" + + # fix bug #238276 + epatch "${FILESDIR}/${P}-no-gconfd.patch" + + eautoreconf +} + +src_compile() { + + # We need to use HOST IDL compiler + econf + emake ORBIT_IDL=/usr/bin/orbit-idl-2 +} + +# Can't run tests, missing script. +#src_test() { +# emake -C tests || die "make tests failed" +# sh "${S}"/tests/runtests.sh || die "running tests failed" +#} + +src_install() { + gnome2_src_install + + keepdir /etc/gconf/gconf.xml.mandatory + keepdir /etc/gconf/gconf.xml.defaults + + echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf + doenvd 50gconf || die "doenv failed" + dodir /root/.gconfd +} + +pkg_preinst() { + kill_gconf +} + +pkg_postinst() { + kill_gconf + + #change the permissions to avoid some gconf bugs + einfo "changing permissions for gconf dirs" + find /etc/gconf/ -type d -exec chmod ugo+rx "{}" \; + + einfo "changing permissions for gconf files" + find /etc/gconf/ -type f -exec chmod ugo+r "{}" \; +} + +kill_gconf() { + # This function will kill all running gconfd-2 that could be causing troubles + if [ -x /usr/bin/gconftool-2 ] + then + /usr/bin/gconftool-2 --shutdown + fi + + return 0 +} diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest new file mode 100644 index 0000000..0229f72 --- /dev/null +++ b/gnome-base/orbit/Manifest @@ -0,0 +1,3 @@ +AUX crosscompile.patch 1429 RMD160 8ffda68318bf4531925865318c00eb5b1d017203 SHA1 632f9b4873f35a4a99e445c807646fb5dcbf59ef SHA256 7ce0aa09cf8a2b1a4a65c8a978c6372b9df17ce3a9b6ffb171b2dfe8d7d7b6f7 +DIST ORBit2-2.14.16.tar.bz2 739458 RMD160 69a76a246d06f10708cfda9c420be173e0746b39 SHA1 d366a92f8ce1989caf21cc6884f90cbcad42ea59 SHA256 e7bc69a316e6e2a263987a0aec5c6249dc152361e9559b4818a680681409aac1 +EBUILD orbit-2.14.16.ebuild 1620 RMD160 4b14fc19d84f782835fbece8964f437dcac499d6 SHA1 bc0bbb3013e4b38994687138d42aaa69b1277f20 SHA256 14af41a7bf1ccc01f6be64224e100f8e8da11abf62afef317646e8c0a691d2f4 diff --git a/gnome-base/orbit/files/crosscompile.patch b/gnome-base/orbit/files/crosscompile.patch new file mode 100644 index 0000000..67f85a9 --- /dev/null +++ b/gnome-base/orbit/files/crosscompile.patch @@ -0,0 +1,35 @@ +--- orbit/configure.in~ 2008-12-28 19:45:00.492973322 +0000 ++++ orbit/configure.in 2008-12-28 19:45:00.492973322 +0000 +@@ -193,19 +193,19 @@ + dnl So many people with broken linking setups asked about this + dnl it turned out to be necessary to check for this. + dnl +-dofus_save_libs="$LIBS" +-LIBS="$ORBIT_LIBS $LIBS" +-AC_TRY_RUN([ #include <stdio.h> +- main () +- { +- return 0; +- } ],, +- AC_MSG_ERROR([ +-Linking is badly borked on your system. Please ensure your library path is correct +-Check config.log for details - check near the end of the log above 'failed program was' +-Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the +-prefix you're compiling on: '${prefix}' ])) +-LIBS="$dofus_save_libs" ++dnl dofus_save_libs="$LIBS" ++dnl LIBS="$ORBIT_LIBS $LIBS" ++dnl AC_TRY_RUN([ #include <stdio.h> ++dnl main () ++dnl { ++dnl return 0; ++dnl } ],, ++dnl AC_MSG_ERROR([ ++dnl Linking is badly borked on your system. Please ensure your library path is correct ++dnl Check config.log for details - check near the end of the log above 'failed program was' ++dnl Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the ++dnl prefix you're compiling on: '${prefix}' ])) ++dnl LIBS="$dofus_save_libs" + + orig_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS" diff --git a/gnome-base/orbit/orbit-2.14.16.ebuild b/gnome-base/orbit/orbit-2.14.16.ebuild new file mode 100644 index 0000000..cc8f146 --- /dev/null +++ b/gnome-base/orbit/orbit-2.14.16.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.16.ebuild,v 1.1 2008/09/20 21:22:26 eva Exp $ + +inherit gnome2 eutils autotools + +MY_P="ORBit2-${PV}" +PVP=(${PV//[-\._]/ }) +S=${WORKDIR}/${MY_P} + +DESCRIPTION="ORBit2 is a high-performance CORBA ORB" +HOMEPAGE="http://www.gnome.org/" +SRC_URI="mirror://gnome/sources/ORBit2/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="doc" + +RDEPEND=">=dev-libs/glib-2.8 + >=dev-libs/libIDL-0.8.2" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.18 + doc? ( >=dev-util/gtk-doc-1 )" + +DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO" + +src_unpack() { + gnome2_src_unpack + + # Filter out G_DISABLE_DEPRECATED to be future-proof, related to bug 213434 + sed -i -e '/DISABLE_DEPRECATED/d' \ + "${S}/linc2/src/Makefile.am" "${S}/linc2/src/Makefile.in" + + sed -i -e 's:-DG_DISABLE_DEPRECATED::g' \ + "${S}/configure.in" "${S}/configure" + epatch "${FILESDIR}/crosscompile.patch" + + # We need to regenerate configure file + eautoreconf +} + +src_compile() { + # We need to unset IDL_DIR, which is set by RSI's IDL. This causes certain + # files to be not found by autotools when compiling ORBit. See bug #58540 + # for more information. Please don't remove -- 8/18/06 + unset IDL_DIR + + # We need to enforce host compiler + econf + emake IDL_COMPILER=/usr/bin/orbit-idl-2 +} + +src_test() { + # can fail in parallel, see bug #235994 + emake -j1 check || die "tests failed" +} 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/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest new file mode 100644 index 0000000..8d5c16c --- /dev/null +++ b/media-libs/fontconfig/Manifest @@ -0,0 +1,3 @@ +AUX fontconfig-2.6.0-parallel.patch 437 RMD160 5a8ab14d0d86f19d0658768a37927bf1761b3d3c SHA1 f12963e627d0735aed4e3c5b9b16331fd293ce4a SHA256 0f0a2fd2ad9241aa680f2c4fa607cc7898e9d8e8aa585b68d47961f82cf424e8 +DIST fontconfig-2.6.0.tar.gz 1403857 RMD160 2fea7fa3fe1757b58ce53c4225b9f8e6ec7507bf SHA1 93752566b8327485b153bd156049614f779b4c57 SHA256 a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5 +EBUILD fontconfig-2.6.0-r2.ebuild 3428 RMD160 563a663c1c052e3ce8a0f4bd3216582dac08ce41 SHA1 5a13f9773ff7464348799211076f14f3362b58d2 SHA256 c42e2c4cff4c8528a0917ec2e05a3f3ec16f2cc0c61ed12950c2914f9f4a2722 diff --git a/media-libs/fontconfig/files/fontconfig-2.6.0-parallel.patch b/media-libs/fontconfig/files/fontconfig-2.6.0-parallel.patch new file mode 100644 index 0000000..d44af51 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.6.0-parallel.patch @@ -0,0 +1,22 @@ +=== modified file 'fc-case/Makefile.am' +--- fc-case/Makefile.am 2008-06-22 15:28:39 +0000 ++++ fc-case/Makefile.am 2008-06-22 15:50:28 +0000 +@@ -36,6 +36,8 @@ + + noinst_MANS=fc-case.man + ++noinst_HEADERS=$(TARG) ++ + fc_case_SRCS= \ + fc-case.c \ + fccaseint.h \ +@@ -52,7 +54,7 @@ + + ALIAS_FILES = fcalias.h fcaliastail.h + +-BUILT_SOURCES = $(ALIAS_FILES) $(TARG) ++BUILT_SOURCES = $(ALIAS_FILES) + + $(ALIAS_FILES): + touch $(ALIAS_FILES) + diff --git a/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild b/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild new file mode 100644 index 0000000..04c3b5b --- /dev/null +++ b/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild,v 1.10 2008/10/02 16:51:05 ranger Exp $ + +WANT_AUTOMAKE=1.9 + +inherit eutils autotools libtool toolchain-funcs flag-o-matic + +DESCRIPTION="A library for configuring and customizing font access" +HOMEPAGE="http://fontconfig.org/" +SRC_URI="http://fontconfig.org/release/${P}.tar.gz" + +LICENSE="fontconfig" +SLOT="1.0" +KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +IUSE="doc" + +# Purposefully dropped the xml USE flag and libxml2 support. Having this is +# silly since expat is the preferred way to go per upstream and libxml2 support +# simply exists as a fallback when expat isn't around. expat support is the main +# way to go and every other distro uses it. By using the xml USE flag to enable +# libxml2 support, this confuses users and results in most people getting the +# non-standard behavior of libxml2 usage since most profiles have USE=xml + +RDEPEND=">=media-libs/freetype-2.1.4 + >=dev-libs/expat-1.95.3" +DEPEND="${RDEPEND} + dev-util/pkgconfig + doc? ( app-text/docbook-sgml-utils + =app-text/docbook-sgml-dtd-3.1* )" +PDEPEND="app-admin/eselect-fontconfig" + +pkg_setup() { + #To get docbook2pdf + if use doc && ! { built_with_use --missing false app-text/docbook-sgml-utils jadetex \ + || \ + built_with_use --missing false app-text/docbook-sgml-utils tetex; + } + then + die "For this package to be built with the doc use flag, app-text/docbook-sgml-utils must be built with the jadetex use flag" + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epunt_cxx #74077 + epatch "${FILESDIR}"/${P}-parallel.patch + # Neeeded to get a sane .so versionning on fbsd, please dont drop + # If you have to run eautoreconf, you can also leave the elibtoolize call as + # it will be a no-op. + eautomake + elibtoolize +} + +src_compile() { + local myconf + + if tc-is-cross-compiler; then + myconf="--with-arch=${ARCH}" + replace-flags -mtune=* -DMTUNE_CENSORED + replace-flags -march=* -DMARCH_CENSORED + fi + econf $(use_enable doc docs) \ + --localstatedir=/var \ + --with-docdir=/usr/share/doc/${PF} \ + --with-default-fonts=/usr/share/fonts \ + --with-add-fonts=/usr/local/share/fonts \ + ${myconf} || die + + emake || die +} + +src_install() { + emake DESTDIR="${D}" install || die + + #fc-lang directory contains language coverage datafiles + #which are needed to test the coverage of fonts. + insinto /usr/share/fc-lang + doins fc-lang/*.orth + + insinto /etc/fonts + doins "${S}"/fonts.conf + + doman $(find "${S}" -type f -name *.1 -print) + newman doc/fonts-conf.5 fonts.conf.5 + dodoc doc/fontconfig-user.{txt,pdf} + + if use doc; then + doman doc/Fc*.3 + dohtml doc/fontconfig-devel.html + dodoc doc/fontconfig-devel.{txt,pdf} + fi + + dodoc AUTHORS ChangeLog README + + # Changes should be made to /etc/fonts/local.conf, and as we had + # too much problems with broken fonts.conf, we force update it ... + # <azarah@gentoo.org> (11 Dec 2002) + echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig + doenvd "${T}"/37fontconfig +} + +pkg_postinst() { + echo + ewarn "Please make fontconfig configuration changes in /etc/fonts/conf.d/" + ewarn "and NOT to /etc/fonts/fonts.conf, as it will be replaced!" + echo + + if [[ ${ROOT} = / ]]; then + ebegin "Creating global font cache..." + /usr/bin/fc-cache -sr + eend $? + fi +} diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest new file mode 100644 index 0000000..44d943c --- /dev/null +++ b/media-libs/gst-plugins-base/Manifest @@ -0,0 +1,3 @@ +AUX gst-plugins-base-0.10.21-gtkdoc.patch 616 RMD160 867ec46661f588b15de21816309aa45a5cca1bbb SHA1 6b20eb8e4fca6c7b374b8c856de6576453b54319 SHA256 2498479168c08c064cc294deecd3891c011a2448d7bf264e060302916a466579 +DIST gst-plugins-base-0.10.21.tar.bz2 1982446 RMD160 4fa9056c8cc5d21db30074596831ffc14f6b671b SHA1 ae83b3306f52aa3affd014dade30c6cd5c2baa66 SHA256 673f4a45a0f3aa99606a58097bde02d09ad51d7b2e702f0d68eeb6db21d47e93 +EBUILD gst-plugins-base-0.10.21.ebuild 1284 RMD160 6b5fa0e04c71d2744809e5898be762147245ee70 SHA1 7ebb2d346670c0acf5e4cc91677396a32b832a92 SHA256 c0c8343e77e89abb4ba3d6a1f82d148ca046fc0b57eaa19a0288b4c493389d06 diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.21-gtkdoc.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.21-gtkdoc.patch new file mode 100644 index 0000000..3445327 --- /dev/null +++ b/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.21-gtkdoc.patch @@ -0,0 +1,14 @@ +--- common/gtk-doc.mak 2008/09/05 09:20:52 1.25 ++++ common/gtk-doc.mak 2008/10/06 08:36:15 1.26 +@@ -200,8 +200,8 @@ + $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \ + $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \ + fi; \ +- which gtkdoc-rebase >/dev/null && \ +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ ++ (which gtkdoc-rebase >/dev/null && \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || true ; \ + fi) + uninstall-local: + (installfiles=`echo ./html/*.html`; \ + diff --git a/media-libs/gst-plugins-base/gst-plugins-base-0.10.21.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-0.10.21.ebuild new file mode 100644 index 0000000..aee0448 --- /dev/null +++ b/media-libs/gst-plugins-base/gst-plugins-base-0.10.21.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/media-libs/gst-plugins-base/gst-plugins-base-0.10.21.ebuild,v 1.3 2008/12/09 12:02:35 ssuominen Exp $ + +# order is important, gnome2 after gst-plugins +inherit gst-plugins-base gst-plugins10 gnome2 flag-o-matic autotools eutils +# libtool + +DESCRIPTION="Basepack of plugins for gstreamer" +HOMEPAGE="http://gstreamer.sourceforge.net" +SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="debug nls" + +RDEPEND=">=dev-libs/glib-2.8 + >=media-libs/gstreamer-0.10.21 + >=dev-libs/liboil-0.3.14" +DEPEND="nls? ( >=sys-devel/gettext-0.11.5 ) + dev-util/pkgconfig" + +DOCS="AUTHORS README RELEASE" + +src_unpack() { + unpack ${A} + cd "${S}" + + # Needed for sane .so versioning on Gentoo/FreeBSD + # elibtoolize + epatch "${FILESDIR}"/${P}-gtkdoc.patch + AT_M4DIR="common/m4" eautoreconf +} + +src_compile() { + # gst doesnt handle opts well, last tested with 0.10.15 + strip-flags + replace-flags "-O3" "-O2" + + gst-plugins-base_src_configure \ + $(use_enable nls) \ + $(use_enable debug) + emake || die "emake failed." +} + +src_install() { + gnome2_src_install +} diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest new file mode 100644 index 0000000..6b8dba3 --- /dev/null +++ b/media-libs/gst-plugins-good/Manifest @@ -0,0 +1,2 @@ +DIST gst-plugins-good-0.10.11.tar.bz2 2081796 RMD160 7ae2a8c0a2fa5f2703b7238c26bde5b092c6eb92 SHA1 91379437060d893f4c06aae7db7f5e53a600f62f SHA256 05323f065080e3df5f5c9cadceca977598ba106b3eebf2bbec46099becf796b1 +EBUILD gst-plugins-good-0.10.11.ebuild 1785 RMD160 de4ec76d419caab9787c2f5e572058b1688f380f SHA1 8b69a69204c9478ad10b9b5931d0233475b2c37f SHA256 cb6eb70d352a2dc5f449cf6a062aba8ea04ffec4bd086e693b83052d325ecadc diff --git a/media-libs/gst-plugins-good/gst-plugins-good-0.10.11.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-0.10.11.ebuild new file mode 100644 index 0000000..6b062e2 --- /dev/null +++ b/media-libs/gst-plugins-good/gst-plugins-good-0.10.11.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-good/gst-plugins-good-0.10.11.ebuild,v 1.2 2008/12/05 23:05:12 ssuominen Exp $ + +# order is important, gnome2 after gst-plugins +inherit gst-plugins-good gst-plugins10 gnome2 eutils flag-o-matic libtool + +DESCRIPTION="Basepack of plugins for gstreamer" +HOMEPAGE="http://gstreamer.net/" +SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND=">=media-libs/gst-plugins-base-0.10.21 + >=media-libs/gstreamer-0.10.21 + >=dev-libs/liboil-0.3.8" +DEPEND=">=sys-devel/gettext-0.11.5 + dev-util/pkgconfig + !<media-libs/gst-plugins-bad-0.10.9" + +# overrides the eclass +src_unpack() { + unpack ${A} + # Required for FreeBSD sane .so versioning + elibtoolize +} + +src_compile() { + # gst doesnt handle optimisations well + strip-flags + replace-flags "-O3" "-O2" + filter-flags "-fprefetch-loop-arrays" # see bug 22249 + + gst-plugins-good_src_configure \ + --with-default-audiosink=autoaudiosink \ + --with-default-visualizer=goom + + emake || die "emake failed." +} + +# override eclass +src_install() { + gnome2_src_install +} + +DOCS="AUTHORS README RELEASE" + +pkg_postinst () { + gnome2_pkg_postinst + + echo + elog "The Gstreamer plugins setup has changed quite a bit on Gentoo," + elog "applications now should provide the basic plugins needed." + echo + elog "The new seperate plugins are all named 'gst-plugins-<plugin>'." + elog "To get a listing of currently available plugins execute 'emerge -s gst-plugins-'." + elog "In most cases it shouldn't be needed though to emerge extra plugins." +} + +pkg_postrm() { + gnome2_pkg_postrm +} diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest new file mode 100644 index 0000000..1cac041 --- /dev/null +++ b/media-libs/gstreamer/Manifest @@ -0,0 +1,3 @@ +AUX gstreamer-0.10.20-cross-checklib-checking.patch 990 RMD160 3de48cd97c6b5a0b7b6b8de5c5d68b22f9476273 SHA1 f1c202914da67f31f577de1d15db23206570a99b SHA256 a658ff1fb404adc733d0d93913ef5be94caa5e83113d2996363da1236840e257 +DIST gstreamer-0.10.20.tar.bz2 2253801 RMD160 8b3fa0ebdd30071c820bd3a9f7fec2104ff51bff SHA1 a95e731ee2d377c80eecd61a700cfa1090aaae92 SHA256 c839c3872510890bdbdfb43a79fd8b5646f3b9164b637127fb550351dc147eba +EBUILD gstreamer-0.10.20.ebuild 1723 RMD160 1e88f9d6e4dfb4610e44885003498dee4f346167 SHA1 537c80a59abbdb113071379f3e813dcdcbabe801 SHA256 9a4565898e3d76ab7553a4505b7cde625346e827dac801a63681fd4c84285d78 diff --git a/media-libs/gstreamer/files/gstreamer-0.10.20-cross-checklib-checking.patch b/media-libs/gstreamer/files/gstreamer-0.10.20-cross-checklib-checking.patch new file mode 100644 index 0000000..103de4c --- /dev/null +++ b/media-libs/gstreamer/files/gstreamer-0.10.20-cross-checklib-checking.patch @@ -0,0 +1,33 @@ +--- configure.ac 2008-11-12 20:12:08.000000000 +0100 ++++ configure.ac.new 2008-11-12 20:11:58.000000000 +0100 +@@ -501,6 +501,15 @@ + AC_SUBST(GST_DISABLE_XML_DEFINE) + + dnl check for "check", unit testing library/header ++ ++if test x$cross_compiling != x; then ++dnl pkg-config check that for libcheck that works for cross-compiling ++dnl but not normal compilation on Fedora & Ubuntu: ++PKG_CHECK_MODULES(CHECK, check >= 0.9.2, ++ AM_CONDITIONAL(HAVE_CHECK, true), ++ AM_CONDITIONAL(HAVE_CHECK, false) ++ ) ++else + AM_PATH_CHECK(0.9.2, + [ + HAVE_CHECK=yes +@@ -509,13 +518,7 @@ + ], + HAVE_CHECK=no) + AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes") +- +-dnl pkg-config check that for libcheck that works for cross-compiling +-dnl but not normal compilation on Fedora & Ubuntu: +-dnl PKG_CHECK_MODULES(CHECK, check >= 0.9.2, +-dnl AM_CONDITIONAL(HAVE_CHECK, true), +-dnl AM_CONDITIONAL(HAVE_CHECK, false) +-dnl ) ++fi + + dnl *** set variables based on configure arguments + diff --git a/media-libs/gstreamer/gstreamer-0.10.20.ebuild b/media-libs/gstreamer/gstreamer-0.10.20.ebuild new file mode 100644 index 0000000..9a6f57b --- /dev/null +++ b/media-libs/gstreamer/gstreamer-0.10.20.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.20.ebuild,v 1.9 2008/09/23 20:57:25 jer Exp $ + +inherit autotools eutils libtool + +# Create a major/minor combo for our SLOT and executables suffix +PVP=(${PV//[-\._]/ }) +PV_MAJ_MIN=${PVP[0]}.${PVP[1]} + +DESCRIPTION="Streaming media framework" +HOMEPAGE="http://gstreamer.sourceforge.net" +SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.bz2" + +LICENSE="LGPL-2" +SLOT=${PV_MAJ_MIN} +KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd" +IUSE="debug nls test" + +RDEPEND=">=dev-libs/glib-2.12 + >=dev-libs/libxml2-2.4.9 + >=dev-libs/check-0.9.2" +DEPEND="${RDEPEND} + nls? ( >=sys-devel/gettext-0.11.5 ) + dev-util/pkgconfig + !<media-libs/gst-plugins-ugly-0.10.6-r1 + !=media-libs/gst-plugins-good-0.10.8" + +src_unpack() { + unpack ${A} + + cd "${S}" + + epatch "${FILESDIR}/${P}-cross-checklib-checking.patch" + + eautoreconf || die "autoreconf failed" + + # Needed for sane .so versioning on Gentoo/FreeBSD + elibtoolize +} + +src_compile() { + econf --disable-dependency-tracking \ + --with-package-name="Gentoo GStreamer ebuild" \ + --with-package-origin="http://www.gentoo.org" \ + $(use_enable test tests) \ + $(use_enable debug) \ + $(use_enable nls) + + emake || die "emake failed." +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed." + dodoc AUTHORS ChangeLog NEWS README RELEASE + + # Remove unversioned binaries to allow SLOT installations in future. + cd "${D}"/usr/bin + local gst_bins + for gst_bins in $(ls *-${PV_MAJ_MIN}) ; do + rm ${gst_bins/-${PV_MAJ_MIN}/} + einfo "Removed ${gst_bins/-${PV_MAJ_MIN}/}" + done +} diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest new file mode 100644 index 0000000..8fcdfe8 --- /dev/null +++ b/media-libs/imlib2/Manifest @@ -0,0 +1,4 @@ +AUX imlib2-1.4.2-CVE-2008-5187.patch 678 RMD160 fd7b0078640a3bc7a297d6b32f3063ed48227319 SHA1 aafad3c0692b6f1d78b3d0db902b2c3e7c4a178e SHA256 30e1e7a1185e71efb0c822a01553b2322d4f25dc4da997a02366ab7b365b5852 +DIST imlib2-1.4.2.tar.gz 932684 RMD160 9b1f40ee392c1e27c6a75bbf7e8c7fb379e74695 SHA1 769ea1da26774cd7531d1d66432cf8d7d7b30c2b SHA256 9099c7c33e4150ba6b43d12d1fbe2b7479cfe30285af49a531337c18c088110a +EBUILD imlib2-1.4.2-r1.ebuild 1644 RMD160 1c46715aceb039bfe83dabc09bbd302d1e6908de SHA1 684b536b9ce32acdaae26f8db34b13ec3435ad55 SHA256 0b3345fa84cf5b744cdb4475ce133353979f58a71b292ece2d374aa94be34b02 +MISC metadata.xml 2255 RMD160 da6c5bba4102a0a0bf263ed8f986704d74292a8f SHA1 5e968e9ca6c3640ee5e3c98c6939099014edbb27 SHA256 81f9771e8e64255ed50d174fe917f9ed0507db9afe88df9f29ce311a6075b30f diff --git a/media-libs/imlib2/files/imlib2-1.4.2-CVE-2008-5187.patch b/media-libs/imlib2/files/imlib2-1.4.2-CVE-2008-5187.patch new file mode 100644 index 0000000..24bf7ad --- /dev/null +++ b/media-libs/imlib2/files/imlib2-1.4.2-CVE-2008-5187.patch @@ -0,0 +1,16 @@ +http://bugs.gentoo.org/248057 + +Index: src/modules/loaders/loader_xpm.c +=================================================================== +--- src/modules/loaders/loader_xpm.c (revision 37743) ++++ src/modules/loaders/loader_xpm.c (revision 37744) +@@ -253,8 +253,8 @@ load(ImlibImage * im, ImlibProgressFunct + return 0; + } + ptr = im->data; +- end = ptr + (sizeof(DATA32) * w * h); + pixels = w * h; ++ end = ptr + (pixels); + } + else + { diff --git a/media-libs/imlib2/imlib2-1.4.2-r1.ebuild b/media-libs/imlib2/imlib2-1.4.2-r1.ebuild new file mode 100644 index 0000000..701eb45 --- /dev/null +++ b/media-libs/imlib2/imlib2-1.4.2-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.2-r1.ebuild,v 1.5 2008/12/01 15:17:21 ranger Exp $ + +inherit enlightenment toolchain-funcs eutils + +MY_P=${P/_/-} +DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm" +HOMEPAGE="http://www.enlightenment.org/" + +KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" +IUSE="X bzip2 gif jpeg mmx mp3 png tiff zlib" + +DEPEND="=media-libs/freetype-2* + bzip2? ( app-arch/bzip2 ) + zlib? ( sys-libs/zlib ) + gif? ( >=media-libs/giflib-4.1.0 ) + png? ( >=media-libs/libpng-1.2.1 ) + jpeg? ( media-libs/jpeg ) + tiff? ( >=media-libs/tiff-3.5.5 ) + X? ( x11-libs/libXext x11-proto/xextproto ) + mp3? ( media-libs/libid3tag )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-CVE-2008-5187.patch #248057 +} + +src_compile() { + # imlib2 has diff configure options for x86/amd64 mmx + local myconf="" + if [[ $(tc-arch) == "amd64" ]] ; then + myconf="$(use_enable mmx amd64) --disable-mmx" + else + myconf="--disable-amd64 $(use_enable mmx)" + fi + + [[ $(gcc-major-version) -ge 4 ]] && myconf="${myconf} --enable-visibility-hiding" + + + # Make sure the stuff also builds on cross-compilation + myconf="${myconf} \ + --x-includes=${SYSROOT}/usr/X11R6/include \ + --x-libraries=${SYSROOT}/usr/X11R6/lib" + + export MY_ECONF=" + $(use_with X x) \ + $(use_with jpeg) \ + $(use_with png) \ + $(use_with tiff) \ + $(use_with gif) \ + $(use_with zlib) \ + $(use_with bzip2) \ + $(use_with mp3 id3) \ + ${myconf} \ + " + enlightenment_src_compile +} diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml new file mode 100644 index 0000000..4a2f056 --- /dev/null +++ b/media-libs/imlib2/metadata.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>no-herd</herd> +<maintainer> + <email>vapier@gentoo.org</email> +</maintainer> + <longdescription> +Imlib 2 is the successor to Imlib. It is not just a newer version - it is a +completely new library. Imlib2 can be installed alongside Imlib 1.x without any +problems since they are effectively different libraries - but they Have very +similar functionality. + +Imlib2 can do the following: +* Load image files from disk in one of many formats +* Save images to disk in one of many formats +* Render image data onto other images +* Render images to an X-Windows drawable +* Produce pixmaps and pixmap masks of Images +* Apply filters to images +* Rotate images +* Accept RGBA Data for images +* Scale images +* Alpha blend Images on other images or drawables +* Apply color correction and modification tables and factors to images +* Render images onto images with color correction and modification tables +* Render truetype anti-aliased text +* Render truetype anti-aliased text at any angle +* Render anti-aliased lines +* Render rectangles +* Render linear multi-colored gradients +* Cache data intelligently for maximum performance +* Allocate colors automatically +* Allow full control over caching and color allocation +* Provide highly optimized MMX assembly for core routines +* Provide plug-in filter interface +* Provide on-the-fly runtime plug-in image loading and saving interface +* Fastest image compositing, rendering and manipulation library for X + +If what you want isn't in the list above somewhere then likely Imlib 2 does not +do it. If it does it it likely does it faster than any other library you can find +(this includes gdk-pixbuf, gdkrgb, etc.) primarily because of highly optimized +code and a smart subsystem that does the dirty work for you and picks up the +pieces for you so you can be lazy and let all the optimizations for you. + +Imlib 2 can run without a display, so it can be easily used for background image +processing for web sites or servers - it only requires the X libraries to be +installed - that is all - it does not require an XServer to run unless you wish +to display images. + </longdescription> +</pkgmetadata> diff --git a/media-plugins/gst-plugins-alsa/Manifest b/media-plugins/gst-plugins-alsa/Manifest new file mode 100644 index 0000000..6049ac0 --- /dev/null +++ b/media-plugins/gst-plugins-alsa/Manifest @@ -0,0 +1,2 @@ +DIST gst-plugins-base-0.10.21.tar.bz2 1982446 RMD160 4fa9056c8cc5d21db30074596831ffc14f6b671b SHA1 ae83b3306f52aa3affd014dade30c6cd5c2baa66 SHA256 673f4a45a0f3aa99606a58097bde02d09ad51d7b2e702f0d68eeb6db21d47e93 +EBUILD gst-plugins-alsa-0.10.21.ebuild 450 RMD160 aff451058b69d2454b85ed6abf7291e4543f8865 SHA1 2bea5632bcd95c8e4bd2fdcc8871ec36635518a9 SHA256 928108ff8cefb629a7a928b5abb8e8563e3ef656bdddfe2657c8f811730eb8c8 diff --git a/media-plugins/gst-plugins-alsa/gst-plugins-alsa-0.10.21.ebuild b/media-plugins/gst-plugins-alsa/gst-plugins-alsa-0.10.21.ebuild new file mode 100644 index 0000000..1125729 --- /dev/null +++ b/media-plugins/gst-plugins-alsa/gst-plugins-alsa-0.10.21.ebuild @@ -0,0 +1,12 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-alsa/gst-plugins-alsa-0.10.21.ebuild,v 1.1 2008/12/05 19:54:20 ssuominen Exp $ + +inherit gst-plugins-base + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="" + +RDEPEND=">=media-libs/gst-plugins-base-0.10.21 + media-libs/alsa-lib" +DEPEND="dev-util/pkgconfig" diff --git a/media-plugins/gst-plugins-ogg/Manifest b/media-plugins/gst-plugins-ogg/Manifest new file mode 100644 index 0000000..c893162 --- /dev/null +++ b/media-plugins/gst-plugins-ogg/Manifest @@ -0,0 +1,2 @@ +DIST gst-plugins-base-0.10.21.tar.bz2 1982446 RMD160 4fa9056c8cc5d21db30074596831ffc14f6b671b SHA1 ae83b3306f52aa3affd014dade30c6cd5c2baa66 SHA256 673f4a45a0f3aa99606a58097bde02d09ad51d7b2e702f0d68eeb6db21d47e93 +EBUILD gst-plugins-ogg-0.10.21.ebuild 456 RMD160 24673ada1f40f0bcfba00478917ae4c9d3c4e92b SHA1 7fa1038c4345c5a5cf84319e7af84bc924dd783d SHA256 3c8980951ca50e1fb65b6200cdb27f302df66909c70482cc845550fd8d8538ce diff --git a/media-plugins/gst-plugins-ogg/gst-plugins-ogg-0.10.21.ebuild b/media-plugins/gst-plugins-ogg/gst-plugins-ogg-0.10.21.ebuild new file mode 100644 index 0000000..2299555 --- /dev/null +++ b/media-plugins/gst-plugins-ogg/gst-plugins-ogg-0.10.21.ebuild @@ -0,0 +1,12 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ogg/gst-plugins-ogg-0.10.21.ebuild,v 1.1 2008/12/05 20:01:51 ssuominen Exp $ + +inherit gst-plugins-base + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND=">=media-libs/gst-plugins-base-0.10.21 + media-libs/libogg" +DEPEND="dev-util/pkgconfig" diff --git a/media-plugins/gst-plugins-vorbis/Manifest b/media-plugins/gst-plugins-vorbis/Manifest new file mode 100644 index 0000000..cf2ec85 --- /dev/null +++ b/media-plugins/gst-plugins-vorbis/Manifest @@ -0,0 +1,2 @@ +DIST gst-plugins-base-0.10.21.tar.bz2 1982446 RMD160 4fa9056c8cc5d21db30074596831ffc14f6b671b SHA1 ae83b3306f52aa3affd014dade30c6cd5c2baa66 SHA256 673f4a45a0f3aa99606a58097bde02d09ad51d7b2e702f0d68eeb6db21d47e93 +EBUILD gst-plugins-vorbis-0.10.21.ebuild 484 RMD160 550515bc38ea34c7df04d5d17af5388b2fbee1d2 SHA1 13f07575e0a025a25a658c9bdea9cb38794597eb SHA256 e1c1d226edbd20e53b9f4f96018af1ede95d9b6ce5467452172ac6226aa99917 diff --git a/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.21.ebuild b/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.21.ebuild new file mode 100644 index 0000000..e9ec75d --- /dev/null +++ b/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.21.ebuild @@ -0,0 +1,13 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.21.ebuild,v 1.1 2008/12/05 20:03:18 ssuominen Exp $ + +inherit gst-plugins-base + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND=">=media-libs/gst-plugins-base-0.10.21 + media-libs/libvorbis + media-libs/libogg" +DEPEND="dev-util/pkgconfig" diff --git a/media-plugins/gst-plugins-x/Manifest b/media-plugins/gst-plugins-x/Manifest new file mode 100644 index 0000000..363ba4e --- /dev/null +++ b/media-plugins/gst-plugins-x/Manifest @@ -0,0 +1,2 @@ +DIST gst-plugins-base-0.10.21.tar.bz2 1982446 RMD160 4fa9056c8cc5d21db30074596831ffc14f6b671b SHA1 ae83b3306f52aa3affd014dade30c6cd5c2baa66 SHA256 673f4a45a0f3aa99606a58097bde02d09ad51d7b2e702f0d68eeb6db21d47e93 +EBUILD gst-plugins-x-0.10.21.ebuild 549 RMD160 f6b032a37fac679120acb5bf7b2bf601bad30384 SHA1 448f69debdcfa4fb9f8a3f4a6dd6d242ba44bfaf SHA256 0c75a7fb2641e23ca9cdb1f4056725fafc84abc732ac0b85023a0235d88dab5b diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.21.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.21.ebuild new file mode 100644 index 0000000..4b83d23 --- /dev/null +++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.21.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.21.ebuild,v 1.1 2008/12/05 20:05:38 ssuominen Exp $ + +inherit gst-plugins-base + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND=">=media-libs/gst-plugins-base-0.10.21 + x11-libs/libX11" +DEPEND="x11-proto/xproto" + +# xshm is a compile time option of ximage +GST_PLUGINS_BUILD="x xshm" +GST_PLUGINS_BUILD_DIR="ximage" diff --git a/media-sound/alsa-scenarios-gta02/Manifest b/media-sound/alsa-scenarios-gta02/Manifest new file mode 100644 index 0000000..d1ecd19 --- /dev/null +++ b/media-sound/alsa-scenarios-gta02/Manifest @@ -0,0 +1 @@ +EBUILD alsa-scenarios-gta02-20081028.ebuild 673 RMD160 cd5509795018dbfcb16463b3946aea778ed00f91 SHA1 80870f1568446b15d73152225865d41f8181a270 SHA256 bdfaf145ea36693b458d88f969e2fe0762b44cbd11cbc520a965594330455a8c diff --git a/media-sound/alsa-scenarios-gta02/alsa-scenarios-gta02-20081028.ebuild b/media-sound/alsa-scenarios-gta02/alsa-scenarios-gta02-20081028.ebuild new file mode 100644 index 0000000..9d7e627 --- /dev/null +++ b/media-sound/alsa-scenarios-gta02/alsa-scenarios-gta02-20081028.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="ALSA scenario files for the Openmoko Freerunner" +HOMEPAGE="http://www.openmoko.org" +ESVN_REPO_URI="http://svn.openmoko.org/trunk/src/target/audio/om-gta02/" +ESVN_REVISION="r4870" + +LICENSE="GPL" +SLOT="0" +KEYWORDS="~arm" +IUSE="" + +inherit subversion + +RDEPEND="media-libs/alsa-lib + media-sound/alsa-utils" +DEPEND="" + +PROVIDE="virtual/alsa-scenarios" + +src_unpack() { + subversion_src_unpack +} + +src_install() { + mkdir --parent "${D}/usr/share/openmoko/scenarios" + + install -D -m 644 "${S}/"*.state "${D}/usr/share/openmoko/scenarios/" +} diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest new file mode 100644 index 0000000..2618ed7 --- /dev/null +++ b/media-sound/alsa-utils/Manifest @@ -0,0 +1,8 @@ +AUX alsa-modules.conf-rc 1028 RMD160 8e115310eb0e13e08b21304c98a78e721be0029a SHA1 7a2b5fed91fa640894efaf2f557eb2b04aff1a40 SHA256 6060c101ca0793ea80e2b6b5bb8d6b118325092788ff26f07c280dd1ff546570 +AUX alsa-utils-1.0.11_rc2-nls.patch 587 RMD160 9dff7b5f75295834457ff93a13d485d66685cdf3 SHA1 79009e9a09e8f3518cbab2d7f00eb4fb3cb410aa SHA256 c68819938d0241dd38293b0e411921b3ad580390183880fd364361fe71cb6d51 +AUX alsa-utils-1.0.11_rc5-alsaconf-redirect.patch 649 RMD160 cfb4dac18bfacf45bbb78e0c3278b431d5015d30 SHA1 02a306c5e555fe6423fb5e10b9c7fc40514b09c2 SHA256 e4da9da92bb88fbf66897da35b588bb81b6d4899a129d59237fd4d65cdd59a55 +AUX alsa-utils-1.0.14-seq.patch 1583 RMD160 4067b69562110bb82e54b7ef77a56bdd2ac48aaf SHA1 aa88f43ffc3b4ef697d2b81b4836cf493b4ce22a SHA256 8150feba5a28cdb5ec095817747f9c130d3f7f1b5929e0943cecd945af5d2e53 +AUX alsasound.confd 1052 RMD160 b3a788626e239a844ac71119e887066074be3b30 SHA1 6386e6097629dcd405b61fd950370e610362a712 SHA256 073015ea00ffcbe536fd15258d30d17cdd8cacd6c334f330882d5ed9bdcf83ad +AUX alsasound.initd 6557 RMD160 6e58e7b93619a505f87f8de7fecc6489daf5638f SHA1 fb1c5436e2ddfa191119fb19d439fe43e9f797f1 SHA256 09e54f5e4f75331a1de3af641623edcf4d687b49f23180f8bc14b42fc471acfe +DIST alsa-utils-1.0.14.tar.bz2 1013872 RMD160 e912588fc6ad223c7176847b8f99c80dd2ca7bb5 SHA1 767e71805ee606a4589bda9e95babbca61f9e92f SHA256 307d630f0ed15e7e92fa35dc0c961737fa9aed22bd7a4a6054a72f85145fa5cb +EBUILD alsa-utils-1.0.14.ebuild 2388 RMD160 ee5597dbd8e3c85f0d86404fa41bd33cf4559aca SHA1 5c7febe9c7daa19175025e7d2e1e8720ee19d5f1 SHA256 782a2631f96d44f47f809863edf4e4966417c7ed2d8d4bd78684f8b74008f786 diff --git a/media-sound/alsa-utils/alsa-utils-1.0.14.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.14.ebuild new file mode 100644 index 0000000..1cc085c --- /dev/null +++ b/media-sound/alsa-utils/alsa-utils-1.0.14.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.14.ebuild,v 1.11 2008/09/01 18:20:51 betelgeuse Exp $ + +WANT_AUTOMAKE="latest" +WANT_AUTOCONF="latest" + +inherit eutils autotools + +MY_P="${P/_rc/rc}" + +DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" +HOMEPAGE="http://www.alsa-project.org/" +SRC_URI="mirror://alsaproject/utils/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0.9" +KEYWORDS="arm sh" +IUSE="nls midi minimal" + +DEPEND="!minimal? ( >=sys-libs/ncurses-5.1 + dev-util/dialog ) + >=media-libs/alsa-lib-1.0.14_rc1" +RDEPEND="${DEPEND} + !minimal? ( virtual/modutils + sys-apps/pciutils + sys-apps/gawk + )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if use midi && ! built_with_use --missing true media-libs/alsa-lib midi; then + eerror "" + eerror "To be able to build alsa-utils with midi support you need" + eerror "to have built media-libs/alsa-lib with midi USE flag." + die "Missing midi USE flag on media-libs/alsa-lib" + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${PN}-1.0.11_rc2-nls.patch" + epatch "${FILESDIR}/${PN}-1.0.11_rc5-alsaconf-redirect.patch" + epatch "${FILESDIR}/${P}-seq.patch" + + AT_M4DIR="m4" eautoreconf +} + +src_compile() { + local myconf + + myconf="" + use minimal && myconf="${myconf} --disable-alsatest --disable-alsamixer" + + econf \ + $(use_enable nls) \ + $(use_enable midi sequencer) \ + ${myconf} \ + || die "configure failed" + + emake || die "make failed" +} + +src_install() { + local ALSA_UTILS_DOCS="ChangeLog README TODO + seq/aconnect/README.aconnect + seq/aseqnet/README.aseqnet" + + emake DESTDIR="${D}" install || die "Installation Failed" + + dodoc ${ALSA_UTILS_DOCS} + newdoc alsamixer/README README.alsamixer + + newinitd "${FILESDIR}/alsasound.initd" alsasound + newconfd "${FILESDIR}/alsasound.confd" alsasound + insinto /etc/modules.d + newins "${FILESDIR}/alsa-modules.conf-rc" alsa + + keepdir /var/lib/alsa +} + +pkg_postinst() { + echo + elog "To take advantage of the init script, and automate the process of" + elog "loading and unloading the ALSA sound drivers as well as" + elog "storing and restoring sound-card mixer levels you should" + elog "add alsasound to the boot runlevel. You can do this as" + elog "root like so:" + elog " # rc-update add alsasound boot" + echo +} diff --git a/media-sound/alsa-utils/files/alsa-modules.conf-rc b/media-sound/alsa-utils/files/alsa-modules.conf-rc new file mode 100644 index 0000000..40e99df --- /dev/null +++ b/media-sound/alsa-utils/files/alsa-modules.conf-rc @@ -0,0 +1,38 @@ +# Alsa kernel modules' configuration file. + +# ALSA portion +alias char-major-116 snd +# OSS/Free portion +alias char-major-14 soundcore + +## +## IMPORTANT: +## You need to customise this section for your specific sound card(s) +## and then run `update-modules' command. +## Read alsa-driver's INSTALL file in /usr/share/doc for more info. +## +## ALSA portion +## alias snd-card-0 snd-interwave +## alias snd-card-1 snd-ens1371 +## OSS/Free portion +## alias sound-slot-0 snd-card-0 +## alias sound-slot-1 snd-card-1 +## + +# OSS/Free portion - card #1 +alias sound-service-0-0 snd-mixer-oss +alias sound-service-0-1 snd-seq-oss +alias sound-service-0-3 snd-pcm-oss +alias sound-service-0-8 snd-seq-oss +alias sound-service-0-12 snd-pcm-oss +## OSS/Free portion - card #2 +## alias sound-service-1-0 snd-mixer-oss +## alias sound-service-1-3 snd-pcm-oss +## alias sound-service-1-12 snd-pcm-oss + +alias /dev/mixer snd-mixer-oss +alias /dev/dsp snd-pcm-oss +alias /dev/midi snd-seq-oss + +# Set this to the correct number of cards. +options snd cards_limit=1 diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc2-nls.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc2-nls.patch new file mode 100644 index 0000000..864df38 --- /dev/null +++ b/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc2-nls.patch @@ -0,0 +1,25 @@ +Index: alsa-utils-1.0.11rc2/speaker-test/speaker-test.c +=================================================================== +--- alsa-utils-1.0.11rc2.orig/speaker-test/speaker-test.c ++++ alsa-utils-1.0.11rc2/speaker-test/speaker-test.c +@@ -44,9 +44,6 @@ + #include <getopt.h> + #include <inttypes.h> + #include <ctype.h> +-#ifdef ENABLE_NLS +-#include <locale.h> +-#endif + #include <byteswap.h> + + #define ALSA_PCM_NEW_HW_PARAMS_API +@@ -59,6 +56,10 @@ + #include "gettext.h" + #include "version.h" + ++#ifdef ENABLE_NLS ++#include <locale.h> ++#endif ++ + enum { + TEST_PINK_NOISE = 1, + TEST_SINE, diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch new file mode 100644 index 0000000..89f74b7 --- /dev/null +++ b/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch @@ -0,0 +1,13 @@ +Index: alsa-utils-1.0.11rc5/alsaconf/alsaconf.in +=================================================================== +--- alsa-utils-1.0.11rc5.orig/alsaconf/alsaconf.in ++++ alsa-utils-1.0.11rc5/alsaconf/alsaconf.in +@@ -1394,7 +1394,7 @@ if [ x$devs_found != x ]; then + Following card(s) are found on your system. + Choose a soundcard to configure: + ") +- $DIALOG --title "$title" --menu "$msg" 17 76 8 "${devs_found[@]}" 2> $FOUND || acex 0 ++ $DIALOG --title "$title" --menu "$msg" 17 76 8 "${devs_found[@]}" --output-fd 3 3> $FOUND || acex 0 + card=`head -n 1 $FOUND` + if [ "$card" = "legacy" ]; then + ac_config_legacy diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.14-seq.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.14-seq.patch new file mode 100644 index 0000000..5bc071f --- /dev/null +++ b/media-sound/alsa-utils/files/alsa-utils-1.0.14-seq.patch @@ -0,0 +1,37 @@ +diff -uNr alsa-utils-1.0.14.ORIG/configure.in alsa-utils-1.0.14/configure.in +--- alsa-utils-1.0.14.ORIG/configure.in 2007-06-27 16:22:05.000000000 +0100 ++++ alsa-utils-1.0.14/configure.in 2007-06-27 16:22:37.000000000 +0100 +@@ -82,6 +82,18 @@ + TESTSOUND="$dir/test.wav") + AC_SUBST(TESTSOUND) + ++AC_ARG_ENABLE([sequencer], ++ [AC_HELP_STRING([--disable-sequencer], [Disable sequencer utilities (aconnect, aplaymidi, aseqdump, aseqnet)])] ) ++ ++if test "x$enable_sequencer" != "xno"; then ++ AC_CHECK_LIB([asound], [snd_seq_open], [has_seq=yes], [has_seq=no]) ++fi ++if test "x$enable_sequencer" = "xyes" && test "x$has_seq" = "xno"; then ++ AC_MSG_FAILURE([cannot find snd_seq_open. ALSA was built without sequencer support]) ++fi ++ ++AM_CONDITIONAL([BUILD_SEQ], [test "x$has_seq" = "xyes"]) ++ + AM_CONFIG_HEADER(include/aconfig.h) + + dnl Checks for typedefs, structures, and compiler characteristics. +diff -uNr alsa-utils-1.0.14.ORIG/Makefile.am alsa-utils-1.0.14/Makefile.am +--- alsa-utils-1.0.14.ORIG/Makefile.am 2007-06-27 16:22:05.000000000 +0100 ++++ alsa-utils-1.0.14/Makefile.am 2007-06-27 16:25:06.000000000 +0100 +@@ -4,7 +4,10 @@ + else + ALSAMIXER_DIR= + endif +-SUBDIRS= include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po ++if BUILD_SEQ ++SEQ_DIR=seq ++endif ++SUBDIRS= include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset $(SEQ_DIR) speaker-test utils m4 po + EXTRA_DIST= config.rpath config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure hgcompile depcomp + AUTOMAKE_OPTIONS=foreign + ACLOCAL_AMFLAGS = -I m4 diff --git a/media-sound/alsa-utils/files/alsasound.confd b/media-sound/alsa-utils/files/alsasound.confd new file mode 100644 index 0000000..2da67da --- /dev/null +++ b/media-sound/alsa-utils/files/alsasound.confd @@ -0,0 +1,41 @@ +# ENABLE_OSS_EMUL: +# Do you want to enable in-kernel oss emulation? +# no - Do not load oss emul drivers +# yes - Load oss emul drivers if they're found + +ENABLE_OSS_EMUL="yes" + +# RESTORE_ON_START: +# Do you want to restore your mixer settings? If not, your cards will be +# muted. +# no - Do not restore state +# yes - Restore state + +RESTORE_ON_START="yes" + +# SAVE_ON_STOP: +# Do you want to save changes made to your mixer volumes when alsasound +# stops? +# no - Do not save state +# yes - Save state + +SAVE_ON_STOP="yes" + +# LOAD_ON_START: +# Do you want to load sound modules when alsasound starts? +# no - Do not load modules +# yes - Load modules +LOAD_ON_START="yes" + +# UNLOAD_ON_STOP: +# Do you want to unload sound modules when alsasound stops? +# no - Do not unload modules +# yes - Unload modules +UNLOAD_ON_STOP="yes" + +# KILLPROC_ON_STOP +# Do you want to kill any processes using ALSA when alsasound stops? +# If you are using ALSA modules, leave as yes. +# no - Do not terminate ALSA processes +# yes - Kill running processes using ALSA +KILLPROC_ON_STOP="yes" diff --git a/media-sound/alsa-utils/files/alsasound.initd b/media-sound/alsa-utils/files/alsasound.initd new file mode 100644 index 0000000..40600cf --- /dev/null +++ b/media-sound/alsa-utils/files/alsasound.initd @@ -0,0 +1,237 @@ +#!/sbin/runscript +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.9 2008/05/15 20:17:46 beandog Exp $ +# Copyright 2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +alsastatedir=/var/lib/alsa +alsascrdir=/etc/alsa.d + +opts="save restore" + +depend() { + need localmount + after bootmisc modules isapnp coldplug hotplug +} + +load_modules() { + # List of drivers for each card. + local DRIVERS="$(modprobe -c | sed -n -e 's/^alias \(snd-card-[[:digit:]]\+\) .*/\1/p')" + + # Fall back on the automated aliases if we don't have ALSA configured properly... + if [ -z "${DRIVERS}" ] && \ + ( [ ! -r /proc/asound/cards ] || grep -q ' no soundcards ' /proc/asound/cards 2>/dev/null ) ; then + ewarn "Could not detect custom ALSA settings. Loading all detected alsa drivers." + DRIVERS="$(modprobe -c | sed -n -e '/^alias pci:.* snd.*/ s/^alias pci:[^ ]* \(.*\)/\1/p' | sort | uniq)" + if [ -z "${DRIVERS}" ] ; then + eerror "Unable to find any ALSA drivers. Have you compiled alsa-drivers correctly?" + fi + fi + + if [ "${ENABLE_OSS_EMUL}" = "yes" ] ; then + DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.*oss/ s:\/.*\/\(.*\).ko:\1:p')" + fi + + # We want to ensure snd-seq is loaded as it is needed for things like + # timidity even if we don't use a real sequencer. + DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.seq\./ s:\/.*\/\(.*\).ko:\1:p')" + + # We want to ensure snd-ioctl32 is loaded as it is needed for 32bit + # compatibility + DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.ioctl32\./ s:\/.*\/\(.*\).ko:\1:p')" + + local DRIVER= DMOD= + for DRIVER in ${DRIVERS} ; do + [ "${DRIVER}" = "off" ] && continue + DMOD="$(echo "${DRIVER}" | sed -e 's/-/_/g')" + if ! grep -q "^${DMOD} " /proc/modules ; then + ebegin "Loading: ${DRIVER}" + modprobe ${DRIVER} + eend $? + fi + done + + if [ -f /proc/asound/seq/drivers ] ; then + local SEQUENCERS="$(sed -n -e 's/\([^,]*\),empty,.*/\1/p' /proc/asound/seq/drivers)" + local SEQUENCER + for SEQUENCER in ${SEQUENCERS} ; do + DMOD="$(echo "${SEQUENCER}" | sed -e 's/-/_/g')" + if ! grep -q "^${DMOD} " /proc/modules ; then + ebegin "Loading: ${SEQUENCER}" + modprobe ${SEQUENCER} + eend $? + fi + done + fi + + for DRIVER in ${DRIVERS} + do + local TMP=${DRIVER##snd-} + TMP=${TMP##snd_} + if [ -x "${alsascrdir}/${TMP}" ] ; then + ebegin "Running: ${alsascrdir}/${TMP}" + "${alsascrdir}/${TMP}" + eend $? + fi + done + + if [ ! -d /proc/asound ] || grep -q ' no soundcards ' /proc/asound/cards ; then + eerror "ERROR: Failed to load necessary drivers" + return 1 + fi +} + +unload_modules_24() { + local LOADED_MODULES="$(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p')" + local MODULE + for MODULE in ${LOADED_MODULES} ; do + rmmod "${MODULE}" + done + rmmod soundcore 2>/dev/null + rmmod gameport 2>/dev/null + + lsmod | grep -vq '^snd' +} + +unload_modules_recursive() { + local revdeps="$(lsmod | sed -n -e "s/,/ /g" -e "s/^$1 *[0-9]* *[0-9]* \(.*\)/\1/p")" + + for module in ${revdeps} ; do + unload_modules_recursive "${module}" + done + + vebegin "Unloading: $1" + rmmod --wait "$1" + veend $? +} + +unload_modules_26() { + # First of all, remove the snd module and all the modules depending + # on it, this should remove already most of ALSA modules. + lsmod | grep -q "^snd[[:space:]]" && unload_modules_recursive snd + + # Then find the remaining ones, and handle them too. + for module in $(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p'); do + unload_modules_recursive "${module}" + done + + lsmod | grep -vq "^snd" +} + +terminate() { + # + # Kill processes holding open sound devices + # + # DEVS=`find /dev/ -follow -type c -maxdepth 1 -print 2>/dev/null | xargs ls -dils | grep "1*1[46]," | cut -d: -f2 | cut -d" " -f2; echo /proc/asound/dev/*` + local ossdevs="/dev/admmidi* /dev/adsp* /dev/amidi* /dev/audio* /dev/dmfm* \ + /dev/dmmidi* /dev/dsp* /dev/dspW* /dev/midi0* /dev/mixer* /dev/music \ + /dev/patmgr* /dev/sequencer* /dev/sndstat" + local alsadevs="/proc/asound/dev/* /dev/sound/* /dev/snd/*" + fuser -k ${ossdevs} ${alsadevs} >/dev/null 2>/dev/null + + # remove all sequencer connections if any + [ -f /proc/asound/seq/clients ] && type aconnect >/dev/null 2>/dev/null && aconnect --removeall +} + +restore() { + ebegin "Restoring Mixer Levels" + + if [ ! -r "${alsastatedir}/asound.state" ] ; then + ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!" + eend 0 + return 0 + fi + + local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)" + local CARDNUM + for cardnum in ${cards}; do + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + alsactl -f "${alsastatedir}/asound.state" restore ${cardnum} \ + || ewarn "Errors while restoring defaults, ignoring" + done + + for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do + [ -e "${ossfile}" ] || continue + # We use cat because I'm not sure if cp works properly on /proc + local procfile=${ossfile##${alsastatedir}/oss} + procfile="$(echo "${procfile}" | sed -e 's,_,/,g')" + if [ -e /proc/asound/"${procfile}"/oss ] ; then + cat "${ossfile}" > /proc/asound/"${procfile}"/oss + fi + done + + eend 0 +} + +save() { + ebegin "Storing ALSA Mixer Levels" + + mkdir -p "${alsastatedir}" + if ! alsactl -f "${alsastatedir}/asound.state" store; then + eerror "Error saving levels." + eend 1 + return 1 + fi + + for ossfile in /proc/asound/card*/pcm*/oss; do + [ -e "${ossfile}" ] || continue + local device=${ossfile##/proc/asound/} ; device=${device%%/oss} + device="$(echo "${device}" | sed -e 's,/,_,g')" + mkdir -p "${alsastatedir}/oss/" + cp "${ossfile}" "${alsastatedir}/oss/${device}" + done + + eend 0 +} + +start() { + if [ -f /proc/modules ] && [ "${LOAD_ON_START}" = "yes" ]; then + ebegin "Loading ALSA modules" + eindent + load_modules + eoutdent + eend $? || return 1 + fi + + if [ ! -d /proc/asound ]; then + eerror "ALSA failed to load." + eend 1 + return 1 + elif [ "${RESTORE_ON_START}" = "yes" ]; then + restore + fi + + return 0 +} + +stop() { + if [ ! -d /proc/asound ] ; then + eerror "ALSA is not loaded" + return 0 + fi + + [ "${SAVE_ON_STOP}" = "yes" ] && save + + if [ "${KILLPROC_ON_STOP}" = "yes" ] ; then + ebegin "Killing processes using ALSA" + terminate + eend 0 + fi + + if [ -f /proc/modules ] && [ "${UNLOAD_ON_STOP}" = "yes" ]; then + local ver="26" + case "$(uname -r)" in + 2.[01234].*) ver="24";; + *) ver="26";; + esac + ebegin "Unloading ALSA modules" + eindent + unload_modules_${ver} + eend $? + eoutdent + fi + + return 0 +} diff --git a/profiles/embedded/ChangeLog b/profiles/embedded/ChangeLog new file mode 100644 index 0000000..b60481e --- /dev/null +++ b/profiles/embedded/ChangeLog @@ -0,0 +1,19 @@ +# ChangeLog for Gentoo base-profile +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/embedded/ChangeLog,v 1.5 2008/06/06 08:16:11 remi Exp $ + + 06 Jun 2008; Rémi Cardona <remi@gentoo.org> package.mask: + pkgmove to gnome-base/gnome-control-center + + 14 Feb 2008; Raúl Porcel <armin76@gentoo.org> virtuals: + Remove useless virtual/bittorrent + + 13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> virtuals: + Remove old-style virtual/ghc as it is no longer used. + + 05 Nov 2007; Duncan Coutts <dcoutts@gentoo.org> virtuals: + Switch to ghc rather than ghc-bin for virtual as we're p.masking ghc-bin + + 10 Oct 2007; Christian Faulhammer <opfer@gentoo.org> virtuals: + remove virtual/editor, we have a new-style virtual now + diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults new file mode 100644 index 0000000..862b827 --- /dev/null +++ b/profiles/embedded/make.defaults @@ -0,0 +1,3 @@ +USE="kdrive minimal multicall zlib" +CFLAGS="-Os -pipe" +CXXFLAGS="${CFLAGS}" diff --git a/profiles/embedded/package.use b/profiles/embedded/package.use new file mode 100644 index 0000000..49943b1 --- /dev/null +++ b/profiles/embedded/package.use @@ -0,0 +1 @@ +sys-apps/busybox make-symlinks diff --git a/profiles/embedded/packages b/profiles/embedded/packages new file mode 100644 index 0000000..d4c5ea6 --- /dev/null +++ b/profiles/embedded/packages @@ -0,0 +1,7 @@ +# Copyright 1999-2008 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/embedded/packages,v 1.3 2008/05/04 07:55:10 solar Exp $ + +# base generic embedded profile + +*>=sys-apps/busybox-0.60.5-r1 diff --git a/profiles/embedded/use.mask b/profiles/embedded/use.mask new file mode 100644 index 0000000..2d7628d --- /dev/null +++ b/profiles/embedded/use.mask @@ -0,0 +1,5 @@ +# Chris PeBenito <pebenito@gentoo.org> +# must use a SELinux profile +selinux + +emul-linux-x86 diff --git a/profiles/embedded/virtuals b/profiles/embedded/virtuals new file mode 100644 index 0000000..e23c85c --- /dev/null +++ b/profiles/embedded/virtuals @@ -0,0 +1,34 @@ +virtual/alsa media-sound/alsa-driver +virtual/alsa-scenarios media-sound/alsa-scenarios-gta02 +virtual/antivirus app-antivirus/clamav +virtual/aspell-dict app-dicts/aspell-en +virtual/blackbox x11-wm/blackbox +virtual/bootloader sys-boot/grub +virtual/cron sys-apps/busybox +virtual/dev-manager sys-apps/busybox +virtual/dhcpcd net-misc/busybox +virtual/libc sys-libs/glibc +virtual/gzip sys-apps/busybox +virtual/imap-c-client net-libs/c-client +virtual/imapUW net-mail/uw-imap +virtual/imapd net-mail/courier-imap +virtual/inetd sys-apps/busybox +virtual/krb5 app-crypt/mit-krb5 +virtual/linux-sources sys-kernel/gentoo-sources +virtual/logger sys-apps/busybox +virtual/lpr net-print/cups +virtual/mda mail-filter/procmail +virtual/modutils sys-apps/busybox +virtual/mta mail-mta/ssmtp +virtual/os-headers sys-kernel/linux-headers +virtual/python dev-lang/python +virtual/quicktime media-libs/libquicktime +virtual/ruby dev-lang/ruby +virtual/skkserv app-i18n/skkserv +virtual/ssh net-misc/dropbear +virtual/sylpheed mail-client/sylpheed +virtual/tftp sys-apps/busybox +virtual/wine app-emulation/wine +virtual/xemacs app-editors/xemacs +virtual/utempter sys-apps/utempter +virtual/eject sys-apps/busybox 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/file/Manifest b/sys-apps/file/Manifest new file mode 100644 index 0000000..94ad143 --- /dev/null +++ b/sys-apps/file/Manifest @@ -0,0 +1,5 @@ +AUX file-4.15-libtool.patch 561 RMD160 f2b9f4c93f199ab3145d70816b3c624349af97a0 SHA1 6e2c1cd8dee4d022c35a056e94a4030af1f4b1fa SHA256 badb8261dad5df39bac1d6a6da1668eb8a2ff0b01c2c80baa8abfe07fd99681d +DIST file-4.23.tar.gz 563704 RMD160 29153a3fb18b2d8f7da9fd66712fbd6ed4ea49f2 SHA1 83a90894a6b89f80207b9fcf0e382a627e4c5f0b SHA256 2fad96e6475b7a67e1e96f05e825b779686fd0cb3f041a10ca6622a4d9f7d147 +DIST file-4.26.tar.gz 584803 RMD160 e8b84e01d1f43faedfe676afc92c2cba4a01ecdf SHA1 412cdac5cd778d867e2d91a01b09858be1998ec3 SHA256 682f7de5c12d35ff2d9e2ec3c6a753bd5a01e0f7f3110501be0bafef1d5e9654 +EBUILD file-4.23.ebuild 1632 RMD160 bca597f4035cbcdc92d707de8258e97a6f71eeaf SHA1 58a610bd9a2966ba1d226817c47c25578d072e89 SHA256 74e34681d73def1c21d1f5eb45e18ad94d204d77f214ff901b0db545f27aef1e +EBUILD file-4.26.ebuild 1644 RMD160 1e1a7937d7f8202bd22a28b73067bbdfcbe0e7cd SHA1 a9b6dd753516f464fbdd9bf9dd21952305418fd9 SHA256 6fea044db910aa0ad44bf428567a04d6a8dd1a8f5207434e5773ead99ad2dcd8 diff --git a/sys-apps/file/file-4.23.ebuild b/sys-apps/file/file-4.23.ebuild new file mode 100644 index 0000000..a028404 --- /dev/null +++ b/sys-apps/file/file-4.23.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.23.ebuild,v 1.7 2008/03/29 15:23:34 ranger Exp $ + +inherit eutils distutils libtool flag-o-matic toolchain-funcs + +DESCRIPTION="identify a file's format by scanning binary data for patterns" +HOMEPAGE="ftp://ftp.astron.com/pub/file/" +SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz + ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +IUSE="python" + +DEPEND="" + +src_unpack() { + unpack ${P}.tar.gz + cd "${S}" + + epatch "${FILESDIR}"/${PN}-4.15-libtool.patch #99593 + + elibtoolize + epunt_cxx + + # make sure python links against the current libmagic #54401 + sed -i "/library_dirs/s:'\.\./src':'../src/.libs':" python/setup.py + + if tc-is-cross-compiler ; then + # make sure cross-compilation uses correct libs and headers + sed -i -e "s%'/usr/%'${SYSROOT}/usr/%g" python/setup.py + fi + + # dont let python README kill main README #60043 + mv python/README{,.python} +} + +src_compile() { + # file uses things like strndup() and wcwidth() + append-flags -D_GNU_SOURCE + + econf --datadir=/usr/share/misc || die + emake || die "emake failed" + + use python && cd python && distutils_src_compile +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + dodoc ChangeLog MAINT README + + use python && cd python && distutils_src_install +} + +pkg_postinst() { + use python && distutils_pkg_postinst +} + +pkg_postrm() { + use python && distutils_pkg_postrm +} diff --git a/sys-apps/file/file-4.26.ebuild b/sys-apps/file/file-4.26.ebuild new file mode 100644 index 0000000..8fe0b37 --- /dev/null +++ b/sys-apps/file/file-4.26.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.26.ebuild,v 1.1 2008/09/17 09:51:34 vapier Exp $ + +inherit eutils distutils libtool flag-o-matic toolchain-funcs + +DESCRIPTION="identify a file's format by scanning binary data for patterns" +HOMEPAGE="ftp://ftp.astron.com/pub/file/" +SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz + ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="python" + +DEPEND="" + +src_unpack() { + unpack ${P}.tar.gz + cd "${S}" + + epatch "${FILESDIR}"/${PN}-4.15-libtool.patch #99593 + + elibtoolize + epunt_cxx + + # make sure python links against the current libmagic #54401 + sed -i "/library_dirs/s:'\.\./src':'../src/.libs':" python/setup.py + + if tc-is-cross-compiler ; then + # make sure cross-compilation uses correct libs and headers + sed -i -e "s%'/usr/%'${SYSROOT}/usr/%g" python/setup.py + fi + + # dont let python README kill main README #60043 + mv python/README{,.python} +} + +src_compile() { + # file uses things like strndup() and wcwidth() + append-flags -D_GNU_SOURCE + + econf --datadir=/usr/share/misc || die + emake || die "emake failed" + + use python && cd python && distutils_src_compile +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + dodoc ChangeLog MAINT README + + use python && cd python && distutils_src_install +} + +pkg_postinst() { + use python && distutils_pkg_postinst +} + +pkg_postrm() { + use python && distutils_pkg_postrm +} diff --git a/sys-apps/file/files/file-4.15-libtool.patch b/sys-apps/file/files/file-4.15-libtool.patch new file mode 100644 index 0000000..c41c8fe --- /dev/null +++ b/sys-apps/file/files/file-4.15-libtool.patch @@ -0,0 +1,19 @@ +Fix build time issues with tools who like to export LD_LIBRARY_PATH +to retarded values. + +http://bugs.gentoo.org/99593 + +--- ltmain.sh ++++ ltmain.sh +@@ -5085,6 +5085,11 @@ + $echo >> $output "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. ++ ++ # Make sure env LD_LIBRARY_PATH does not mess us up ++ if test -n \"\${LD_LIBRARY_PATH+set}\"; then ++ export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH ++ fi + " + case $host in + # Backslashes separate directories on plain windows diff --git a/sys-apps/gawk/ChangeLog b/sys-apps/gawk/ChangeLog new file mode 100644 index 0000000..7cdc596 --- /dev/null +++ b/sys-apps/gawk/ChangeLog @@ -0,0 +1,493 @@ +# ChangeLog for sys-apps/gawk +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.124 2008/10/28 10:45:16 armin76 Exp $ + + 28 Oct 2008; Raúl Porcel <armin76@gentoo.org> gawk-3.1.6.ebuild: + alpha/ia64 stable #244384 + + 27 Oct 2008; Brent Baude <ranger@gentoo.org> gawk-3.1.6.ebuild: + stable ppc64, bug 244384 + + 26 Oct 2008; Markus Meier <maekke@gentoo.org> gawk-3.1.6.ebuild: + amd64 stable, bug #244384 + + 26 Oct 2008; nixnut <nixnut@gentoo.org> gawk-3.1.6.ebuild: + Stable on ppc wrt bug 244384 + + 26 Oct 2008; Torsten Veller <tove@gentoo.org> gawk-3.1.6.ebuild: + Stable on x86 (#244384) + + 26 Oct 2008; Jeroen Roovers <jer@gentoo.org> gawk-3.1.6.ebuild: + Stable for HPPA (bug #244384). + + 26 Oct 2008; Ferris McCormick <fmccor@gentoo.org> gawk-3.1.6.ebuild: + Sparc stable, Bug #244384 and required for Bug #244246. Looks fine. + + 05 May 2008; Mike Frysinger <vapier@gentoo.org> + +files/autoconf-mktime-2.61.patch, gawk-3.1.6.ebuild: + Update mktime test #220040. + +*gawk-3.1.6 (05 May 2008) + + 05 May 2008; Mike Frysinger <vapier@gentoo.org> +gawk-3.1.6.ebuild: + Version bump #219476 by Conrad Kostecki. + + 19 Nov 2007; Joshua Kinard <kumba@gentoo.org> gawk-3.1.5-r5.ebuild: + Stable on mips, per #195212. + + 11 Oct 2007; Tom Gall <tgall@gentoo.org> gawk-3.1.5-r5.ebuild: + stable on ppc64, bug #195212 + + 10 Oct 2007; Lars Weiler <pylon@gentoo.org> gawk-3.1.5-r5.ebuild: + stable ppc, bug #195212 + + 09 Oct 2007; Raúl Porcel <armin76@gentoo.org> gawk-3.1.5-r5.ebuild: + alpha/ia64/sparc stable wrt #195212 + + 09 Oct 2007; Christian Faulhammer <opfer@gentoo.org> gawk-3.1.5-r5.ebuild: + stable x86, bug 195212 + + 09 Oct 2007; Jeroen Roovers <jer@gentoo.org> gawk-3.1.5-r5.ebuild: + Stable for HPPA (bug #195212). + + 09 Oct 2007; Christoph Mende <angelos@gentoo.org> gawk-3.1.5-r5.ebuild: + Stable on amd64 wrt bug #195212 + +*gawk-3.1.5-r5 (25 Aug 2007) + + 25 Aug 2007; Mike Frysinger <vapier@gentoo.org> + +files/gawk-3.1.5-freewstr2.patch, +files/gawk-3.1.5-ipv6.patch, + +files/gawk-3.1.5-mbread.patch, +gawk-3.1.5-r5.ebuild: + Snipe some fixes from Fedora. + +*gawk-3.1.5-r4 (12 Jul 2007) + + 12 Jul 2007; Roy Marples <uberlord@gentoo.org> +gawk-3.1.5-r4.ebuild: + Move gawk to /usr/bin for non GNU userlands. + + 09 Jul 2007; Jeroen Roovers <jer@gentoo.org> gawk-3.1.5-r3.ebuild: + Stable for HPPA (bug #184465). + + 08 Jul 2007; Christoph Mende <angelos@gentoo.org> gawk-3.1.5-r3.ebuild: + Stable on amd64 wrt bug #184465 + + 13 Jun 2007; Raúl Porcel <armin76@gentoo.org> gawk-3.1.5-r3.ebuild: + alpha stable + + 24 Apr 2007; Alexander Færøy <eroyf@gentoo.org> gawk-3.1.5-r3.ebuild: + Stable on MIPS. + + 23 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> gawk-3.1.5-r3.ebuild: + Stable on sparc + + 16 Apr 2007; Markus Rothe <corsair@gentoo.org> gawk-3.1.5-r3.ebuild: + Stable on ppc64 + + 01 Apr 2007; Michael Hanselmann <hansmi@gentoo.org> gawk-3.1.5-r3.ebuild: + Stable on ppc. + + 21 Mar 2007; Raúl Porcel <armin76@gentoo.org> gawk-3.1.5-r3.ebuild: + x86 stable + +*gawk-3.1.5-r3 (12 Jan 2007) + + 12 Jan 2007; Mike Frysinger <vapier@gentoo.org> + +files/gawk-3.1.5-freewstr.patch, +files/gawk-3.1.5-wconcat.patch, + +gawk-3.1.5-r3.ebuild: + Grab some patches from Fedora to fixup double free #135931 by Georgi Georgiev. + + 05 Nov 2006; Fabian Groffen <grobian@gentoo.org> gawk-3.1.5-r1.ebuild, + gawk-3.1.5-r2.ebuild: + Dropped ppc-macos keyword, see you in prefix. + + 17 Oct 2006; Roy Marples <uberlord@gentoo.org> gawk-3.1.5-r2.ebuild: + Added ~sparc-fbsd keyword. + + 14 Oct 2006; Aron Griffis <agriffis@gentoo.org> gawk-3.1.5-r2.ebuild: + Mark 3.1.5-r2 stable on ia64 + + 04 Sep 2006; Joshua Kinard <kumba@gentoo.org> gawk-3.1.5-r2.ebuild: + Marked stable on mips. + + 22 Aug 2006; Thomas Cort <tcort@gentoo.org> gawk-3.1.5-r2.ebuild: + Stable on alpha wrt Bug #142936. + + 10 Aug 2006; Yuta SATOH <nigoro@gentoo.org> gawk-3.1.5-r2.ebuild: + Stable on ppc64, bug #142936 + + 07 Aug 2006; Scott Stoddard <deltacow@gentoo.org> gawk-3.1.5-r2.ebuild: + Stable on amd64 re bug 142936. + + 07 Aug 2006; Luca Barbato <lu_zero@gentoo.org> gawk-3.1.5-r2.ebuild: + Marked ppc + + 07 Aug 2006; Jeroen Roovers <jer@gentoo.org> gawk-3.1.5-r2.ebuild: + Stable for HPPA (bug #142936). + + 06 Aug 2006; Andrej Kacian <ticho@gentoo.org> gawk-3.1.5-r2.ebuild: + Stable on x86, bug #142936. + + 06 Aug 2006; Jason Wever <weeve@gentoo.org> gawk-3.1.5-r2.ebuild: + Stable on SPARC wrt bug #142936. + +*gawk-3.1.5-r2 (17 Jul 2006) + + 17 Jul 2006; Mike Frysinger <vapier@gentoo.org> + +files/gawk-3.1.5-autotools-crap.patch, +files/gawk-3.1.5-internal.patch, + +files/gawk-3.1.5-numflags.patch, +files/gawk-3.1.5-syntaxerror.patch, + +files/gawk-3.1.5-utf-8-strcat.patch, +gawk-3.1.5-r2.ebuild: + Grab some patches from Fedora/Debian and hack around broken autotool code + #139397 by Brant Gurganus. + + 09 Jul 2006; Joshua Kinard <kumba@gentoo.org> gawk-3.1.5-r1.ebuild: + Marked stable on mips. + + 28 Jun 2006; Thomas Cort <tcort@gentoo.org> gawk-3.1.5-r1.ebuild: + Stable on alpha wrt Bug #138147. + + 28 Jun 2006; Luis Medinas <metalgod@gentoo.org> gawk-3.1.5-r1.ebuild: + Stable on amd64. Bug #138147. + + 27 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org> gawk-3.1.5-r1.ebuild: + Stable on sparc wrt #138147 + + 27 Jun 2006; Tobias Scherbaum <dertobi123@gentoo.org> + gawk-3.1.5-r1.ebuild: + ppc stable, #138147 + + 27 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> gawk-3.1.5-r1.ebuild: + Stable on x86 wrt bug #138147. + + 27 Jun 2006; Fabian Groffen <grobian@gentoo.org> gawk-3.1.5-r1.ebuild: + Marked ppc-macos stable for progressive users (bug #138147) + + 27 Jun 2006; Markus Rothe <corsair@gentoo.org> gawk-3.1.5-r1.ebuild: + Stable on ppc64; bug #138147 + +*gawk-3.1.5-r1 (12 Apr 2006) + + 12 Apr 2006; Mike Frysinger <vapier@gentoo.org> + +files/gawk-3.1.5-binmode.patch, +files/gawk-3.1.5-fieldwidths.patch, + +files/gawk-3.1.5-num2str.patch, +gawk-3.1.5-r1.ebuild: + Fix bug in FIELDWIDTHS and grab some other patches from Fedora. + + 30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> gawk-3.1.5.ebuild: + Add ~x86-fbsd keyword. + + 19 Mar 2006; Fernando J. Pereda <ferdy@gentoo.org> gawk-3.1.5.ebuild: + Stable on alpha as per bug #126362 + + 16 Mar 2006; Emanuele Giaquinta <exg@gentoo.org> gawk-3.1.5.ebuild: + Stable on ppc; bug #126362 + + 16 Mar 2006; Torsten Veller <tove@gentoo.org> gawk-3.1.5.ebuild: + Stable on x86 (#126362) + + 16 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> gawk-3.1.5.ebuild: + Stable on sparc wrt #126362 + + 16 Mar 2006; Patrick McLean <chutzpah@gentoo.org> gawk-3.1.5.ebuild: + Stable on amd64 (bug #126362). + + 16 Mar 2006; Markus Rothe <corsair@gentoo.org> gawk-3.1.5.ebuild: + Stable on ppc64; bug #126362 + + 07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> gawk-3.1.5.ebuild: + Don't use /usr/lib/misc, use the right libdir for the current ABI. Fix + multlib-strict. + + 13 Oct 2005; Kito <kito@gentoo.org> gawk-3.1.5.ebuild: + ~ppc-macos keyword + + 03 Oct 2005; Hardave Riar <hardave@gentoo.org> gawk-3.1.4-r4.ebuild: + Stable on mips. + + 01 Oct 2005; Luis Medinas <metalgod@gentoo.org> gawk-3.1.4-r4.ebuild: + Marked Stable on amd64. + + 21 Sep 2005; Mike Frysinger <vapier@gentoo.org> gawk-3.1.5.ebuild: + Move libexec dir from /usr/libexec to /usr/lib/misc. + + 17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog: + Converted to UTF-8, fixed encoding screwups + + 16 Sep 2005; Aron Griffis <agriffis@gentoo.org> gawk-3.1.4-r4.ebuild: + Mark 3.1.4-r4 stable on alpha + + 03 Sep 2005; Markus Rothe <corsair@gentoo.org> gawk-3.1.4-r4.ebuild: + Stable on ppc64 + + 03 Sep 2005; Mike Frysinger <vapier@gentoo.org> + +files/gawk-3.1.5-gcc4.patch, files/filefuncs/Makefile, gawk-3.1.5.ebuild: + Fix by Kito for building with gcc4 #104740 and move a bunch of ugly filefunc + details out of the ebuild and into the filefunc Makefile. + + 02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> gawk-3.1.4-r4.ebuild: + Stable on ppc. + + 02 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> gawk-3.1.4-r4.ebuild: + Stable on sparc + +*gawk-3.1.5 (01 Sep 2005) + + 01 Sep 2005; Mike Frysinger <vapier@gentoo.org> + +files/gawk-3.1.5-core.patch, +gawk-3.1.5.ebuild: + Version bump. + + 29 May 2005; <solar@gentoo.org> gawk-3.1.3-r2.ebuild: + echangelog - update package to use libc expanded variable elibc_uclibc vs + uclibc so USE=-* works + + 06 May 2005; Mike Frysinger <vapier@gentoo.org> + files/filefuncs/filefuncs.c, gawk-3.1.4-r4.ebuild: + Add switch capabilities #91182 by Ekatalog and BSD support #90847 by Diego + Pettenò. + +*gawk-3.1.4-r4 (19 Feb 2005) + + 19 Feb 2005; Mike Frysinger <vapier@gentoo.org> -gawk-3.1.4-r3.ebuild, + +gawk-3.1.4-r4.ebuild: + Update the xml patch to the current version. + +*gawk-3.1.4-r3 (14 Feb 2005) + + 14 Feb 2005; Mike Frysinger <vapier@gentoo.org> -gawk-3.1.4-r2.ebuild, + +gawk-3.1.4-r3.ebuild: + Build xmlgawk separately from the normal gawk so we dont link against + libexpat (which is in /usr/lib) #81793. + +*gawk-3.1.4-r2 (11 Feb 2005) + + 11 Feb 2005; Mike Frysinger <vapier@gentoo.org> + +files/gawk-3.1.3-getpgrp_void.patch, +files/gawk-3.1.4-flonum.patch, + +files/gawk-3.1.4-nextc.patch, +files/gawk-3.1.4-uplow.patch, + -gawk-3.1.4-r1.ebuild, +gawk-3.1.4-r2.ebuild: + Add some patches from Fedora and xmlgawk support #57857 by Alcino Dall Igna + Junior. + +*gawk-3.1.4-r1 (29 Jan 2005) + + 29 Jan 2005; Mike Frysinger <vapier@gentoo.org> + +files/gawk-3.1.4-disable-DFA.patch, +gawk-3.1.4-r1.ebuild, + -gawk-3.1.4.ebuild: + Version bump with patch from Fedora to fix random LOCALE bugs #78227. + + 14 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> + files/filefuncs/Makefile, gawk-3.1.3-r2.ebuild, gawk-3.1.4.ebuild: + multilib fixes for filefuncs. + +*gawk-3.1.4 (12 Jan 2005) + + 12 Jan 2005; Mike Frysinger <vapier@gentoo.org> gawk-3.1.3-r2.ebuild, + +gawk-3.1.4.ebuild: + Version bump. + +*gawk-3.1.3-r2 (22 Nov 2004) + + 22 Nov 2004; Mike Frysinger <vapier@gentoo.org> +gawk-3.1.3-r2.ebuild: + Use econf/install with DESTDIR. + + 14 Nov 2004; Tony Vroon <chainsaw@gentoo.org> gawk-3.1.3-r1.ebuild: + Portability update to cp command, change -d to -P, which works on more OS's. + Suggested by Chris L. Mason <clmason@mac.com> in bug #66911. + + 28 Sep 2004; Sven Wegener <swegener@gentoo.org> + files/filefuncs/filefuncs.c: + Gentoo Technologies, Inc. -> Gentoo Foundation + + 01 Sep 2004; Travis Tilley <lv@gentoo.org> gawk-3.1.3-r1.ebuild: + made gawk use $(get_libdir) + + 24 Aug 2004; Sven Wegener <swegener@gentoo.org> gawk-3.1.3-r1.ebuild: + Changed SRC_URI to use mirror:// syntax. + + 16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> -gawk-3.1.1-r2.ebuild, + -gawk-3.1.2-r3.ebuild, gawk-3.1.3-r1.ebuild, -gawk-3.1.3.ebuild: + gnuconfig_update in src_unpack; use emake; tidy; clean older ebuilds + + 27 Jun 2004; Aron Griffis <agriffis@gentoo.org> gawk-3.1.1-r2.ebuild, + gawk-3.1.2-r3.ebuild, gawk-3.1.3.ebuild: + QA - fix use invocation + + 15 Jun 2004; <solar@gentoo.org> gawk-3.1.3-r1.ebuild: + run gnuconfig_update when using uclibc + + 25 Apr 2004; Tom Gall <tgall@gentoo.org> gawk-3.1.3-r1.ebuild: + fix bug 48990 -- affects all 64 bit architectures + + 07 Mar 2004; Joshua Kinard <kumba@gentoo.org> gawk-3.1.1-r2.ebuild, + gawk-3.1.2-r3.ebuild, gawk-3.1.3-r1.ebuild, gawk-3.1.3.ebuild: + Marked stable on mips, copyright header fixes. + + 09 Jan 2004; Aron Griffis <agriffis@gentoo.org> gawk-3.1.3-r1.ebuild: + stable on alpha + + 28 Dec 2003; Joshua Kinard <kumba@gentoo.org> gawk-3.1.3.ebuild: + Move to mips stable (~mips -> mips) + + 28 Dec 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.3-r1.ebuild: + Move pgawk and igawk to /usr/bin, bug #36453. + +*gawk-3.1.3-r1 (28 Dec 2003) + + 28 Dec 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.3-r1.ebuild: + Make sure /bin/pgawk is a symlink as to not have two binaries taking space. + + 21 Jul 2003; Christian Birchinger <joker@gentoo.org> gawk-3.1.3.ebuild: + Added sparc stable keyword + + 20 Jul 2003; Brandon Low <lostlogic@gentoo.org> gawk-3.1.3.ebuild: + Mark stable for x86 and amd64 + +*gawk-3.1.3 (10 Jul 2003) + + 23 Jul 2003; Guy Martin <gmsoft@gentoo.org> gawk-3.1.1-r2.ebuild : + Marked stable on hppa. + + 22 Jul 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.1-r2.ebuild, + gawk-3.1.2-r3.ebuild, gawk-3.1.3.ebuild: + Do not copy the filefuncs files with original permissions in tackt, thanks to + Tobias Sager <moixa@gmx.ch>, bug #24989. + + 10 Jul 2003; Brandon Low <lostlogic@gentoo.org> gawk-3.1.3.ebuild: + Bump + + 24 Jun 2003; Aron Griffis <agriffis@gentoo.org> gawk-3.1.2-r3.ebuild: + Mark stable on alpha + +*gawk-3.1.2-r3 (27 Mar 2003) + + 06 Jul 2003; Guy Martin <gmsoft@gentoo.org> gawk-3.1.2-r3.ebuild : + Marked stable on hppa. + + 22 Jun 2003; Joshua Kinard <kumba@gentoo.org> gawk-3.1.2-r3.ebuild: + Changed ~sparc to sparc in KEYWORDS + Changed ~mips to mips in KEYWORDS + + 08 Jun 2003; Brandon Low <lostlogic@gentoo.org> gawk-3.1.2-r3.ebuild: + Mark unstable, see bug 21713 for reasons, will wait for 3.1.3 to have a new + stable gawk + + 23 May 2003; Tavis Ormandy <taviso@gentoo.org> gawk-3.1.2-r3.ebuild: + support for ccc (alpha). + + 20 May 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.2-r3.ebuild : + Mark stable for all, as all issues are fixed, and 3.1.1-r2 with filefuncs + did not seem to propagate properly. + + 11 May 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.1-r2.ebuild : + Mark stable for all, as next baselayout will need a gawk with filefuncs. + + 26 Apr 2003; Christian Birchinger <joker@gentoo.org> gawk-3.1.2-r3.ebuild : + Added stable sparc keyword + + 17 Apr 2003; Brandon Low <lostlogic@gentoo.org> gawk-3.1.2-r3.ebuild : + Changed x86 keywords + + 27 Mar 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.2-r3.ebuild : + Special files like those in /proc, report themselves as regular files + of length 0, when in fact they have data in them if you try to read them. + The new record-reading code wasn't quite smart enough to deal with such + a bizarre case. The following patch fixes the problem, thanks to + Arnold D. Robbins (Maintainer of gawk). + +*gawk-3.1.1-r2 (26 Mar 2003) + + 26 Mar 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.1-r2.ebuild : + For some reason gawk-3.1.2 is more pain than worth. Seems this release + also borks the ability to specify input files as arguments: + + # gawk '/devfs/ { print }' /proc/filesystems + # + + should have been the same as: + + # cat /proc/filesystems | gawk '/devfs/ { print }' + nodev devfs + nodev usbdevfs + # + + Thus all this release does, is get the filefuncs module into 3.1.1 as well, + so that we can totally mask gawk-3.1.2. + +*gawk-3.1.2-r2 (25 Mar 2003) + + 25 Mar 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.2-r2.ebuild : + Add filefuncs module from baselayout, as it is very closly tied to the gawk + version running. While we are at it, version the module (filefuncs.so.0.0.1, + with soname of filefuncs.so.0 for now). Do not install acconfig.h into + /usr/include/awk, as it is redundant. This should fix bug #18127. + +*gawk-3.1.2-r1 (25 Mar 2003) + + 25 Mar 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.2-r1.ebuild : + Version that should not really have hit portage, but I was busy at work + and closing time caught me. + +*gawk-3.1.2 (24 Mar 2003) + + 24 Mar 2003; Brandon Low <lostlogic@gentoo.org> gawk-3.1.2.ebuild : + -* keyword, and get the -r1 ebuild stuff that I somehow ignored into it, a -r1 + which will be ~ rather than - will be forthcoming + + 24 Mar 2003; Brandon Low <lostlogic@gentoo.org> gawk-3.1.2.ebuild : + Bump + + 20 Feb 2003; Zach Welch <zwelch@gentoo.org> gawk-3.1.1-r1.ebuild : + Added arm to keywords. + + 08 Feb 2003; Guy Martin <gmsoft@gentoo.org> gawk-3.1.1-r1.ebuild : + Added hppa to keywords. + +*gawk-3.1.1-r1 (20 Dec 2002) + + 20 Dec 2002; Jan Seidel <tuxus@gentoo.org> gawk-3.1.1-r1.ebuild : + Added mips to keywords + + 16 Dec 2002; Martin Schlemmmer <azarah@gentoo.org> gawk-3.1.1-r1.ebuild : + Fix rare case where gawk do not get installed as /bin/gawk-$PV, but + rather /bin/gawk-. Fix missing docs. + + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords + +*gawk-3.1.1-r1 (14 Nov 2002) + + 14 Nov 2002; Martin Schlemmmer <azarah@gentoo.org> : + Install gawk headers into /usr/include/awk. + +*gawk-3.1.1 (21 Jul 2002) + + 21 Jul 2002; Martin Schlemmmer <azarah@gentoo.org> : + Update version. + +*gawk-3.1.0-r3 (21 Jul 2002) + + 21 Jul 2002; Martin Schlemmer <azarah@gentoo.org> : + Move /usr/bin/awk to /bin/awk for upcomming baselayout. + +*gawk-3.1.0-r2 (26 Jun 2002) + + 14 Jul 2002; phoen][x <phoenix@gentoo.org> gawk-3.1.0-r2.ebuild : + Added KEYWORDS, SLOT. + + 26 Jun 2002; Martin Schlemmer <azarah@gentoo.org> : + Add /bin/awk compat symlink, closing bug #3288. + +*gawk-3.1.0-r1 (12 Mar 2002) + + 14 Jul 2002; phoen][x <phoenix@gentoo.org> gawk-3.1.0-r1.ebuild : + Added KEYWORDS, SLOT. + + 12 Mar 2002; Seemant Kulleen <seemant@gentoo.org> ChangeLog : + + Added USE dependent nls compilation + +*gawk-3.1.0 (1 Feb 2002) + + 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest new file mode 100644 index 0000000..fb18ff6 --- /dev/null +++ b/sys-apps/gawk/Manifest @@ -0,0 +1,23 @@ +AUX autoconf-mktime-2.61.patch 1116 RMD160 516f7e7e92f0078726a0f48914fd686587b6a510 SHA1 f0ee67b2647b153c8de7823beeb24a0bb95f2c8f SHA256 e62bc5c6d3fa056be28d6928186998eba7e1850f29f089f707a6dbdb195dee33 +AUX filefuncs/Makefile 1212 RMD160 7b94f136f4a1e5cbfeade53c952c353378584c22 SHA1 e23965d28e8ae856b20211faedaca22cee613c11 SHA256 954bc6e837240b8d756cf6bd1460a24cae2a1cc5c738daf53746a0cff23791a1 +AUX filefuncs/filefuncs.c 10992 RMD160 326a54ea0cc42c819d44cf2a749cb141388c4ef0 SHA1 e31aa18db51077d6dc8aeaf979ecb02471f9175a SHA256 c647aa27170ef8e001d47bdf86c47809afd7f6d5a89be2f9769ce05b55ed8309 +AUX gawk-3.1.3-getpgrp_void.patch 1225 RMD160 ea06ae87acd4d8df1a9a7c160c00b2d13d3ab564 SHA1 427caed0827f2c694fc230fab1b6b993210da6fb SHA256 2e43682e4c86e6f50eeca42b3fc333c1c9c080838b29f3020c88f1d95dc02767 +AUX gawk-3.1.5-autotools-crap.patch 13135 RMD160 cee88c9a7c4e6ebcc48461980203a3acd41ae2ba SHA1 69b3f7eb7edf5e7e4c1ad6334b193f6f7434a022 SHA256 324739af312a2755e38c7da6a95f1cc01544d4ce134799f3548f9815e4897dd4 +AUX gawk-3.1.5-binmode.patch 694 RMD160 da518848ea916a6f39a33fa1cc00ae11c185fb3f SHA1 7eec7cf07bcb0b1c4be1ca32ae54d5f381e8048f SHA256 e4dae2f48d444ce628aed9280840d8e92dec45f10ca99daf8eab3a7c2321612d +AUX gawk-3.1.5-core.patch 845 RMD160 21fff34a7893b3be56136c095ed7e64379a72a79 SHA1 8a333e15840c1383607cc555b7be9a90aa1f417d SHA256 2634c7156f4d718c2ff6529cddd64c8d5ca0c8f8092e904c83024e3c3b604b5f +AUX gawk-3.1.5-fieldwidths.patch 1009 RMD160 8780aa76799f29b2050ae55d4587bf0e549158e8 SHA1 fb207a9b66cc7e3471221f87b960f12290586f14 SHA256 09689141e2c391e8b48208a59f9440b3d7da127ee3ddf6cc70c2cbbc2867a84b +AUX gawk-3.1.5-freewstr2.patch 6300 RMD160 69af521aadeec950bbe03b1ef7d26217b7e98d35 SHA1 a6fcba9e4cef73b8a3f0159e49c34148ca77e129 SHA256 1e99d24cc47b300d5af784d9533e18e0b8add0bc9acd9385f8172bbebdf3b1f7 +AUX gawk-3.1.5-gcc4.patch 826 RMD160 a68e7ed7c70aa6be454961aa25903fe236650227 SHA1 8908a11d8e0e3d0ee1cc5ae5b9c31ebc0341cdc8 SHA256 7b7d37a6ecb51300f46ad611d486a074eb522dabb949e500664943df7f52b0e3 +AUX gawk-3.1.5-internal.patch 6410 RMD160 c89773d730fd53f5dde3e898a27a5513fdcb6aa7 SHA1 c130f984fa757ba054308f0de9040fa288c88b03 SHA256 b29e9f21d8dacdc474bde3962b55af4792898aff3ce4034f9b0738608ea48c94 +AUX gawk-3.1.5-ipv6.patch 8347 RMD160 3cd726f33cd1994feefbcb1b673e35ee4bdb5480 SHA1 7986707c1b4a3b6054e5e4ebe19917300e34a9a9 SHA256 5626187706aad552d999d7943ac108a8a9e72c60d9378047d716f474151f18cc +AUX gawk-3.1.5-mbread.patch 1303 RMD160 1f1473749f92ea547ec4b4282f3e6a0a2e081110 SHA1 74c188297c7ff7ea36df5a9dbe79fd21ad3f95ea SHA256 1fa94758dbfbaa54df51ca9a29cffbe362644ee6a9a713fb1cccbf2e1117f288 +AUX gawk-3.1.5-num2str.patch 1319 RMD160 869a086ff89e25adfbf56e68de5df9d3aae7f61f SHA1 5dbe975164582ba564d235b3eeea924e86e85086 SHA256 2cadd540e4d3a5afc63fcaca3d797df18a668ff91c5a1f94fa4a2b4cb1600762 +AUX gawk-3.1.5-numflags.patch 561 RMD160 485357e5d037edebd7e09e62a1f0deb582570ea1 SHA1 c6acabbc0adf5643808c5f25ca3faf54bd4c5690 SHA256 395bc2d5b623e253f566c62df4c623098201fa040c74ed430ea7e11846a23ff1 +AUX gawk-3.1.5-syntaxerror.patch 651 RMD160 0960bdb4ebfb4219a7ea1e3f9cf8d559f1d75d2c SHA1 0ffdfcaf2aefdc7922a6262e966c57e595028b41 SHA256 ebafc851e3dd109dd855e4072c82c6f274660bb7a5c8b338de05639870899044 +AUX gawk-3.1.5-wconcat.patch 495 RMD160 29f5eea5b300d8efc482e960b257292e5e5b19f8 SHA1 a40e527ef2741d8dea4e481852f887097dd2c921 SHA256 bc812044e12c291c0419853e3862e5dad60c17bfee8cffeb09135995b0694315 +DIST gawk-3.1.5.tar.gz 2310919 RMD160 8d875f4ea9e9ef5c932468cf43c691f6e082b197 SHA1 6cb385b4bc33780a5a4288b787523cbd4a30a900 SHA256 463dcb9d0ca398b1d4f5a332f6cd9cec56441265fca616f2ea1b44d459e9f0f8 +DIST gawk-3.1.6.tar.bz2 1861630 RMD160 e2639935d87d5c9fdb115a58ab1f598b69a76216 SHA1 fb45bded207af6a8e46cd63fcbb6fb064ecee607 SHA256 513fdd5a0bd1b467bd4993eb3adb4690f65fff6857c9e2ed1a3e46d72151cb6c +EBUILD gawk-3.1.5-r5.ebuild 3678 RMD160 c7d94892fea66f8ced063f86842c78178165f63e SHA1 8ff21949e2366ce420c24fbc23d5a3dc78b1bb60 SHA256 f415f11c164d0be1a332729f6aa1664b9899cd5a648273cb8a618e1c05335156 +EBUILD gawk-3.1.6.ebuild 3249 RMD160 4d8b5fedaba04cf572a63e8e9ecdc55ecf128490 SHA1 8d89d77554b0e758c1dea107a86eecbfa7d8ceb8 SHA256 9d3fd1c64ddb66815a7018d58cc2dc5edc67f2c13684925211056c4b9b7beb17 +MISC ChangeLog 17379 RMD160 f7cfac13a279c89c8ff8472d13dbe58646d5e804 SHA1 1f01d01ac622ae29da0ecb53c78fafd278747f8a SHA256 2c9008f1204c005a1b9f18d1dde25349cb3e78a6e9a7a4b3e785ff6fc7c76a7c +MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 diff --git a/sys-apps/gawk/files/autoconf-mktime-2.61.patch b/sys-apps/gawk/files/autoconf-mktime-2.61.patch new file mode 100644 index 0000000..345169f --- /dev/null +++ b/sys-apps/gawk/files/autoconf-mktime-2.61.patch @@ -0,0 +1,47 @@ +--- configure ++++ configure +@@ -10518,6 +10791,7 @@ + # endif + #endif + ++#include <limits.h> + #include <stdlib.h> + + #ifdef HAVE_UNISTD_H +@@ -10666,12 +10940,15 @@ + isn't worth using anyway. */ + alarm (60); + +- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) +- continue; +- time_t_max--; +- if ((time_t) -1 < 0) +- for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2) +- continue; ++ for (;;) ++ { ++ t = (time_t_max << 1) + 1; ++ if (t <= time_t_max) ++ break; ++ time_t_max = t; ++ } ++ time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; ++ + delta = time_t_max / 997; /* a suitable prime number */ + for (i = 0; i < N_STRINGS; i++) + { +@@ -10686,10 +10963,12 @@ + && mktime_test ((time_t) (60 * 60 * 24)))) + return 1; + +- for (j = 1; 0 < j; j *= 2) ++ for (j = 1; ; j <<= 1) + if (! bigtime_test (j)) + return 1; +- if (! bigtime_test (j - 1)) ++ else if (INT_MAX / 2 < j) ++ break; ++ if (! bigtime_test (INT_MAX)) + return 1; + } + return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); diff --git a/sys-apps/gawk/files/filefuncs/Makefile b/sys-apps/gawk/files/filefuncs/Makefile new file mode 100644 index 0000000..2f1a05f --- /dev/null +++ b/sys-apps/gawk/files/filefuncs/Makefile @@ -0,0 +1,57 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Author: Martin Schlemmer <azarah@gentoo.org> +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/files/filefuncs/Makefile,v 1.8 2006/03/28 07:15:31 vapier Exp $ + +CC ?= gcc +LD = $(CC) + +MAJORVER = 0 +MINORVER = 0.1 + +AWKINCDIR = /usr/include/awk +DESTDIR = + +TARGET = filefuncs +TARGET_LIB = $(TARGET).so.$(MAJORVER).$(MINORVER) + +LIBDIR = lib + +# Gentoo specific cruft, you like it dont ya idiot +ifdef D +DESTDIR = $(D) +endif +ifdef S +AWKINCDIR = $(S) +endif + +DOIT = yes +ifeq ($(USERLAND),Darwin) +DOIT = no +endif + +ifeq ($(DOIT),yes) + +all: $(TARGET_LIB) + +$(TARGET).o: $(TARGET).c + $(CC) $(CLAGS) -shared -Wall -DHAVE_CONFIG_H -c -O2 -fPIC -I$(AWKINCDIR) $^ + +$(TARGET_LIB): $(TARGET).o + $(LD) $(LDFLAGS) -o $@ -shared -Wl,-soname -Wl,$(TARGET).so.$(MAJORVER) $^ + +install: $(TARGET_LIB) + install -m 0755 -d $(DESTDIR)/$(LIBDIR)/rcscripts + install -m 0755 $(TARGET_LIB) $(DESTDIR)/$(LIBDIR)/rcscripts + ln -s $(TARGET_LIB) $(DESTDIR)/$(LIBDIR)/rcscripts/$(TARGET).so.$(MAJORVER) + ln -s $(TARGET_LIB) $(DESTDIR)/$(LIBDIR)/rcscripts/$(TARGET).so + +clean: + rm -f $(TARGET) + rm -f *.o *~ core + +else + +all install clean: + +endif diff --git a/sys-apps/gawk/files/filefuncs/filefuncs.c b/sys-apps/gawk/files/filefuncs/filefuncs.c new file mode 100644 index 0000000..4f3436c --- /dev/null +++ b/sys-apps/gawk/files/filefuncs/filefuncs.c @@ -0,0 +1,485 @@ +/* + * filefuncs.c - Builtin functions that provide initial minimal iterface + * to the file system. + * + * Arnold Robbins, update for 3.1, Mon Nov 23 12:53:39 EST 1998 + */ + +/* + * Copyright (C) 2001 the Free Software Foundation, Inc. + * + * This file is part of GAWK, the GNU implementation of the + * AWK Programming Language. + * + * GAWK is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GAWK is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +/* + * Copyright 1999-2004 Gentoo Foundation + * Distributed under the terms of the GNU General Public License v2 + * Author: Martin Schlemmer <azarah@gentoo.org>, Nov 2002 + * $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/files/filefuncs/filefuncs.c,v 1.3 2005/05/06 01:35:53 vapier Exp $ + * + * Extended with: do_symlink() + * do_unlink() + * do_mkdir() + * do_rmdir() + * + * for use in the Gentoo rcscripts + * + */ + +#include "awk.h" + +#include <unistd.h> + +/* do_chdir --- provide dynamically loaded chdir() builtin for gawk */ + +static NODE * +do_chdir(tree) +NODE *tree; +{ + NODE *newdir; + int ret = -1; + + if (do_lint && tree->param_cnt > 1) + lintwarn("chdir: called with too many arguments"); + + newdir = get_argument(tree, 0); + if (newdir != NULL) { + (void) force_string(newdir); + ret = chdir(newdir->stptr); + if (ret < 0) + update_ERRNO(); + + free_temp(newdir); + } else if (do_lint) + lintwarn("chdir: called with no arguments"); + + + /* Set the return value */ + set_value(tmp_number((AWKNUM) ret)); + + /* Just to make the interpreter happy */ + return tmp_number((AWKNUM) 0); +} + +/* do_symlink --- provide dynamically loaded symlink() builtin for gawk */ + +static NODE * +do_symlink(tree) +NODE *tree; +{ + NODE *oldpath, *newpath; + int ret = -1; + + if (do_lint && tree->param_cnt > 2) + lintwarn("symlink: called with too many arguments"); + + oldpath = get_argument(tree, 0); + newpath = get_argument(tree, 1); + if ((oldpath != NULL) && (newpath)) { + (void) force_string(oldpath); + (void) force_string(newpath); + ret = symlink(oldpath->stptr, newpath->stptr); + if (ret < 0) + update_ERRNO(); + + free_temp(oldpath); + free_temp(newpath); + } else if (do_lint) + lintwarn("symlink: called with not enough arguments"); + + /* Set the return value */ + set_value(tmp_number((AWKNUM) ret)); + + /* Just to make the interpreter happy */ + return tmp_number((AWKNUM) 0); +} + +/* do_unlink --- provide dynamically loaded unlink() builtin for gawk */ + +static NODE * +do_unlink(tree) +NODE *tree; +{ + NODE *pathname; + int ret = -1; + + if (do_lint && tree->param_cnt > 1) + lintwarn("unlink: called with too many arguments"); + + pathname = get_argument(tree, 0); + if (pathname != NULL) { + (void) force_string(pathname); + ret = unlink(pathname->stptr); + if (ret < 0) + update_ERRNO(); + + free_temp(pathname); + } else if (do_lint) + lintwarn("unlink: called with no arguments"); + + /* Set the return value */ + set_value(tmp_number((AWKNUM) ret)); + + /* Just to make the interpreter happy */ + return tmp_number((AWKNUM) 0); +} + +/* do_mkdir --- provide dynamically loaded mkdir() builtin for gawk */ + +static NODE * +do_mkdir(tree) +NODE *tree; +{ + NODE *pathname, *mode; + int ret = -1; + + if (do_lint && tree->param_cnt > 2) + lintwarn("mkdir: called with too many arguments"); + + pathname = get_argument(tree, 0); + mode = get_argument(tree, 1); + if ((pathname != NULL) && (mode != NULL)) { + (void) force_string(pathname); + (void) force_number(mode); + ret = mkdir(pathname->stptr, mode->numbr); + if (ret < 0) + update_ERRNO(); + + free_temp(pathname); + free_temp(mode); + } else if (do_lint) + lintwarn("mkdir: called with not enough arguments"); + + /* Set the return value */ + set_value(tmp_number((AWKNUM) ret)); + + /* Just to make the interpreter happy */ + return tmp_number((AWKNUM) 0); +} + +/* do_rmdir --- provide dynamically loaded rmdir() builtin for gawk */ + +static NODE * +do_rmdir(tree) +NODE *tree; +{ + NODE *pathname; + int ret = -1; + + if (do_lint && tree->param_cnt > 1) + lintwarn("rmdir: called with too many arguments"); + + pathname = get_argument(tree, 0); + if (pathname != NULL) { + (void) force_string(pathname); + ret = rmdir(pathname->stptr); + if (ret < 0) + update_ERRNO(); + + free_temp(pathname); + } else if (do_lint) + lintwarn("rmdir: called with no arguments"); + + /* Set the return value */ + set_value(tmp_number((AWKNUM) ret)); + + /* Just to make the interpreter happy */ + return tmp_number((AWKNUM) 0); +} + +/* format_mode --- turn a stat mode field into something readable */ + +static char * +format_mode(fmode) +unsigned long fmode; +{ + static char outbuf[12]; + int i; + + strcpy(outbuf, "----------"); + /* first, get the file type */ + i = 0; + switch (fmode & S_IFMT) { +#ifdef S_IFSOCK + case S_IFSOCK: + outbuf[i] = 's'; + break; +#endif +#ifdef S_IFLNK + case S_IFLNK: + outbuf[i] = 'l'; + break; +#endif + case S_IFREG: + outbuf[i] = '-'; /* redundant */ + break; + case S_IFBLK: + outbuf[i] = 'b'; + break; + case S_IFDIR: + outbuf[i] = 'd'; + break; +#ifdef S_IFDOOR /* Solaris weirdness */ + case S_IFDOOR: + outbuf[i] = 'D'; + break; +#endif /* S_IFDOOR */ + case S_IFCHR: + outbuf[i] = 'c'; + break; +#ifdef S_IFIFO + case S_IFIFO: + outbuf[i] = 'p'; + break; +#endif + } + + i++; + if ((fmode & S_IRUSR) != 0) + outbuf[i] = 'r'; + i++; + if ((fmode & S_IWUSR) != 0) + outbuf[i] = 'w'; + i++; + if ((fmode & S_IXUSR) != 0) + outbuf[i] = 'x'; + i++; + + if ((fmode & S_IRGRP) != 0) + outbuf[i] = 'r'; + i++; + if ((fmode & S_IWGRP) != 0) + outbuf[i] = 'w'; + i++; + if ((fmode & S_IXGRP) != 0) + outbuf[i] = 'x'; + i++; + + if ((fmode & S_IROTH) != 0) + outbuf[i] = 'r'; + i++; + if ((fmode & S_IWOTH) != 0) + outbuf[i] = 'w'; + i++; + if ((fmode & S_IXOTH) != 0) + outbuf[i] = 'x'; + i++; + + outbuf[i] = '\0'; + + if ((fmode & S_ISUID) != 0) { + if (outbuf[3] == 'x') + outbuf[3] = 's'; + else + outbuf[3] = 'S'; + } + + /* setgid without execute == locking */ + if ((fmode & S_ISGID) != 0) { + if (outbuf[6] == 'x') + outbuf[6] = 's'; + else + outbuf[6] = 'l'; + } + + if ((fmode & S_ISVTX) != 0) { + if (outbuf[9] == 'x') + outbuf[9] = 't'; + else + outbuf[9] = 'T'; + } + + return outbuf; +} + +/* do_stat --- provide a stat() function for gawk */ + +static NODE * +do_stat(tree) +NODE *tree; +{ + NODE *file, *array; + struct stat sbuf; + int ret; + NODE **aptr; + char *pmode; /* printable mode */ + char *type = "unknown"; + + /* check arg count */ + if (tree->param_cnt != 2) + fatal( + "stat: called with incorrect number of arguments (%d), should be 2", + tree->param_cnt); + + /* directory is first arg, array to hold results is second */ + file = get_argument(tree, 0); + array = get_argument(tree, 1); + + /* empty out the array */ + assoc_clear(array); + + /* lstat the file, if error, set ERRNO and return */ + (void) force_string(file); + ret = lstat(file->stptr, & sbuf); + if (ret < 0) { + update_ERRNO(); + + set_value(tmp_number((AWKNUM) ret)); + + free_temp(file); + return tmp_number((AWKNUM) 0); + } + + /* fill in the array */ + aptr = assoc_lookup(array, tmp_string("name", 4), FALSE); + *aptr = dupnode(file); + + aptr = assoc_lookup(array, tmp_string("dev", 3), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_dev); + + aptr = assoc_lookup(array, tmp_string("ino", 3), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_ino); + + aptr = assoc_lookup(array, tmp_string("mode", 4), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_mode); + + aptr = assoc_lookup(array, tmp_string("nlink", 5), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_nlink); + + aptr = assoc_lookup(array, tmp_string("uid", 3), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_uid); + + aptr = assoc_lookup(array, tmp_string("gid", 3), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_gid); + + aptr = assoc_lookup(array, tmp_string("size", 4), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_size); + + aptr = assoc_lookup(array, tmp_string("blocks", 6), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_blocks); + + aptr = assoc_lookup(array, tmp_string("atime", 5), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_atime); + + aptr = assoc_lookup(array, tmp_string("mtime", 5), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_mtime); + + aptr = assoc_lookup(array, tmp_string("ctime", 5), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_ctime); + + /* for block and character devices, add rdev, major and minor numbers */ + if (S_ISBLK(sbuf.st_mode) || S_ISCHR(sbuf.st_mode)) { + aptr = assoc_lookup(array, tmp_string("rdev", 4), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_rdev); + + aptr = assoc_lookup(array, tmp_string("major", 5), FALSE); + *aptr = make_number((AWKNUM) major(sbuf.st_rdev)); + + aptr = assoc_lookup(array, tmp_string("minor", 5), FALSE); + *aptr = make_number((AWKNUM) minor(sbuf.st_rdev)); + } + +#ifdef HAVE_ST_BLKSIZE + aptr = assoc_lookup(array, tmp_string("blksize", 7), FALSE); + *aptr = make_number((AWKNUM) sbuf.st_blksize); +#endif /* HAVE_ST_BLKSIZE */ + + aptr = assoc_lookup(array, tmp_string("pmode", 5), FALSE); + pmode = format_mode(sbuf.st_mode); + *aptr = make_string(pmode, strlen(pmode)); + + /* for symbolic links, add a linkval field */ + if (S_ISLNK(sbuf.st_mode)) { + char buf[BUFSIZ*2]; + int linksize; + + linksize = readlink(file->stptr, buf, sizeof buf); + /* should make this smarter */ + if (linksize == sizeof(buf)) + fatal("size of symbolic link too big"); + buf[linksize] = '\0'; + + aptr = assoc_lookup(array, tmp_string("linkval", 7), FALSE); + *aptr = make_string(buf, linksize); + } + + /* add a type field */ + switch (sbuf.st_mode & S_IFMT) { +#ifdef S_IFSOCK + case S_IFSOCK: + type = "socket"; + break; +#endif +#ifdef S_IFLNK + case S_IFLNK: + type = "symlink"; + break; +#endif + case S_IFREG: + type = "file"; + break; + case S_IFBLK: + type = "blockdev"; + break; + case S_IFDIR: + type = "directory"; + break; +#ifdef S_IFDOOR + case S_IFDOOR: + type = "door"; + break; +#endif + case S_IFCHR: + type = "chardev"; + break; +#ifdef S_IFIFO + case S_IFIFO: + type = "fifo"; + break; +#endif + } + + aptr = assoc_lookup(array, tmp_string("type", 4), FALSE); + *aptr = make_string(type, strlen(type)); + + free_temp(file); + + /* Set the return value */ + set_value(tmp_number((AWKNUM) ret)); + + /* Just to make the interpreter happy */ + return tmp_number((AWKNUM) 0); +} + +/* dlload --- load new builtins in this library */ + +NODE * +dlload(tree, dl) +NODE *tree; +void *dl; +{ + make_builtin("chdir", do_chdir, 1); + make_builtin("symlink", do_symlink, 2); + make_builtin("unlink", do_unlink, 1); + make_builtin("mkdir", do_mkdir, 2); + make_builtin("rmdir", do_rmdir, 1); + make_builtin("stat", do_stat, 2); + + return tmp_number((AWKNUM) 0); +} + diff --git a/sys-apps/gawk/files/gawk-3.1.3-getpgrp_void.patch b/sys-apps/gawk/files/gawk-3.1.3-getpgrp_void.patch new file mode 100644 index 0000000..13d0131 --- /dev/null +++ b/sys-apps/gawk/files/gawk-3.1.3-getpgrp_void.patch @@ -0,0 +1,47 @@ +Ripped from Fedora. + +--- gawk-3.1.3/main.c.getpgrp_void 2004-01-26 12:08:26.000000000 +0100 ++++ gawk-3.1.3/main.c 2004-01-26 12:15:22.000000000 +0100 +@@ -874,14 +874,11 @@ + + PROCINFO_node = install("PROCINFO", + node((NODE *) NULL, Node_var_array, (NODE *) NULL)); +- + #ifdef GETPGRP_VOID +-#define getpgrp_arg() /* nothing */ ++ value = getpgrp(); + #else +-#define getpgrp_arg() getpid() ++ value = getpgrp(getpid()); + #endif +- +- value = getpgrp(getpgrp_arg()); + aptr = assoc_lookup(PROCINFO_node, tmp_string("pgrpid", 6), FALSE); + *aptr = make_number(value); + +--- gawk-3.1.3/io.c.getpgrp_void 2004-01-26 12:08:36.000000000 +0100 ++++ gawk-3.1.3/io.c 2004-01-26 12:16:04.000000000 +0100 +@@ -1422,11 +1422,6 @@ + return 0; + } + +-#ifdef GETPGRP_VOID +-#define getpgrp_arg() /* nothing */ +-#else +-#define getpgrp_arg() getpid() +-#endif + + /* pidopen --- "open" /dev/pid, /dev/ppid, and /dev/pgrpid */ + +@@ -1440,7 +1435,11 @@ + warning(_("use `PROCINFO[\"%s\"]' instead of `%s'"), cp, name); + + if (name[6] == 'g') ++#ifdef GETPGRP_VOID ++ sprintf(tbuf, "%d\n", (int) getpgrp()); ++#else + sprintf(tbuf, "%d\n", (int) getpgrp(getpgrp_arg())); ++#endif + else if (name[6] == 'i') + sprintf(tbuf, "%d\n", (int) getpid()); + else diff --git a/sys-apps/gawk/files/gawk-3.1.5-autotools-crap.patch b/sys-apps/gawk/files/gawk-3.1.5-autotools-crap.patch new file mode 100644 index 0000000..f9ca4de --- /dev/null +++ b/sys-apps/gawk/files/gawk-3.1.5-autotools-crap.patch @@ -0,0 +1,438 @@ +http://bugs.gentoo.org/139397 + +configure.ac had this crap added to it: + + AC_C_INLINE + AC_C_STRINGIZE + ++dnl misc hacks to make sure all defines are set ++dnl http://bugs.gentoo.org/139397 ++AM_LANGINFO_CODESET ++AC_CHECK_HEADERS([langinfo.h]) ++AC_CHECK_FUNCS([isblank]) ++gt_LC_MESSAGES ++ + AC_CONFIG_HEADERS([config.h:configh.in]) + AH_BOTTOM([#include "custom.h"]) + + + +and below you can find the ugly result + +--- gawk-3.1.5/configh.in ++++ gawk-3.1.5/configh.in +@@ -72,6 +76,9 @@ + /* Define to 1 if you have the `isascii' function. */ + #undef HAVE_ISASCII + ++/* Define to 1 if you have the `isblank' function. */ ++#undef HAVE_ISBLANK ++ + /* Define to 1 if you have the `iswctype' function. */ + #undef HAVE_ISWCTYPE + +@@ -81,6 +88,15 @@ + /* Define to 1 if you have the `iswupper' function. */ + #undef HAVE_ISWUPPER + ++/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */ ++#undef HAVE_LANGINFO_CODESET ++ ++/* Define to 1 if you have the <langinfo.h> header file. */ ++#undef HAVE_LANGINFO_H ++ ++/* Define if your <locale.h> file defines LC_MESSAGES. */ ++#undef HAVE_LC_MESSAGES ++ + /* Define to 1 if you have the `dl' library (-ldl). */ + #undef HAVE_LIBDL + +--- gawk-3.1.5/configure ++++ gawk-3.1.5/configure +@@ -12821,6 +12821,386 @@ + + + ++ ++ echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 ++echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 ++if test "${am_cv_langinfo_codeset+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <langinfo.h> ++int ++main () ++{ ++char* cs = nl_langinfo(CODESET); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ am_cv_langinfo_codeset=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++am_cv_langinfo_codeset=no ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ ++fi ++echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5 ++echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 ++ if test $am_cv_langinfo_codeset = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_LANGINFO_CODESET 1 ++_ACEOF ++ ++ fi ++ ++ ++for ac_header in langinfo.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++else ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_header_compiler=no ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------- ## ++## Report this to bug-gawk@gnu.org ## ++## ------------------------------- ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++for ac_func in isblank ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. ++ For example, HP-UX 11i <limits.h> declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ ++#undef $ac_func ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} ++#endif ++ ++int ++main () ++{ ++return f != $ac_func; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_var=no" ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++ ++ echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 ++echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 ++if test "${gt_cv_val_LC_MESSAGES+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <locale.h> ++int ++main () ++{ ++return LC_MESSAGES ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ gt_cv_val_LC_MESSAGES=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++gt_cv_val_LC_MESSAGES=no ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $gt_cv_val_LC_MESSAGES" >&5 ++echo "${ECHO_T}$gt_cv_val_LC_MESSAGES" >&6 ++ if test $gt_cv_val_LC_MESSAGES = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_LC_MESSAGES 1 ++_ACEOF ++ ++ fi ++ ++ + ac_config_files="$ac_config_files Makefile awklib/Makefile doc/Makefile po/Makefile.in test/Makefile version.c:version.in" + + diff --git a/sys-apps/gawk/files/gawk-3.1.5-binmode.patch b/sys-apps/gawk/files/gawk-3.1.5-binmode.patch new file mode 100644 index 0000000..ab811d2 --- /dev/null +++ b/sys-apps/gawk/files/gawk-3.1.5-binmode.patch @@ -0,0 +1,20 @@ +Ripped from Fedora + +* Thu Dec 22 2005 Karel Zak <kzak@redhat.com> 3.1.5-5 +- fix "gawk -v BINMODE=1" (patch by Aharon Robbins) + + * eval.c (set_BINMODE): Fix logic of test for no numeric value. + Makes `gawk -v BINMODE=1 ...' work again. Thanks to Eli Zaretskii + <eliz@gnu.org> for pointing out the problem. + +--- gawk-3.1.5/eval.c.binmode 2005-12-22 19:05:32.000000000 +0100 ++++ gawk-3.1.5/eval.c 2005-12-22 19:06:40.000000000 +0100 +@@ -2167,7 +2167,7 @@ + } + } + +- if (! digits || (BINMODE_node->var_value->flags & MAYBE_NUM) == 0) { ++ if (! digits && (BINMODE_node->var_value->flags & MAYBE_NUM) == 0) { + BINMODE = 0; + if (strcmp(p, "r") == 0) + BINMODE = 1; diff --git a/sys-apps/gawk/files/gawk-3.1.5-core.patch b/sys-apps/gawk/files/gawk-3.1.5-core.patch new file mode 100644 index 0000000..651052e --- /dev/null +++ b/sys-apps/gawk/files/gawk-3.1.5-core.patch @@ -0,0 +1,36 @@ +fix an ugly core on a simple script + +http://lists.gnu.org/archive/html/bug-gnu-utils/2005-08/msg00040.html +http://lists.gnu.org/archive/html/bug-gnu-utils/2005-08/msg00047.html + +corresponds to this Fedora fix: +* Tue Sep 27 2005 Karel Zak <kzak@redhat.com> 3.1.5-3 +- fix #169374 - Invalid Free (patch by Aharon Robbins) +https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=169374 + +--- io.c ++++ io.c +@@ -2480,9 +2480,12 @@ + { + struct stat sbuf; + struct open_hook *oh; ++ int iop_malloced = FALSE; + +- if (iop == NULL) ++ if (iop == NULL) { + emalloc(iop, IOBUF *, sizeof(IOBUF), "iop_alloc"); ++ iop_malloced = TRUE; ++ } + memset(iop, '\0', sizeof(IOBUF)); + iop->flag = 0; + iop->fd = fd; +@@ -2495,7 +2498,8 @@ + } + + if (iop->fd == INVALID_HANDLE) { +- free(iop); ++ if (iop_malloced) ++ free(iop); + return NULL; + } + if (isatty(iop->fd)) diff --git a/sys-apps/gawk/files/gawk-3.1.5-fieldwidths.patch b/sys-apps/gawk/files/gawk-3.1.5-fieldwidths.patch new file mode 100644 index 0000000..905718b --- /dev/null +++ b/sys-apps/gawk/files/gawk-3.1.5-fieldwidths.patch @@ -0,0 +1,35 @@ +Ripped from Fedora + +* Sun Oct 9 2005 Karel Zak <kzak@redhat.com> 3.1.5-4 +- fix off-by-one error in assignment of sentinel value at + end of FIELDWIDTHS array. (patch by Aharon Robbins) + +--- gawk-3.1.5/field.c.fieldwidths 2005-05-11 17:28:15.000000000 +0200 ++++ gawk-3.1.5/field.c 2005-10-09 08:35:54.000000000 +0200 +@@ -916,7 +916,7 @@ + + parse_field = fw_parse_field; + scan = force_string(FIELDWIDTHS_node->var_value)->stptr; +- end = scan + 1; ++ + if (FIELDWIDTHS == NULL) + emalloc(FIELDWIDTHS, int *, fw_alloc * sizeof(int), "set_FIELDWIDTHS"); + FIELDWIDTHS[0] = 0; +@@ -941,7 +941,7 @@ + errno = 0; + tmp = strtoul(scan, &end, 10); + if (errno != 0 +- || !(*end == '\0' || is_blank(*end)) ++ || (*end != '\0' && ! is_blank(*end)) + || !(0 < tmp && tmp <= INT_MAX)) + fatal(_("invalid FIELDWIDTHS value, near `%s'"), + scan); +@@ -954,7 +954,7 @@ + if (*scan == '\0') + break; + } +- FIELDWIDTHS[i] = -1; ++ FIELDWIDTHS[i+1] = -1; + + update_PROCINFO("FS", "FIELDWIDTHS"); + } diff --git a/sys-apps/gawk/files/gawk-3.1.5-freewstr2.patch b/sys-apps/gawk/files/gawk-3.1.5-freewstr2.patch new file mode 100644 index 0000000..1ec22fb --- /dev/null +++ b/sys-apps/gawk/files/gawk-3.1.5-freewstr2.patch @@ -0,0 +1,257 @@ +Ripped from Fedora + +--- gawk-3.1.5/field.c.freewstr 2007-01-15 11:02:51.000000000 +0100 ++++ gawk-3.1.5/field.c 2007-01-15 11:21:56.000000000 +0100 +@@ -155,6 +155,7 @@ + ofs = force_string(OFS_node->var_value); + ofslen = ofs->stlen; + for (i = NF; i > 0; i--) { ++ free_wstr(fields_arr[i]); + tmp = fields_arr[i]; + tmp = force_string(tmp); + tlen += tmp->stlen; +@@ -922,7 +923,7 @@ + FIELDWIDTHS[0] = 0; + for (i = 1; ; i++) { + unsigned long int tmp; +- if (i >= fw_alloc) { ++ if (i + 1 >= fw_alloc) { + fw_alloc *= 2; + erealloc(FIELDWIDTHS, int *, fw_alloc * sizeof(int), "set_FIELDWIDTHS"); + } +--- gawk-3.1.5/builtin.c.freewstr 2005-07-26 20:07:43.000000000 +0200 ++++ gawk-3.1.5/builtin.c 2007-01-15 11:12:52.000000000 +0100 +@@ -2089,9 +2089,9 @@ + } + + free(buf); +- if (wc_indices != NULL) +- free(wc_indices); + } ++ if (wc_indices != NULL) ++ free(wc_indices); + } else { /* match failed */ + rstart = 0; + rlength = -1; +@@ -2462,6 +2462,8 @@ + free(t->stptr); + t->stptr = buf; + t->stlen = textlen; ++ free_wstr(t); ++ t->flags &= ~(NUMCUR|NUMBER); + + free_temp(s); + if (matches > 0 && lhs) { +@@ -2471,7 +2473,6 @@ + } + if (after_assign != NULL) + (*after_assign)(); +- t->flags &= ~(NUMCUR|NUMBER); + } + if (mb_indices != NULL) + free(mb_indices); +--- gawk-3.1.5/awk.h.freewstr 2005-07-26 20:07:43.000000000 +0200 ++++ gawk-3.1.5/awk.h 2007-01-15 11:02:51.000000000 +0100 +@@ -1166,6 +1166,9 @@ + #define force_wstring(n) str2wstr(n, NULL) + extern const wchar_t *wstrstr P((const wchar_t *haystack, size_t hs_len, const wchar_t *needle, size_t needle_len)); + extern const wchar_t *wcasestrstr P((const wchar_t *haystack, size_t hs_len, const wchar_t *needle, size_t needle_len)); ++extern void free_wstr P((NODE *n)); ++#else ++#define free_wstr(NODE) /* empty */ + #endif + /* re.c */ + extern Regexp *make_regexp P((const char *s, size_t len, int ignorecase, int dfa)); +--- gawk-3.1.5/node.c.freewstr 2007-01-15 11:02:51.000000000 +0100 ++++ gawk-3.1.5/node.c 2007-01-15 11:33:44.000000000 +0100 +@@ -96,6 +96,7 @@ + if (! do_traditional && isnondecimal(cp, TRUE)) { + n->numbr = nondec2awknum(cp, cpend - cp); + n->flags |= NUMCUR; ++ ptr = cpend; + goto finish; + } + } +@@ -218,15 +219,7 @@ + no_malloc: + s->stref = 1; + s->flags |= STRCUR; +-#if defined MBS_SUPPORT +- if ((s->flags & WSTRCUR) != 0) { +- assert(s->wstptr != NULL); +- free(s->wstptr); +- s->wstptr = NULL; +- s->wstlen = 0; +- s->flags &= ~WSTRCUR; +- } +-#endif ++ free_wstr(s); + return s; + } + +@@ -289,8 +282,14 @@ + *r = *n; + r->flags &= ~(PERM|TEMP|FIELD); + r->flags |= MALLOC; +-#if defined MBS_SUPPORT ++#ifdef MBS_SUPPORT ++ /* ++ * DON'T call free_wstr(r) here! ++ * r->wstptr still points at n->wstptr's value, and we ++ * don't want to free it! ++ */ + r->wstptr = NULL; ++ r->wstlen = 0; + #endif /* defined MBS_SUPPORT */ + if (n->type == Node_val && (n->flags & STRCUR) != 0) { + r->stref = 1; +@@ -346,11 +345,7 @@ + r->stref = 1; + r->stptr = NULL; + r->stlen = 0; +-#if defined MBS_SUPPORT +- r->wstptr = NULL; +- r->wstlen = 0; +- r->flags &= ~WSTRCUR; +-#endif /* MBS_SUPPORT */ ++ free_wstr(r); + #endif /* GAWKDEBUG */ + return r; + } +@@ -365,10 +360,11 @@ + getnode(r); + r->type = Node_val; + r->flags = (STRING|STRCUR|MALLOC); +-#if defined MBS_SUPPORT ++#ifdef MBS_SUPPORT + r->wstptr = NULL; + r->wstlen = 0; +-#endif ++#endif /* defined MBS_SUPPORT */ ++ + if (flags & ALREADY_MALLOCED) + r->stptr = s; + else { +@@ -512,20 +508,13 @@ + return; + } + free(tmp->stptr); +-#if defined MBS_SUPPORT +- if (tmp->wstptr != NULL) { +- assert((tmp->flags & WSTRCUR) != 0); +- free(tmp->wstptr); +- } +- tmp->flags &= ~WSTRCUR; +- tmp->wstptr = NULL; +- tmp->wstlen = 0; +-#endif ++ free_wstr(tmp); + } + freenode(tmp); + return; + } + if ((tmp->flags & FIELD) != 0) { ++ free_wstr(tmp); + freenode(tmp); + return; + } +@@ -706,12 +695,8 @@ + return n; + /* otherwise + fall through and recompute to fill in the array */ +- } +- +- if (n->wstptr != NULL) { +- free(n->wstptr); +- n->wstptr = NULL; +- n->wstlen = 0; ++ if (n->wstptr != NULL) ++ free_wstr(n); + } + + /* +@@ -752,8 +737,8 @@ + case (size_t) -2: + case (size_t) -1: + case 0: +- goto done; +- ++ count = 1; ++ /* fall through */ + default: + *wsp++ = wc; + src_count -= count; +@@ -777,6 +762,20 @@ + return n; + } + ++/* free_wstr --- release the wide string part of a node */ ++ ++void ++free_wstr(NODE *n) ++{ ++ if ((n->flags & WSTRCUR) != 0) { ++ assert(n->wstptr != NULL); ++ free(n->wstptr); ++ } ++ n->wstptr = NULL; ++ n->wstlen = 0; ++ n->flags &= ~WSTRCUR; ++} ++ + #if 0 + static void + dump_wstr(FILE *fp, const wchar_t *str, size_t len) +--- gawk-3.1.5/dfa.c.freewstr 2007-01-15 11:13:19.000000000 +0100 ++++ gawk-3.1.5/dfa.c 2007-01-15 11:17:44.000000000 +0100 +@@ -516,7 +516,6 @@ + + work_mbc->nchars = work_mbc->nranges = work_mbc->nch_classes = 0; + work_mbc->nequivs = work_mbc->ncoll_elems = 0; +- work_mbc->chars = NULL; + work_mbc->ch_classes = NULL; + work_mbc->range_sts = work_mbc->range_ends = NULL; + work_mbc->equivs = work_mbc->coll_elems = NULL; +@@ -1602,8 +1601,8 @@ + d->states[i].constraint = 0; + d->states[i].first_end = 0; + #ifdef MBS_SUPPORT +- if (MB_CUR_MAX > 1) +- d->states[i].mbps.nelem = 0; ++ d->states[i].mbps.nelem = 0; ++ d->states[i].mbps.elems = NULL; + #endif + for (j = 0; j < s->nelem; ++j) + if (d->tokens[s->elems[j].index] < 0) +@@ -3136,8 +3135,13 @@ + } + #endif /* MBS_SUPPORT */ + +- for (i = 0; i < d->sindex; ++i) ++ for (i = 0; i < d->sindex; ++i) { + free((ptr_t) d->states[i].elems.elems); ++#ifdef MBS_SUPPORT ++ if (d->states[i].mbps.nelem > 0) ++ free((ptr_t) d->states[i].mbps.elems); ++#endif /* MBS_SUPPORT */ ++ } + free((ptr_t) d->states); + for (i = 0; i < d->tindex; ++i) + if (d->follows[i].elems) +--- gawk-3.1.5/eval.c.freewstr 2007-01-15 11:02:51.000000000 +0100 ++++ gawk-3.1.5/eval.c 2007-01-15 11:02:51.000000000 +0100 +@@ -1176,13 +1176,7 @@ + memcpy(l->stptr + l->stlen, r->stptr, r->stlen); + l->stlen += r->stlen; + l->stptr[l->stlen] = '\0'; +-#if defined MBS_SUPPORT +- if (r->wstptr != NULL) +- free(r->wstptr); +- r->wstptr = NULL; +- r->wstlen = 0; +- r->flags &= ~WSTRCUR; +-#endif /* MBS_SUPPORT */ ++ free_wstr(l); + } else { + char *nval; + size_t nlen = l->stlen + r->stlen + 2; diff --git a/sys-apps/gawk/files/gawk-3.1.5-gcc4.patch b/sys-apps/gawk/files/gawk-3.1.5-gcc4.patch new file mode 100644 index 0000000..3ebadcb --- /dev/null +++ b/sys-apps/gawk/files/gawk-3.1.5-gcc4.patch @@ -0,0 +1,23 @@ +Sat Sep 3 16:03:25 EDT 2005 Kito Danya Dietrich <kito@gentoo.org> + + * hard-locale.h (hard_locale): Declare xmalloc in global scope rather than + function scope which gcc-4.x rejects. + +--- gawk-3.1.5/hard-locale.h ++++ gawk-3.1.5/hard-locale.h +@@ -21,6 +21,7 @@ + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + ++static ptr_t xmalloc PARAMS ((size_t n)); + + /* Return nonzero if the current CATEGORY locale is hard, i.e. if you + can't get away with assuming traditional C or POSIX behavior. */ +@@ -40,7 +41,6 @@ + if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0) + hard = 0; + # else +- static ptr_t xmalloc PARAMS ((size_t n)); + + char *locale = xmalloc (strlen (p) + 1); + strcpy (locale, p); diff --git a/sys-apps/gawk/files/gawk-3.1.5-internal.patch b/sys-apps/gawk/files/gawk-3.1.5-internal.patch new file mode 100644 index 0000000..a049730 --- /dev/null +++ b/sys-apps/gawk/files/gawk-3.1.5-internal.patch @@ -0,0 +1,204 @@ +Sun Jun 18 22:27:25 2006 Arnold D. Robbins <arnold@skeeve.com> + + Repair internal names like /dev/user, /dev/pid, as well as /dev/fd/N, + which have been broken for a long time but noone noticed. + + * io.c (is_internal): new macro to check for internal file like `/dev/user'. + (spec_setup): Reduce to two parameters, allocate logic is always true. + Add IOP_NO_FREE to flag. + (pidopen, useropen): Return `IOBUF *' instead of int. Fix + logic to test if `iop' parameter is NULL and if so to allocate it. + (specfdopen,): Return `IOBUF *' instead of int. Fix + logic to test if `iop' parameter is NULL and if so to allocate it. + Don't set IOP_NO_FREE in flag. + (iop_open): Remove `IOBUF iob' field from `struct internal' and its use + and the use of `spec_setup' from the code here. Change the check in the + call to the open function to look for NULL. + (get_a_record): Use `is_internal' in initial check for filling the + buffer to not try to call `read' on internal files. If true, set + the IOP_AT_EOF in the flag and return EOF. + +--- gawk-3.1.5/io.c.internal 2006-06-21 19:46:59.000000000 +0200 ++++ gawk-3.1.5/io.c 2006-06-21 19:49:54.000000000 +0200 +@@ -110,6 +110,7 @@ + #define at_eof(iop) ((iop->flag & IOP_AT_EOF) != 0) + #define has_no_data(iop) (iop->dataend == NULL) + #define no_data_left(iop) (iop->off >= iop->dataend) ++#define is_internal(iop) ((iop->flag & IOP_IS_INTERNAL) != 0) + /* The key point to the design is to split out the code that searches through */ + /* a buffer looking for the record and the terminator into separate routines, */ + /* with a higher-level routine doing the reading of data and buffer management. */ +@@ -163,10 +164,10 @@ + static int gawk_pclose P((struct redirect *rp)); + static int do_pathopen P((const char *file)); + static int str2mode P((const char *mode)); +-static void spec_setup P((IOBUF *iop, int len, int allocate)); +-static int specfdopen P((IOBUF *iop, const char *name, const char *mode)); +-static int pidopen P((IOBUF *iop, const char *name, const char *mode)); +-static int useropen P((IOBUF *iop, const char *name, const char *mode)); ++static void spec_setup P((IOBUF *iop, int len)); ++static IOBUF *specfdopen P((IOBUF *iop, const char *name, const char *mode)); ++static IOBUF *pidopen P((IOBUF *iop, const char *name, const char *mode)); ++static IOBUF *useropen P((IOBUF *iop, const char *name, const char *mode)); + static int two_way_open P((const char *str, struct redirect *rp)); + static int pty_vs_pipe P((const char *command)); + +@@ -1422,30 +1423,24 @@ + /* spec_setup --- setup an IOBUF for a special internal file */ + + static void +-spec_setup(IOBUF *iop, int len, int allocate) ++spec_setup(IOBUF *iop, int len) + { + char *cp; + +- if (allocate) { +- emalloc(cp, char *, len+2, "spec_setup"); +- iop->buf = cp; +- } else { +- len = strlen(iop->buf); +- iop->buf[len++] = '\n'; /* get_a_record clobbered it */ +- iop->buf[len] = '\0'; /* just in case */ +- } ++ emalloc(cp, char *, len+2, "spec_setup"); ++ iop->buf = cp; + iop->off = iop->buf; + iop->count = 0; + iop->size = len; + iop->end = iop->buf + len; + iop->dataend = iop->end; + iop->fd = -1; +- iop->flag = IOP_IS_INTERNAL | IOP_AT_START; ++ iop->flag = IOP_IS_INTERNAL | IOP_AT_START | IOP_NO_FREE; + } + + /* specfdopen --- open an fd special file */ + +-static int ++static IOBUF * + specfdopen(IOBUF *iop, const char *name, const char *mode) + { + int fd; +@@ -1453,23 +1448,20 @@ + + fd = devopen(name, mode); + if (fd == INVALID_HANDLE) +- return INVALID_HANDLE; +- tp = iop_alloc(fd, name, NULL); ++ return NULL; ++ tp = iop_alloc(fd, name, iop); + if (tp == NULL) { + /* don't leak fd's */ + close(fd); +- return INVALID_HANDLE; ++ return NULL; + } +- *iop = *tp; +- iop->flag |= IOP_NO_FREE; +- free(tp); +- return 0; ++ return tp; + } + + + /* pidopen --- "open" /dev/pid, /dev/ppid, and /dev/pgrpid */ + +-static int ++static IOBUF * + pidopen(IOBUF *iop, const char *name, const char *mode ATTRIBUTE_UNUSED) + { + char tbuf[BUFSIZ]; +@@ -1478,6 +1470,12 @@ + + warning(_("use `PROCINFO[\"%s\"]' instead of `%s'"), cp, name); + ++ if (iop == NULL) { ++ iop = iop_alloc(INVALID_HANDLE, name, iop); ++ if (iop == NULL) ++ return NULL; ++ } ++ + if (name[6] == 'g') + #ifdef GETPGRP_VOID + sprintf(tbuf, "%d\n", (int) getpgrp()); +@@ -1489,9 +1487,9 @@ + else + sprintf(tbuf, "%d\n", (int) getppid()); + i = strlen(tbuf); +- spec_setup(iop, i, TRUE); ++ spec_setup(iop, i); + strcpy(iop->buf, tbuf); +- return 0; ++ return iop; + } + + /* useropen --- "open" /dev/user */ +@@ -1506,7 +1504,7 @@ + * supplementary group set. + */ + +-static int ++static IOBUF * + useropen(IOBUF *iop, const char *name ATTRIBUTE_UNUSED, const char *mode ATTRIBUTE_UNUSED) + { + char tbuf[BUFSIZ], *cp; +@@ -1514,6 +1512,12 @@ + + warning(_("use `PROCINFO[...]' instead of `/dev/user'")); + ++ if (iop == NULL) { ++ iop = iop_alloc(INVALID_HANDLE, name, iop); ++ if (iop == NULL) ++ return NULL; ++ } ++ + sprintf(tbuf, "%d %d %d %d", (int) getuid(), (int) geteuid(), (int) getgid(), (int) getegid()); + + cp = tbuf + strlen(tbuf); +@@ -1528,9 +1532,9 @@ + *cp++ = '\0'; + + i = strlen(tbuf); +- spec_setup(iop, i, TRUE); ++ spec_setup(iop, i); + strcpy(iop->buf, tbuf); +- return 0; ++ return iop; + } + + /* iop_open --- handle special and regular files for input */ +@@ -1543,8 +1547,7 @@ + static struct internal { + const char *name; + int compare; +- int (*fp) P((IOBUF *, const char *, const char *)); +- IOBUF iob; ++ IOBUF *(*fp) P((IOBUF *, const char *, const char *)); + } table[] = { + { "/dev/fd/", 8, specfdopen }, + { "/dev/stdin", 10, specfdopen }, +@@ -1569,12 +1572,7 @@ + + for (i = 0; i < devcount; i++) { + if (STREQN(name, table[i].name, table[i].compare)) { +- iop = & table[i].iob; +- +- if (iop->buf != NULL) { +- spec_setup(iop, 0, FALSE); +- return iop; +- } else if ((*table[i].fp)(iop, name, mode) == 0) ++ if ((iop = (*table[i].fp)(iop, name, mode)) != NULL) + return iop; + else { + warning(_("could not open `%s', mode `%s'"), +@@ -2909,6 +2907,10 @@ + + /* <fill initial buffer>= */ + if (has_no_data(iop) || no_data_left(iop)) { ++ if (is_internal(iop)) { ++ iop->flag |= IOP_AT_EOF; ++ return EOF; ++ } + iop->count = read(iop->fd, iop->buf, iop->readsize); + if (iop->count == 0) { + iop->flag |= IOP_AT_EOF; diff --git a/sys-apps/gawk/files/gawk-3.1.5-ipv6.patch b/sys-apps/gawk/files/gawk-3.1.5-ipv6.patch new file mode 100644 index 0000000..1bb2345 --- /dev/null +++ b/sys-apps/gawk/files/gawk-3.1.5-ipv6.patch @@ -0,0 +1,301 @@ +Ripped from Fedora + +diff -bru gawk-3.1.5.orig/io.c gawk-3.1.5/io.c +--- gawk-3.1.5.orig/io.c 2006-07-07 16:13:08.000000000 +0200 ++++ gawk-3.1.5/io.c 2006-07-10 13:18:13.000000000 +0200 +@@ -71,7 +71,6 @@ + extern int MRL; + + #ifdef HAVE_SOCKETS +-enum inet_prot { INET_NONE, INET_TCP, INET_UDP, INET_RAW }; + + #ifndef SHUT_RD + #define SHUT_RD 0 +@@ -1133,24 +1132,60 @@ + /* socketopen --- open a socket and set it into connected state */ + + static int +-socketopen(enum inet_prot type, int localport, int remoteport, const char *remotehostname) ++socketopen(int type, const char *localpname, const char *remotepname, ++ const char *remotehostname) + { +- struct hostent *hp = gethostbyname(remotehostname); +- struct sockaddr_in local_addr, remote_addr; ++ struct addrinfo *lres, *lres0; ++ struct addrinfo lhints; ++ struct addrinfo *rres, *rres0; ++ struct addrinfo rhints; ++ ++ int lerror; ++ int rerror; ++ + int socket_fd; + int any_remote_host = strcmp(remotehostname, "0"); + ++ memset (&lhints, '\0', sizeof (lhints)); ++ lhints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; ++ lhints.ai_socktype = type; ++ ++ lerror = getaddrinfo (NULL, localpname, &lhints, &lres); ++ if (lerror) { ++ if (strcmp(localpname, "0")) ++ fatal(_("local port invalid in `/inet'")); ++ lres0 = NULL; ++ lres = &lhints; ++ } else ++ lres0 = lres; ++ ++ while (lres) { ++ memset (&rhints, '\0', sizeof (rhints)); ++ rhints.ai_flags = lhints.ai_flags; ++ rhints.ai_socktype = lhints.ai_socktype; ++ rhints.ai_family = lhints.ai_family; ++ rhints.ai_protocol = lhints.ai_protocol; ++ ++ rerror = getaddrinfo (remotehostname, remotepname, &rhints, &rres); ++ if (rerror) { ++ if (lres0) ++ freeaddrinfo(lres0); ++ fatal(_("remote host and port information invalid")); ++ } ++ rres0 = rres; + socket_fd = INVALID_HANDLE; +- switch (type) { +- case INET_TCP: +- if (localport != 0 || remoteport != 0) { ++ while (rres) { ++ socket_fd = socket (rres->ai_family, ++ rres->ai_socktype, rres->ai_protocol); ++ if (socket_fd < 0 || socket_fd == INVALID_HANDLE) ++ goto nextrres; ++ ++ if (type == SOCK_STREAM) { + int on = 1; + #ifdef SO_LINGER + struct linger linger; +- + memset(& linger, '\0', sizeof(linger)); + #endif +- socket_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR, + (char *) & on, sizeof(on)); + #ifdef SO_LINGER +@@ -1160,57 +1195,27 @@ + (char *) & linger, sizeof(linger)); + #endif + } +- break; +- case INET_UDP: +- if (localport != 0 || remoteport != 0) +- socket_fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); +- break; +- case INET_RAW: +-#ifdef SOCK_RAW +- if (localport == 0 && remoteport == 0) +- socket_fd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW); +-#endif +- break; +- case INET_NONE: +- /* fall through */ +- default: +- cant_happen(); +- break; +- } ++ if (bind(socket_fd, lres->ai_addr, lres->ai_addrlen) != 0) ++ goto nextrres; + +- if (socket_fd < 0 || socket_fd == INVALID_HANDLE +- || (hp == NULL && any_remote_host != 0)) +- return INVALID_HANDLE; +- +- local_addr.sin_family = remote_addr.sin_family = AF_INET; +- local_addr.sin_addr.s_addr = htonl(INADDR_ANY); +- remote_addr.sin_addr.s_addr = htonl(INADDR_ANY); +- local_addr.sin_port = htons(localport); +- remote_addr.sin_port = htons(remoteport); +- if (bind(socket_fd, (struct sockaddr *) &local_addr, sizeof(local_addr)) == 0) { + if (any_remote_host != 0) { /* not ANY => create a client */ +- if (type == INET_TCP || type == INET_UDP) { +- memcpy(&remote_addr.sin_addr, hp->h_addr, +- sizeof(remote_addr.sin_addr)); +- if (connect(socket_fd, +- (struct sockaddr *) &remote_addr, +- sizeof(remote_addr)) != 0) { +- close(socket_fd); +- if (localport == 0) +- socket_fd = INVALID_HANDLE; +- else +- socket_fd = socketopen(type, localport, 0, "0"); +- } ++ if (type != SOCK_RAW) { ++ if (connect(socket_fd, rres->ai_addr, ++ rres->ai_addrlen) == 0) ++ break; + } else { + /* /inet/raw client not ready yet */ + fatal(_("/inet/raw client not ready yet, sorry")); + if (geteuid() != 0) ++ /* FIXME: is this second fatal ever reached? */ + fatal(_("only root may use `/inet/raw'.")); + } + } else { /* remote host is ANY => create a server */ +- if (type == INET_TCP) { ++ if (type == SOCK_STREAM) { + int clientsocket_fd = INVALID_HANDLE; +- socklen_t namelen = sizeof(remote_addr); ++ ++ struct sockaddr_storage remote_addr; ++ socklen_t namelen = sizeof (remote_addr); + + if (listen(socket_fd, 1) >= 0 + && (clientsocket_fd = accept(socket_fd, +@@ -1218,25 +1223,22 @@ + &namelen)) >= 0) { + close(socket_fd); + socket_fd = clientsocket_fd; +- } else { +- close(socket_fd); +- socket_fd = INVALID_HANDLE; ++ break; + } +- } else if (type == INET_UDP) { ++ } else if (type == SOCK_DGRAM) { + #ifdef MSG_PEEK + char buf[10]; ++ struct sockaddr_storage remote_addr; + socklen_t readle; + + if (recvfrom(socket_fd, buf, 1, MSG_PEEK, + (struct sockaddr *) & remote_addr, +- & readle) < 1 +- || readle != sizeof(remote_addr) +- || connect(socket_fd, ++ & readle) >= 0 ++ && readle ++ && connect(socket_fd, + (struct sockaddr *)& remote_addr, +- readle) != 0) { +- close(socket_fd); +- socket_fd = INVALID_HANDLE; +- } ++ readle) == 0) ++ break; + #endif + } else { + /* /inet/raw server not ready yet */ +@@ -1245,10 +1247,20 @@ + fatal(_("only root may use `/inet/raw'.")); + } + } +- } else { ++ ++nextrres: ++ if (socket_fd != INVALID_HANDLE) + close(socket_fd); + socket_fd = INVALID_HANDLE; ++ rres = rres->ai_next; ++ } ++ freeaddrinfo(rres0); ++ if (socket_fd != INVALID_HANDLE) ++ break; ++ lres = lres->ai_next; + } ++ if (lres0) ++ freeaddrinfo(lres0); + + return socket_fd; + } +@@ -1313,30 +1325,24 @@ + } else if (STREQN(name, "/inet/", 6)) { + #ifdef HAVE_SOCKETS + /* /inet/protocol/localport/hostname/remoteport */ +- enum inet_prot protocol = INET_NONE; +- int localport, remoteport; ++ int protocol; + char *hostname; + char *hostnameslastcharp; + char *localpname; +- char proto[4]; +- struct servent *service; ++ char *localpnamelastcharp; + + cp = (char *) name + 6; + /* which protocol? */ + if (STREQN(cp, "tcp/", 4)) +- protocol = INET_TCP; ++ protocol = SOCK_STREAM; + else if (STREQN(cp, "udp/", 4)) +- protocol = INET_UDP; ++ protocol = SOCK_DGRAM; + else if (STREQN(cp, "raw/", 4)) +- protocol = INET_RAW; ++ protocol = SOCK_RAW; + else + fatal(_("no (known) protocol supplied in special filename `%s'"), + name); + +- proto[0] = cp[0]; +- proto[1] = cp[1]; +- proto[2] = cp[2]; +- proto[3] = '\0'; + cp += 4; + + /* which localport? */ +@@ -1354,25 +1360,17 @@ + * By using atoi() the use of decimal numbers is enforced. + */ + *cp = '\0'; +- +- localport = atoi(localpname); +- if (strcmp(localpname, "0") != 0 +- && (localport <= 0 || localport > 65535)) { +- service = getservbyname(localpname, proto); +- if (service == NULL) +- fatal(_("local port invalid in `%s'"), name); +- else +- localport = ntohs(service->s_port); +- } +- *cp = '/'; ++ localpnamelastcharp = cp; + + /* which hostname? */ + cp++; + hostname = cp; + while (*cp != '/' && *cp != '\0') + cp++; +- if (*cp != '/' || cp == hostname) ++ if (*cp != '/' || cp == hostname) { ++ *localpnamelastcharp = '/'; + fatal(_("must supply a remote hostname to `/inet'")); ++ } + *cp = '\0'; + hostnameslastcharp = cp; + +@@ -1386,22 +1384,15 @@ + * Here too, require a port, let them explicitly put 0 if + * they don't care. + */ +- if (*cp == '\0') ++ if (*cp == '\0') { ++ *localpnamelastcharp = '/'; ++ *hostnameslastcharp = '/'; + fatal(_("must supply a remote port to `/inet'")); +- remoteport = atoi(cp); +- if (strcmp(cp, "0") != 0 +- && (remoteport <= 0 || remoteport > 65535)) { +- service = getservbyname(cp, proto); +- if (service == NULL) +- fatal(_("remote port invalid in `%s'"), name); +- else +- remoteport = ntohs(service->s_port); + } + +- /* Open Sesame! */ +- openfd = socketopen(protocol, localport, remoteport, hostname); ++ openfd = socketopen(protocol, localpname, cp, hostname); ++ *localpnamelastcharp = '/'; + *hostnameslastcharp = '/'; +- + #else /* ! HAVE_SOCKETS */ + fatal(_("TCP/IP communications are not supported")); + #endif /* HAVE_SOCKETS */ diff --git a/sys-apps/gawk/files/gawk-3.1.5-mbread.patch b/sys-apps/gawk/files/gawk-3.1.5-mbread.patch new file mode 100644 index 0000000..078c97d --- /dev/null +++ b/sys-apps/gawk/files/gawk-3.1.5-mbread.patch @@ -0,0 +1,41 @@ +Ripped from Fedora + + Date: Mon, 18 Dec 2006 18:38:13 +0300 + From: "Dmitry V. Levin" <ldv@altlinux.org> + Subject: gawk: do_match() invalid read + To: bug-gawk@gnu.org + + Due to missing mounds check, do_match() may do invalid read in multibyte + locales: + + $ printf '\n\n' |env -i gawk '{print match(""," *")}' + 1 + 1 + $ printf '\n\n' |env -i LC_ALL=3Dru_RU.UTF-8 gawk '{print match(""," *")}' + -1208299079 + 134843273 + + As you see, match() output in multibyte locale is wrong; valgrind reports + about "Invalid read of size 4". + + +--- gawk-3.1.5/builtin.c.mbread 2007-01-12 13:23:55.000000000 +0100 ++++ gawk-3.1.5/builtin.c 2007-01-12 13:24:41.000000000 +0100 +@@ -2020,7 +2020,7 @@ + + rlength = REEND(rp, t1->stptr) - RESTART(rp, t1->stptr); /* byte length */ + #ifdef MBS_SUPPORT +- if (gawk_mb_cur_max > 1) { ++ if (rlength > 0 && gawk_mb_cur_max > 1) { + t1 = str2wstr(t1, & wc_indices); + rlength = wc_indices[rstart + rlength - 1] - wc_indices[rstart] + 1; + rstart = wc_indices[rstart]; +@@ -2046,7 +2046,7 @@ + subpat_start = s; + subpat_len = len = SUBPATEND(rp, t1->stptr, ii) - s; + #ifdef MBS_SUPPORT +- if (gawk_mb_cur_max > 1) { ++ if (len > 0 && gawk_mb_cur_max > 1) { + subpat_start = wc_indices[s]; + subpat_len = wc_indices[s + len - 1] - subpat_start + 1; + } diff --git a/sys-apps/gawk/files/gawk-3.1.5-num2str.patch b/sys-apps/gawk/files/gawk-3.1.5-num2str.patch new file mode 100644 index 0000000..57ecd46 --- /dev/null +++ b/sys-apps/gawk/files/gawk-3.1.5-num2str.patch @@ -0,0 +1,42 @@ +Ripped from Fedora + +* Thu Dec 22 2005 Karel Zak <kzak@redhat.com> 3.1.5-5 +- fix conversion from large number to string (patch by Aharon Robbins) + +--- gawk-3.1.5/node.c.num2str 2005-07-26 20:07:43.000000000 +0200 ++++ gawk-3.1.5/node.c 2005-12-22 19:41:55.000000000 +0100 +@@ -151,6 +151,7 @@ + register char *sp = buf; + double val; + char *orig, *trans, save; ++ register long num; + + if (! do_traditional && (s->flags & INTLSTR) != 0) { + save = s->stptr[s->stlen]; +@@ -163,9 +164,12 @@ + return tmp_string(trans, strlen(trans)); + } + +- /* not an integral value, or out of range */ +- if ((val = double_to_int(s->numbr)) != s->numbr +- || val < LONG_MIN || val > LONG_MAX) { ++ /* conversion to long overflows, or out of range, or not integral */ ++ val = double_to_int(s->numbr); ++ num = (long) val; ++ if ( (s->numbr > 0 && num < 0) ++ || (s->numbr < 0 && num > 0) ++ || val < LONG_MIN || val > LONG_MAX || val != s->numbr) { + /* + * Once upon a time, if GFMT_WORKAROUND wasn't defined, + * we just blindly did this: +@@ -199,9 +203,7 @@ + + goto no_malloc; + } else { +- /* integral value */ +- /* force conversion to long only once */ +- register long num = (long) val; ++ /* integral value, in range, too! */ + if (num < NVAL && num >= 0) { + sp = (char *) values[num]; + s->stlen = 1; diff --git a/sys-apps/gawk/files/gawk-3.1.5-numflags.patch b/sys-apps/gawk/files/gawk-3.1.5-numflags.patch new file mode 100644 index 0000000..a0ada4b --- /dev/null +++ b/sys-apps/gawk/files/gawk-3.1.5-numflags.patch @@ -0,0 +1,16 @@ +Tue Jul 4 22:43:05 2006 Arnold D. Robbins <arnold@skeeve.com> + + * eval.c (interpret): Node_assign_concat case: Turn off NUMBER and NUMCUR + flags in result. Sheesh. Thanks to <Heiner.Marxen@DrB.Insel.DE> for finding + the problem. + +--- gawk-3.1.5/eval.c.numflags 2006-07-10 09:36:26.000000000 +0200 ++++ gawk-3.1.5/eval.c 2006-07-10 09:36:41.000000000 +0200 +@@ -1193,6 +1193,7 @@ + unref(*lhs); + *lhs = make_str_node(nval, l->stlen + r->stlen, ALREADY_MALLOCED); + } ++ (*lhs)->flags &= ~(NUMCUR|NUMBER); + free_temp(r); + + if (after_assign) diff --git a/sys-apps/gawk/files/gawk-3.1.5-syntaxerror.patch b/sys-apps/gawk/files/gawk-3.1.5-syntaxerror.patch new file mode 100644 index 0000000..34742f0 --- /dev/null +++ b/sys-apps/gawk/files/gawk-3.1.5-syntaxerror.patch @@ -0,0 +1,17 @@ +Fri Jun 23 15:48:34 2006 Arnold D. Robbins <arnold@skeeve.com> + + * awkgram.y (subn): At end for `do_sprintf' check, verify that lnode is not NULL + before using it assign through. + +--- gawk-3.1.5/awkgram.y.syntaxerror 2005-07-26 20:07:43.000000000 +0200 ++++ gawk-3.1.5/awkgram.y 2006-06-23 17:43:55.000000000 +0200 +@@ -2399,7 +2399,8 @@ + r->subnode = subn; + if (r->builtin == do_sprintf) { + count_args(r); +- r->lnode->printf_count = r->printf_count; /* hack */ ++ if (r->lnode != NULL) /* r->lnode set from subn. guard against syntax errors & check it's valid */ ++ r->lnode->printf_count = r->printf_count; /* hack */ + } + return r; + } diff --git a/sys-apps/gawk/files/gawk-3.1.5-wconcat.patch b/sys-apps/gawk/files/gawk-3.1.5-wconcat.patch new file mode 100644 index 0000000..e082f24 --- /dev/null +++ b/sys-apps/gawk/files/gawk-3.1.5-wconcat.patch @@ -0,0 +1,16 @@ +--- gawk-3.1.5/eval.c.wconcat 2006-02-14 09:40:54.000000000 +0100 ++++ gawk-3.1.5/eval.c 2006-02-14 09:43:33.000000000 +0100 +@@ -1176,6 +1176,13 @@ + memcpy(l->stptr + l->stlen, r->stptr, r->stlen); + l->stlen += r->stlen; + l->stptr[l->stlen] = '\0'; ++#if defined MBS_SUPPORT ++ if (r->wstptr != NULL) ++ free(r->wstptr); ++ r->wstptr = NULL; ++ r->wstlen = 0; ++ r->flags &= ~WSTRCUR; ++#endif /* MBS_SUPPORT */ + } else { + char *nval; + size_t nlen = l->stlen + r->stlen + 2; diff --git a/sys-apps/gawk/gawk-3.1.5-r5.ebuild b/sys-apps/gawk/gawk-3.1.5-r5.ebuild new file mode 100644 index 0000000..d53aee7 --- /dev/null +++ b/sys-apps/gawk/gawk-3.1.5-r5.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.5-r5.ebuild,v 1.9 2007/12/11 10:19:43 vapier Exp $ + +inherit eutils toolchain-funcs multilib + +DESCRIPTION="GNU awk pattern-matching language" +HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html" +SRC_URI="mirror://gnu/gawk/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +IUSE="nls" + +RDEPEND="" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +SFFS=${WORKDIR}/filefuncs + +src_unpack() { + unpack ${P}.tar.gz + + # Copy filefuncs module's source over ... + cp -r "${FILESDIR}"/filefuncs "${SFFS}" || die "cp failed" + + cd "${S}" + epatch "${FILESDIR}"/${P}-core.patch + epatch "${FILESDIR}"/${P}-gcc4.patch + epatch "${FILESDIR}"/${P}-autotools-crap.patch #139397 + # Patches from Fedora + epatch "${FILESDIR}"/${PN}-3.1.3-getpgrp_void.patch + epatch "${FILESDIR}"/${P}-fieldwidths.patch #127163 + epatch "${FILESDIR}"/${P}-binmode.patch + epatch "${FILESDIR}"/${P}-num2str.patch + epatch "${FILESDIR}"/${P}-internal.patch + epatch "${FILESDIR}"/${P}-numflags.patch + epatch "${FILESDIR}"/${P}-syntaxerror.patch + epatch "${FILESDIR}"/${P}-wconcat.patch + epatch "${FILESDIR}"/${P}-ipv6.patch + epatch "${FILESDIR}"/${P}-mbread.patch + epatch "${FILESDIR}"/${P}-freewstr2.patch #135931 #188740 +} + +src_compile() { + local bindir=/usr/bin + use userland_GNU && bindir=/bin + econf \ + --bindir=${bindir} \ + --libexec='$(libdir)/misc' \ + $(use_enable nls) \ + --enable-switch \ + || die + emake || die "emake failed" + + cd "${SFFS}" + emake CC=$(tc-getCC) || die "filefuncs emake failed" +} + +src_install() { + emake install DESTDIR="${D}" || die "install failed" + cd "${SFFS}" + emake LIBDIR="$(get_libdir)" install || die "filefuncs install failed" + + dodir /usr/bin + # In some rare cases, (p)gawk gets installed as (p)gawk- and not + # (p)gawk-${PV} ... Also make sure that /bin/(p)gawk is a symlink + # to /bin/(p)gawk-${PV}. + local bindir=/usr/bin binpath= x= + use userland_GNU && bindir=/bin + for x in gawk pgawk igawk ; do + [[ ${x} == "gawk" ]] \ + && binpath=${bindir} \ + || binpath=/usr/bin + + if [[ -f ${D}/${bindir}/${x} && ! -f ${D}/${bindir}/${x}-${PV} ]] ; then + mv -f "${D}"/${bindir}/${x} "${D}"/${binpath}/${x}-${PV} + elif [[ -f ${D}/${bindir}/${x}- && ! -f ${D}/${bindir}/${x}-${PV} ]] ; then + mv -f "${D}"/${bindir}/${x}- "${D}"/${binpath}/${x}-${PV} + elif [[ ${binpath} == "/usr/bin" && -f ${D}/${bindir}/${x}-${PV} ]] ; then + mv -f "${D}"/${bindir}/${x}-${PV} "${D}"/${binpath}/${x}-${PV} + fi + + rm -f "${D}"/${bindir}/${x} + [[ -x "${D}"/${binpath}/${x}-${PV} ]] && dosym ${x}-${PV} ${binpath}/${x} + if use userland_GNU ; then + [[ ${binpath} == "/usr/bin" ]] && dosym /usr/bin/${x}-${PV} /bin/${x} + fi + done + + rm -f "${D}"/bin/awk + dodir /usr/bin + # Compat symlinks + dosym gawk-${PV} ${bindir}/awk + dosym ${bindir}/gawk-${PV} /usr/bin/awk + if use userland_GNU ; then + dosym /bin/gawk-${PV} /usr/bin/gawk + else + rm -f "${D}"/{,usr/}bin/awk{,-${PV}} + fi + + # Install headers + insinto /usr/include/awk + doins "${S}"/*.h || die "ins headers failed" + # We do not want 'acconfig.h' in there ... + rm -f "${D}"/usr/include/awk/acconfig.h + + cd "${S}" + rm -f "${D}"/usr/share/man/man1/pgawk.1 + dosym gawk.1 /usr/share/man/man1/pgawk.1 + if use userland_GNU ; then + dosym gawk.1 /usr/share/man/man1/awk.1 + fi + dodoc AUTHORS ChangeLog FUTURES LIMITATIONS NEWS PROBLEMS POSIX.STD README + docinto README_d + dodoc README_d/* + docinto awklib + dodoc awklib/ChangeLog + docinto pc + dodoc pc/ChangeLog + docinto posix + dodoc posix/ChangeLog +} diff --git a/sys-apps/gawk/gawk-3.1.6.ebuild b/sys-apps/gawk/gawk-3.1.6.ebuild new file mode 100644 index 0000000..c0689de --- /dev/null +++ b/sys-apps/gawk/gawk-3.1.6.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.6.ebuild,v 1.10 2008/10/28 10:45:16 armin76 Exp $ + +inherit eutils toolchain-funcs multilib + +DESCRIPTION="GNU awk pattern-matching language" +HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html" +SRC_URI="mirror://gnu/gawk/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +IUSE="nls" + +RDEPEND="" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +SFFS=${WORKDIR}/filefuncs + +src_unpack() { + unpack ${A} + + # Copy filefuncs module's source over ... + cp -r "${FILESDIR}"/filefuncs "${SFFS}" || die "cp failed" + + cd "${S}" + epatch "${FILESDIR}"/autoconf-mktime-2.61.patch #220040 + epatch "${FILESDIR}"/${PN}-3.1.3-getpgrp_void.patch +} + +src_compile() { + local bindir=/usr/bin + use userland_GNU && bindir=/bin + econf \ + --bindir=${bindir} \ + --libexec='$(libdir)/misc' \ + $(use_enable nls) \ + --enable-switch \ + || die + emake || die "emake failed" + + cd "${SFFS}" + CCOMPILER=$(tc-getCC) + if tc-is-cross-compiler; then + CCOMPILER=$(echo $CCOMPILER | sed -e "s|--sysroot=.*||") + fi + emake CC=$CCOMPILER || die "filefuncs emake failed" +} + +src_install() { + emake install DESTDIR="${D}" || die "install failed" + cd "${SFFS}" + emake LIBDIR="$(get_libdir)" install || die "filefuncs install failed" + + dodir /usr/bin + # In some rare cases, (p)gawk gets installed as (p)gawk- and not + # (p)gawk-${PV} ... Also make sure that /bin/(p)gawk is a symlink + # to /bin/(p)gawk-${PV}. + local bindir=/usr/bin binpath= x= + use userland_GNU && bindir=/bin + for x in gawk pgawk igawk ; do + [[ ${x} == "gawk" ]] \ + && binpath=${bindir} \ + || binpath=/usr/bin + + if [[ -f ${D}/${bindir}/${x} && ! -f ${D}/${bindir}/${x}-${PV} ]] ; then + mv -f "${D}"/${bindir}/${x} "${D}"/${binpath}/${x}-${PV} + elif [[ -f ${D}/${bindir}/${x}- && ! -f ${D}/${bindir}/${x}-${PV} ]] ; then + mv -f "${D}"/${bindir}/${x}- "${D}"/${binpath}/${x}-${PV} + elif [[ ${binpath} == "/usr/bin" && -f ${D}/${bindir}/${x}-${PV} ]] ; then + mv -f "${D}"/${bindir}/${x}-${PV} "${D}"/${binpath}/${x}-${PV} + fi + + rm -f "${D}"/${bindir}/${x} + [[ -x "${D}"/${binpath}/${x}-${PV} ]] && dosym ${x}-${PV} ${binpath}/${x} + if use userland_GNU ; then + [[ ${binpath} == "/usr/bin" ]] && dosym /usr/bin/${x}-${PV} /bin/${x} + fi + done + + rm -f "${D}"/bin/awk + dodir /usr/bin + # Compat symlinks + dosym gawk-${PV} ${bindir}/awk + dosym ${bindir}/gawk-${PV} /usr/bin/awk + if use userland_GNU ; then + dosym /bin/gawk-${PV} /usr/bin/gawk + else + rm -f "${D}"/{,usr/}bin/awk{,-${PV}} + fi + + # Install headers + insinto /usr/include/awk + doins "${S}"/*.h || die "ins headers failed" + # We do not want 'acconfig.h' in there ... + rm -f "${D}"/usr/include/awk/acconfig.h + + cd "${S}" + rm -f "${D}"/usr/share/man/man1/pgawk.1 + dosym gawk.1 /usr/share/man/man1/pgawk.1 + if use userland_GNU ; then + dosym gawk.1 /usr/share/man/man1/awk.1 + fi + dodoc AUTHORS ChangeLog FUTURES LIMITATIONS NEWS PROBLEMS POSIX.STD README + docinto README_d + dodoc README_d/* + docinto awklib + dodoc awklib/ChangeLog + docinto pc + dodoc pc/ChangeLog + docinto posix + dodoc posix/ChangeLog +} diff --git a/sys-apps/gawk/metadata.xml b/sys-apps/gawk/metadata.xml new file mode 100644 index 0000000..96a2d58 --- /dev/null +++ b/sys-apps/gawk/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..9d78f6b --- /dev/null +++ b/sys-apps/openrc/Manifest @@ -0,0 +1,23 @@ +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.0/0001-msg-style.patch 1709 RMD160 c8f22d90c66cd99da701d0840094694d96269def SHA1 2983c97f1b3c770d9b2afce4540d6d8a7db8abe7 SHA256 5a5d7cd9c0289eb9e7332b01aa15331e8497579efc78ea4d833400d00cb46f7b +AUX 0.4.0/0002-useful-functions.patch 1803 RMD160 be1963ad7d51deb8ffc96d9ce5d7c59903e9dbcd SHA1 d07901d1c65af2c37a4817d05b364f736b66470c SHA256 d270bba9141333df12c5b5795566bba9f59ba6d6c26a58f09abf0c394f802475 +AUX 0.4.0/0003-KV.patch 2569 RMD160 7ccbca71beba996aedcec5aa1def57a96c008893 SHA1 d3489d7a34f9984b4267819677b5e4549c12fc00 SHA256 dab3a00036718ea99058f362d84a4bac5e9bbd4eff934f1ad1d4da85c8551539 +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.0.tar.bz2 144297 RMD160 e41e9d75e104bd04fa64291f9b520235ea4c6fbc SHA1 5dc4fbc45363234a0f4ea3ede5beb3af8273a381 SHA256 1aa7210e7c52c6eb2398de359e852713f46e303ec8b8e748cdbb0cf75725ee76 +EBUILD openrc-0.2.5.ebuild 8991 RMD160 89376a36c44922f594ca3f17987bc152b827e322 SHA1 1521ceeb8773144cfae6c9884521c4ade1118995 SHA256 fbcaec71cb268f5e44f0649126d2a828d58a4b1b365da36dfa52235d1fe6ef0d +EBUILD openrc-0.3.0-r1.ebuild 8994 RMD160 a99e81fc96df6d8d52eda840b9f678ec0dc1f064 SHA1 aaf7ed0502251f82fde1f2dfbf3ef060d401bf0c SHA256 cb23fbcd586af6dbff1f9a78ee442c4f6c46df25b097cc6819b3e99f98fdce6d +EBUILD openrc-0.4.0.ebuild 9445 RMD160 acab225197311296a365916e5ee3b7ca341d2737 SHA1 323b1e1df36c01d61ddb0dd8c7bb5b4852e5df94 SHA256 650f22743c662aecebe35ed73528f35fd97f5862cab6c2bb09da48b56e7e0438 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.0/0001-msg-style.patch b/sys-apps/openrc/files/0.4.0/0001-msg-style.patch new file mode 100644 index 0000000..ab3559e --- /dev/null +++ b/sys-apps/openrc/files/0.4.0/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.0/0002-useful-functions.patch b/sys-apps/openrc/files/0.4.0/0002-useful-functions.patch new file mode 100644 index 0000000..a307386 --- /dev/null +++ b/sys-apps/openrc/files/0.4.0/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.0/0003-KV.patch b/sys-apps/openrc/files/0.4.0/0003-KV.patch new file mode 100644 index 0000000..8ab646f --- /dev/null +++ b/sys-apps/openrc/files/0.4.0/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/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..4045b3c --- /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/${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.0.ebuild b/sys-apps/openrc/openrc-0.4.0.ebuild new file mode 100644 index 0000000..8e7f36d --- /dev/null +++ b/sys-apps/openrc/openrc-0.4.0.ebuild @@ -0,0 +1,287 @@ +# 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.4.0.ebuild,v 1.1 2008/12/10 22:04:46 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-133 + !<sys-fs/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}"/${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 + 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 + + # 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/texinfo/Manifest b/sys-apps/texinfo/Manifest new file mode 100644 index 0000000..aeec6e5 --- /dev/null +++ b/sys-apps/texinfo/Manifest @@ -0,0 +1,2 @@ +DIST texinfo-4.13.tar.lzma 1563777 RMD160 31d68ab41fead86d473ecc1de183fd1629e01560 SHA1 676ec9aa25a97c05dff66fba5225f9e101160063 SHA256 6d28b0ceae866e3536142fc552e7a3bc9f84c8303119c25731b2478eef64c9e5 +EBUILD texinfo-4.13.ebuild 1156 RMD160 eed0828ed17e8539becc87bc48c64e019d7b0cc4 SHA1 6ddc54f53509618e05cc098c55ae1d67c38c94df SHA256 b6ad62d4f6fe4446924bff1cceaea30ab221acf029763d93f4dffd5c7c5c4ccd diff --git a/sys-apps/texinfo/texinfo-4.13.ebuild b/sys-apps/texinfo/texinfo-4.13.ebuild new file mode 100644 index 0000000..6251d69 --- /dev/null +++ b/sys-apps/texinfo/texinfo-4.13.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.13.ebuild,v 1.1 2008/10/22 05:34:03 robbat2 Exp $ + +inherit flag-o-matic + +DESCRIPTION="The GNU info program and utilities" +HOMEPAGE="http://www.gnu.org/software/texinfo/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.lzma" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="nls static" + +RDEPEND="!=app-text/tetex-2* + >=sys-libs/ncurses-5.2-r2 + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + app-arch/lzma-utils + nls? ( sys-devel/gettext )" + +src_compile() { + use static && append-ldflags -static + econf $(use_enable nls) || die + + # http://bugs.gentoo.org/196041 + if tc-is-cross-compiler; then + emake -C tools/gnulib/lib || die "emake -C tools/gnulib/lib" + fi + emake || die "emake" +} + +src_install() { + emake DESTDIR="${D}" install || die "install failed" + + dodoc AUTHORS ChangeLog INTRODUCTION NEWS README TODO + newdoc info/README README.info + newdoc makeinfo/README README.makeinfo + + rm -f "${D}"/usr/lib/charset.alias #195148 +} diff --git a/sys-mobilephone/freesmartphone-framework/Manifest b/sys-mobilephone/freesmartphone-framework/Manifest new file mode 100644 index 0000000..e780b30 --- /dev/null +++ b/sys-mobilephone/freesmartphone-framework/Manifest @@ -0,0 +1,5 @@ +AUX frameworkd 505 RMD160 a1970ba44ccf0d8e67ec21e6c242f33daeee4770 SHA1 2ecbaf7e7967db3d7b1da15782fc75633fda3aad SHA256 b57ff5255f6375d80b2e86bfb7fc70257a9f24f6cd2b23fc6da2b0c22de06e4d +AUX freesmartphone-framework-0.3-setup-paths.patch 1979 RMD160 5fa5072785177567ad0386ea414e46dce7fbc1d7 SHA1 2d3a159e5735b05450c51fc71b626b71815581c2 SHA256 79e450fb702c7e722fd685111f7725e0471aa8b22ead103755df8f55c33ba01a +AUX freesmartphone-framework-0.4-setup-paths.patch 2807 RMD160 2a0a3b4a5f7dc3553ff1cae6118e392cf61e1472 SHA1 218cdfe8d4ac7a8ec7f93e6f51075a42287b32af SHA256 a7101605184f469827ee4e111f50c87339baa1b8eac1e26f6e339748653fb56e +EBUILD freesmartphone-framework-0.3.ebuild 1116 RMD160 eabfac505d0e63d4f50006bfd9e579c729a25c16 SHA1 3947fa555dbac1826ef0d733057792cf01700eed SHA256 1613d6d90dd64753b5a5084c30341272ecf5b64d2bd6a86e488d932f36e24f61 +EBUILD freesmartphone-framework-0.4.ebuild 1208 RMD160 fadd95cb937590dbf89551e230916e2c93f53b56 SHA1 e03c980cc62b0617a1b7859cdb6e0876d122ddeb SHA256 0a737e38ff8516e8d828ed938db027beaffa1c621073dbb1dd1d446b85931dcb diff --git a/sys-mobilephone/freesmartphone-framework/files/frameworkd b/sys-mobilephone/freesmartphone-framework/files/frameworkd new file mode 100755 index 0000000..1af77fc --- /dev/null +++ b/sys-mobilephone/freesmartphone-framework/files/frameworkd @@ -0,0 +1,26 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later + +depend() { + need dbus gsm0710muxd +} + +start() { + ebegin "Starting frameworkd" + + start-stop-daemon --start --pidfile /var/run/frameworkd.pid --make-pidfile --background --exec /usr/bin/frameworkd + eend $? +} + +stop() { + local retval + + ebegin "Stopping frameworkd" + + start-stop-daemon --stop --pidfile /var/run/frameworkd.pid + retval=$? + + eend ${retval} + return ${retval} +} diff --git a/sys-mobilephone/freesmartphone-framework/files/freesmartphone-framework-0.3-setup-paths.patch b/sys-mobilephone/freesmartphone-framework/files/freesmartphone-framework-0.3-setup-paths.patch new file mode 100644 index 0000000..79c2ac1 --- /dev/null +++ b/sys-mobilephone/freesmartphone-framework/files/freesmartphone-framework-0.3-setup-paths.patch @@ -0,0 +1,25 @@ +--- setup.py 2008-09-24 19:17:20.000000000 +0200 ++++ setup.py.new 2008-09-24 19:19:20.000000000 +0200 +@@ -23,13 +23,14 @@ + packages = packages, + scripts = [ "framework/frameworkd", "tools/cli-framework" ], + data_files = [ +- ("../../etc/dbus-1/system.d", ["etc/dbus-1/system.d/frameworkd.conf"] ), +- ("../../etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/phone.yaml"]), +- ("../../etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/profiles.yaml"]), +- ("../../etc/freesmartphone/opreferences/conf/profiles/", ["etc/freesmartphone/opreferences/conf/profiles/default.yaml"]), +- ("../../etc/freesmartphone/opreferences/conf/phone", ["etc/freesmartphone/opreferences/conf/phone/default.yaml"]), +- ("../../etc/freesmartphone/opreferences/conf/phone", ["etc/freesmartphone/opreferences/conf/phone/silent.yaml"]), +- ("../../etc/freesmartphone/oevents", ["etc/freesmartphone/oevents/rules.yaml"]), +- ("freesmartphone/examples/", getDir( "examples" ) ), ++ ("../etc/dbus-1/system.d", ["etc/dbus-1/system.d/frameworkd.conf"] ), ++ ("../etc", ["conf/example/frameworkd.conf"] ), ++ ("../etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/phone.yaml"]), ++ ("../etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/profiles.yaml"]), ++ ("../etc/freesmartphone/opreferences/conf/profiles/", ["etc/freesmartphone/opreferences/conf/profiles/default.yaml"]), ++ ("../etc/freesmartphone/opreferences/conf/phone", ["etc/freesmartphone/opreferences/conf/phone/default.yaml"]), ++ ("../etc/freesmartphone/opreferences/conf/phone", ["etc/freesmartphone/opreferences/conf/phone/silent.yaml"]), ++ ("../etc/freesmartphone/oevents", ["etc/freesmartphone/oevents/rules.yaml"]), ++ ("share/doc/freesmartphone/examples/", getDir( "examples" ) ), + ] + ) diff --git a/sys-mobilephone/freesmartphone-framework/files/freesmartphone-framework-0.4-setup-paths.patch b/sys-mobilephone/freesmartphone-framework/files/freesmartphone-framework-0.4-setup-paths.patch new file mode 100644 index 0000000..cee77a8 --- /dev/null +++ b/sys-mobilephone/freesmartphone-framework/files/freesmartphone-framework-0.4-setup-paths.patch @@ -0,0 +1,32 @@ +--- setup.py 2008-11-11 22:04:44.000000000 +0100 ++++ setup.py.new 2008-11-11 22:06:20.000000000 +0100 +@@ -23,17 +23,17 @@ + packages = packages, + scripts = [ "framework/frameworkd", "tools/cli-framework" ], + data_files = [ +- ("../../etc/dbus-1/system.d", ["etc/dbus-1/system.d/frameworkd.conf"] ), +- ("../../etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/phone.yaml"]), +- ("../../etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/profiles.yaml"]), +- ("../../etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/rules.yaml"]), +- ("../../etc/freesmartphone/opreferences/conf/profiles/", ["etc/freesmartphone/opreferences/conf/profiles/default.yaml"]), +- ("../../etc/freesmartphone/opreferences/conf/phone", ["etc/freesmartphone/opreferences/conf/phone/default.yaml"]), +- ("../../etc/freesmartphone/opreferences/conf/phone", ["etc/freesmartphone/opreferences/conf/phone/silent.yaml"]), +- ("../../etc/freesmartphone/opreferences/conf/rules", ["etc/freesmartphone/opreferences/conf/rules/default.yaml"]), +- ("../../etc/freesmartphone/opreferences/conf/rules", ["etc/freesmartphone/opreferences/conf/rules/silent.yaml"]), +- ("../../etc/freesmartphone/oevents", ["etc/freesmartphone/oevents/rules.yaml"]), +- ("../../etc/freesmartphone/persist", ["etc/freesmartphone/persist/README"]), +- ("freesmartphone/examples/", getDir( "examples" ) ), ++ ("../etc/dbus-1/system.d", ["etc/dbus-1/system.d/frameworkd.conf"] ), ++ ("../etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/phone.yaml"]), ++ ("../etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/profiles.yaml"]), ++ ("../etc/freesmartphone/opreferences/schema/", ["etc/freesmartphone/opreferences/schema/rules.yaml"]), ++ ("../etc/freesmartphone/opreferences/conf/profiles/", ["etc/freesmartphone/opreferences/conf/profiles/default.yaml"]), ++ ("../etc/freesmartphone/opreferences/conf/phone", ["etc/freesmartphone/opreferences/conf/phone/default.yaml"]), ++ ("../etc/freesmartphone/opreferences/conf/phone", ["etc/freesmartphone/opreferences/conf/phone/silent.yaml"]), ++ ("../etc/freesmartphone/opreferences/conf/rules", ["etc/freesmartphone/opreferences/conf/rules/default.yaml"]), ++ ("../etc/freesmartphone/opreferences/conf/rules", ["etc/freesmartphone/opreferences/conf/rules/silent.yaml"]), ++ ("../etc/freesmartphone/oevents", ["etc/freesmartphone/oevents/rules.yaml"]), ++ ("../etc/freesmartphone/persist", ["etc/freesmartphone/persist/README"]), ++ ("share/doc/freesmartphone/examples/", getDir( "examples" ) ), + ] + ) diff --git a/sys-mobilephone/freesmartphone-framework/freesmartphone-framework-0.3.ebuild b/sys-mobilephone/freesmartphone-framework/freesmartphone-framework-0.3.ebuild new file mode 100644 index 0000000..517eb2e --- /dev/null +++ b/sys-mobilephone/freesmartphone-framework/freesmartphone-framework-0.3.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit distutils +inherit git + +DESCRIPTION="The FreeSmartPhone.org framework APIs." +HOMEPAGE="http://www.freesmartphone.org/" + +EGIT_REPO_URI="git://git.freesmartphone.org/framework.git" +EGIT_TREE="tags/milestone3" +EGIT_PROJECT="framework" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~arm" +IUSE="gsm gps" +DOCS="README" + +RDEPEND="dev-python/dbus-python + dev-python/pygobject + dev-python/pyyaml + dev-python/pyserial + gsm? ( sys-mobilephone/gsm0710muxd ) + gps? ( sci-geosciences/gpsd )" +DEPEND="dev-python/cython + dev-python/setuptools" + +src_unpack() { + # Fetch and unpack current git sources + git_src_unpack + + cd "${S}" + + # Change the paths for setup.py and add the example config file + epatch "${FILESDIR}/${P}-setup-paths.patch" +} + +src_install() { + distutils_src_install + newinitd "${FILESDIR}/frameworkd" frameworkd +} + +pkg_postinst() { + einfo "An example configuration file was installed to /etc/frameworkd.conf," + einfo "please modify this configuration file to your needs!" +} diff --git a/sys-mobilephone/freesmartphone-framework/freesmartphone-framework-0.4.ebuild b/sys-mobilephone/freesmartphone-framework/freesmartphone-framework-0.4.ebuild new file mode 100644 index 0000000..39b7571 --- /dev/null +++ b/sys-mobilephone/freesmartphone-framework/freesmartphone-framework-0.4.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit distutils +inherit git + +DESCRIPTION="The FreeSmartPhone.org framework APIs." +HOMEPAGE="http://www.freesmartphone.org/" + +EGIT_REPO_URI="git://git.freesmartphone.org/framework.git" +EGIT_TREE="tags/milestone4" +EGIT_PROJECT="framework" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~arm" +IUSE="gsm gps readline" +DOCS="README" + +RDEPEND="dev-python/dbus-python + dev-python/gst-python + dev-python/pygobject + dev-python/pyyaml + dev-python/pyserial + virtual/alsa-scenarios + gsm? ( sys-mobilephone/gsm0710muxd ) + gps? ( sci-geosciences/gpsd ) + readline? ( sys-libs/readline )" +DEPEND="dev-python/cython + dev-python/setuptools" + +src_unpack() { + # Fetch and unpack current git sources + git_src_unpack + + cd "${S}" + + # Change the paths for setup.py and add the example config file + epatch "${FILESDIR}/${P}-setup-paths.patch" +} + +src_install() { + distutils_src_install + newinitd "${FILESDIR}/frameworkd" frameworkd +} + +pkg_postinst() { + einfo "An example configuration file was installed to /etc/frameworkd.conf," + einfo "please modify this configuration file to your needs!" +} diff --git a/sys-mobilephone/gsm0710muxd/Manifest b/sys-mobilephone/gsm0710muxd/Manifest new file mode 100644 index 0000000..7a090aa --- /dev/null +++ b/sys-mobilephone/gsm0710muxd/Manifest @@ -0,0 +1,5 @@ +AUX 99-gsm0710muxd.rules 49 RMD160 7f1900c0c94685858e5c65c33e39a8b95788d698 SHA1 450c0599fecc3275b9c0a781f92e0a53d0247d22 SHA256 82829fbc757180d4b10e381d2bf7fd03f97f7dea85f0842e96140db88cc1b3d6 +AUX gsm0710muxd 621 RMD160 51769673e78098dbcac1e45754b931eec4cb7701 SHA1 1d83bcaf8c973254b5df4d9adfaf040c907208a5 SHA256 a190bd660deec3339bcb78814b38bda6bcd40f2f813d66d31822f379ec1bcd57 +DIST gsm0710muxd-0.9.2.tar.gz 104605 RMD160 ad32e107e04d8e4cb4f81d3d7ee8465edae0dedd SHA1 a0ac7d1679ab9797d8f2981aa0f531953de0610e SHA256 a9aae22ae92614f7d67421e4d7b83242d644d997554b10faf7632b11f9e2c34e +EBUILD gsm0710muxd-0.9.2.ebuild 890 RMD160 4731b60c8148f5d85c1154d1f0c9711c63466b44 SHA1 3bacd9e32e5e1e9348b758020e8de4eae90f93e2 SHA256 5e13682fc9705ac8b4a8b77720c38d41232559029c8952020ad6840f07f943bc +EBUILD gsm0710muxd-20090109.ebuild 1047 RMD160 190051f231b8191a6e0dc5f6a9103c773785f81a SHA1 f337409a681b6e0d19221ca5e3acfb9015130fd3 SHA256 171147c0aaa81e31e8ba8f0322e1e96ca901ed94f4359715cf2dc52ba56eaf1b diff --git a/sys-mobilephone/gsm0710muxd/files/99-gsm0710muxd.rules b/sys-mobilephone/gsm0710muxd/files/99-gsm0710muxd.rules new file mode 100644 index 0000000..155caa9 --- /dev/null +++ b/sys-mobilephone/gsm0710muxd/files/99-gsm0710muxd.rules @@ -0,0 +1 @@ +KERNEL=="s3c2410_serial[0-9]", NAME="ttySAC%n" diff --git a/sys-mobilephone/gsm0710muxd/files/gsm0710muxd b/sys-mobilephone/gsm0710muxd/files/gsm0710muxd new file mode 100755 index 0000000..9bc5d0e --- /dev/null +++ b/sys-mobilephone/gsm0710muxd/files/gsm0710muxd @@ -0,0 +1,25 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later + +depend() { + need dbus +} + +GSMMUXD_BINARY=${GSMMUXD_BINARY:-/usr/sbin/gsm0710muxd} +GSMMUXD_PIDFILE=${GSMMUXD_PIDFILE:-/var/run/${SVCNAME}.pid} + +start() { + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --background --make-pidfile \ + --pidfile ${GSMMUXD_PIDFILE} \ + --exec ${GSMMUXD_BINARY} \ + -- -x /sys/bus/platform/devices/neo1973-pm-gsm.0 -f 100 + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --pidfile ${GSMMUXD_PIDFILE} + eend $? +} diff --git a/sys-mobilephone/gsm0710muxd/gsm0710muxd-0.9.2.ebuild b/sys-mobilephone/gsm0710muxd/gsm0710muxd-0.9.2.ebuild new file mode 100644 index 0000000..eb61db4 --- /dev/null +++ b/sys-mobilephone/gsm0710muxd/gsm0710muxd-0.9.2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="The FreeSmartPhone.org GSM multiplexer" +HOMEPAGE="http://www.freesmartphone.org" +SRC_URI="http://www.freesmartphone.org/sources/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm" +IUSE="" + +RDEPEND=">=dev-libs/glib-2.10 + dev-libs/dbus-glib" +DEPEND="" + +src_install() { + cd "${S}" + + emake DESTDIR="${D}" install || die + + # Install the start/stop scripts and the udev rules for the package (adapted from torindel) + newinitd "${FILESDIR}"/gsm0710muxd gsm0710muxd + install -D -m 644 "${FILESDIR}"/99-gsm0710muxd.rules "${D}/etc/udev/rules.d/99-gsm0710muxd.rules" +} + +pkg_postinst() { + elog "To start the GSM multiplexer by default" + elog "you should add it to the default runlevel:" + elog "\`rc-update add gsm0710muxd default\`" +} diff --git a/sys-mobilephone/gsm0710muxd/gsm0710muxd-20090109.ebuild b/sys-mobilephone/gsm0710muxd/gsm0710muxd-20090109.ebuild new file mode 100644 index 0000000..089404e --- /dev/null +++ b/sys-mobilephone/gsm0710muxd/gsm0710muxd-20090109.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit autotools +inherit git + +DESCRIPTION="The FreeSmartPhone.org GSM multiplexer" +HOMEPAGE="http://www.freesmartphone.org" + +EGIT_REPO_URI="git://git.freesmartphone.org/gsm0710muxd.git" +EGIT_PROJECT="framework" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm" +IUSE="" + +RDEPEND=">=dev-libs/glib-2.10 + dev-libs/dbus-glib" +DEPEND="" + +src_unpack() { + # Fetch and unpack current git sources + git_src_unpack + + cd "${S}" + eautoreconf +} + +src_install() { + cd "${S}" + + emake DESTDIR="${D}" install || die + + # Install the start/stop scripts and the udev rules for the package (adapted from torindel) + newinitd "${FILESDIR}"/gsm0710muxd gsm0710muxd + install -D -m 644 "${FILESDIR}"/99-gsm0710muxd.rules "${D}/etc/udev/rules.d/99-gsm0710muxd.rules" +} + +pkg_postinst() { + elog "To start the GSM multiplexer by default" + elog "you should add it to the default runlevel:" + elog "\`rc-update add gsm0710muxd default\`" +} diff --git a/sys-mobilephone/libframeworkd-glib/Manifest b/sys-mobilephone/libframeworkd-glib/Manifest new file mode 100644 index 0000000..2aa0d14 --- /dev/null +++ b/sys-mobilephone/libframeworkd-glib/Manifest @@ -0,0 +1 @@ +EBUILD libframeworkd-glib-0.1.ebuild 778 RMD160 10ab12d9bb3ee1f930af847d2fbb9c9427df8814 SHA1 8e3e076de33f03e0759d40709195d58006411f46 SHA256 ba4aa73abf073e82e2c1e6a0205863ac2f727e35914a4208f66af047ccc65b3c diff --git a/sys-mobilephone/libframeworkd-glib/libframeworkd-glib-0.1.ebuild b/sys-mobilephone/libframeworkd-glib/libframeworkd-glib-0.1.ebuild new file mode 100644 index 0000000..9655552 --- /dev/null +++ b/sys-mobilephone/libframeworkd-glib/libframeworkd-glib-0.1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit git autotools + +DESCRIPTION="Glib bindings for Freesmarphone Framework APIs." +HOMEPAGE="http://www.freesmartphone.org/" + +EGIT_REPO_URI="git://git.freesmartphone.org/libframeworkd-glib.git" +EGIT_TREE="2ffa862179bded1d98ca81c08efa55b8aeed8d4d" +EGIT_PROJECT="libframeworkd-glib" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~arm" +IUSE="" +DOCS="README" + +RDEPEND="${DEPEND}" +DEPEND="dev-libs/dbus-glib" + +src_unpack() { + # Fetch and unpack current git sources + git_src_unpack + eautoreconf || die "autoreconf failed" + glib-gettextize --force --copy || die "glib-gettextize failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake failed" +} diff --git a/x11-base/xglamo/Manifest b/x11-base/xglamo/Manifest new file mode 100644 index 0000000..67ed743 --- /dev/null +++ b/x11-base/xglamo/Manifest @@ -0,0 +1,9 @@ +AUX xglamo-20081205/Xsession 468 RMD160 a34e8c739de6407a558fc0f1a72b08670884ebe1 SHA1 d58f7ba3f45dea60e726b8d6014c7f751b1c5ff2 SHA256 3f5e7c1df382f294bf227ead2109c135aa4a0f65856abef22d1947fcf01c3a2a +AUX xglamo-20081205/Xwindowmanager 144 RMD160 a3964f705635b1a82fc83cb63587c738c7b59c88 SHA1 b70cc5598ac00c740913fa26bfa39e7d1f00f628 SHA256 777d5197b421ca06a1ae4845bd2165b2e78f505faa88183d0fda86b03511b006 +AUX xglamo-20081205/xserver-nodm 856 RMD160 87bcda36069294ebaebb2e993533c617d96d33f8 SHA1 dce92ab6f9d9eb3bc8446e92d16993566d83bb27 SHA256 856cf4a06688c9b8af81c286edbcaba7f19a4e809f15584433ea44a45a412b09 +AUX xglamo-configure.patch 389 RMD160 b91dc85767bd4c301139f46a3b98cf7126c928b3 SHA1 b6ee4cf8eaa75a1d6d895a6f7dfe2a025c15263c SHA256 7d48f3ab345b0002bea1521a38fe113ffa9a695f2d0dacdef944cfcabaad7dd6 +AUX xglamo-no-pdfdoc.patch 397 RMD160 f59a8d6a052565917cb08551fb160dc73c2da2c7 SHA1 dbd48be531eb930dbf3df576074551016ee6bf53 SHA256 7d0b6e2df2909c4509549cdd914f50654ad3875032b36090fb009a5f4db4699f +AUX xserver-nodm 1068 RMD160 9ba60ec709bb6eef304e0405e1cc57f4dd432cb9 SHA1 d5ce6b05a4839319a4e37a3388502573d6b720d9 SHA256 cf3e8d7da6afb241233e924978d3970ff82ed9ef7b304259bf25d0f1928c119e +EBUILD xglamo-20080807.ebuild 3317 RMD160 65a7cac591936fd1065c13bd86c1673c3b5b3909 SHA1 3c902f655fe7527fcfc100ee78db27d565fe4c6b SHA256 9c1ee39d6ad6979061b6a371f7f0d0974a53698e393bc92fc7dc970c481c1c12 +EBUILD xglamo-20081205-r1.ebuild 3442 RMD160 c87183440bc2c5c3b290ef8319c1a4104fbdfd11 SHA1 5878db7c5d254edb89d867999f6b931792623ccb SHA256 064c186cb6fed905664846e695c9fb160a8b9110350445a682190b164e4d687c +EBUILD xglamo-20081205.ebuild 3557 RMD160 c60c45458ca7fdd1f0b65cf57bad82d2a7d595d8 SHA1 b25bebd7bbd72386da165465b1aa0f247dcb5643 SHA256 f2bf5eb9fe1ffd9ec1bb184facd695885acbd81eb816695418e4fd3a6aa230ce diff --git a/x11-base/xglamo/files/xglamo-20081205/Xsession b/x11-base/xglamo/files/xglamo-20081205/Xsession new file mode 100755 index 0000000..654c3c3 --- /dev/null +++ b/x11-base/xglamo/files/xglamo-20081205/Xsession @@ -0,0 +1,22 @@ +#!/bin/sh + +if [ -f /usr/bin/dbus-launch ]; then + ## test for an existing bus daemon, just to be safe + if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then + ## if not found, launch a new one + eval `dbus-launch --auto-syntax --exit-with-session` + echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS" + fi +fi + +. /etc/profile + +if [ -f $HOME/.profile ]; then + . $HOME/.profile +fi + +SYSSESSIONDIR=/etc/X11/Xsession.d + +run-parts $SYSSESSIONDIR + +exit 0 diff --git a/x11-base/xglamo/files/xglamo-20081205/Xwindowmanager b/x11-base/xglamo/files/xglamo-20081205/Xwindowmanager new file mode 100755 index 0000000..306e192 --- /dev/null +++ b/x11-base/xglamo/files/xglamo-20081205/Xwindowmanager @@ -0,0 +1,8 @@ +#!/bin/sh +if [ -x $HOME/.Xsession ]; then + exec $HOME/.Xsession +else + exec /usr/bin/x-window-manager > /var/log/enlightment.log 2>&1 +fi + + diff --git a/x11-base/xglamo/files/xglamo-20081205/xserver-nodm b/x11-base/xglamo/files/xglamo-20081205/xserver-nodm new file mode 100755 index 0000000..777d422 --- /dev/null +++ b/x11-base/xglamo/files/xglamo-20081205/xserver-nodm @@ -0,0 +1,34 @@ +#!/sbin/runscript + +# This is the starting script for starting X server for Openmoko GTA02 + +# Start X Font Server before X +depend() { + need localmount + + after bootmisc consolefont modules netmount + after readahead-list ypbind autofs openvpn gpm lircmd + before alsasound + + # Start before X + use acpid consolekit hald xfs +} + +XSERVER_BINARY="/usr/bin/xinit" +XSERVER_ARGS="/etc/X11/Xsession -- /usr/bin/Xglamo :0 -br -pn -dpi 285 -screen 480x640x16 -mouse tslib -hide-cursor vt1" +XSERVER_PIDFILE=${XSERVER_PIDFILE:-/var/run/${SVCNAME}.pid} + +start() { + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --background --make-pidfile \ + --pidfile "${XSERVER_PIDFILE}" \ + --exec ${XSERVER_BINARY} -- ${XSERVER_ARGS} + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet --pidfile "${XSERVER_PIDFILE}" + eend $? +} + diff --git a/x11-base/xglamo/files/xglamo-configure.patch b/x11-base/xglamo/files/xglamo-configure.patch new file mode 100644 index 0000000..e3e5824 --- /dev/null +++ b/x11-base/xglamo/files/xglamo-configure.patch @@ -0,0 +1,13 @@ +--- configure.ac.orig 2008-10-07 16:23:52.000000000 +0200 ++++ configure.ac 2008-10-07 16:24:46.000000000 +0200 +@@ -1690,7 +1690,9 @@ + DIX_CFLAGS="-DHAVE_DIX_CONFIG_H" + AC_SUBST([DIX_CFLAGS]) + +-AC_SUBST([libdir exec_prefix prefix]) ++AC_SUBST([libdir]) ++AC_SUBST([exec_prefix]) ++AC_SUBST([prefix]) + + # Man page sections - used in config utils & generating man pages + XORG_MANPAGE_SECTIONS diff --git a/x11-base/xglamo/files/xglamo-no-pdfdoc.patch b/x11-base/xglamo/files/xglamo-no-pdfdoc.patch new file mode 100644 index 0000000..884c465 --- /dev/null +++ b/x11-base/xglamo/files/xglamo-no-pdfdoc.patch @@ -0,0 +1,10 @@ +--- configure.ac 2008-08-07 11:43:13.000000000 +0200 ++++ configure.ac.new 2008-09-13 00:28:56.000000000 +0200 +@@ -509,6 +509,7 @@ + dnl Only build sgml docs when linuxdoc is available and + dnl def.ents has been installed + XORG_CHECK_LINUXDOC ++AM_CONDITIONAL(BUILD_PDFDOC, false) + + dnl Handle installing libxf86config + AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes]) diff --git a/x11-base/xglamo/files/xserver-nodm b/x11-base/xglamo/files/xserver-nodm new file mode 100755 index 0000000..b7f271a --- /dev/null +++ b/x11-base/xglamo/files/xserver-nodm @@ -0,0 +1,40 @@ +#!/sbin/runscript + +# This is the starting script for starting X without a display manager. It adapts +# the Gentoo xdm runscript. + +# Start X Font Server before X +depend() { + need localmount + + # this should start as early as possible + # we can't do 'before *' as that breaks it + # (#139824) Start after ypbind and autofs for network authentication + # (#145219 #180163) Could use lirc mouse as input device + # (#70689 comment #92) Start after consolefont to avoid display corruption + after bootmisc consolefont modules netmount + after readahead-list ypbind autofs openvpn gpm lircmd + before alsasound + + # Start before X + use acpid consolekit hald xfs +} + +XSERVER_BINARY=${XSERVER_BINARY:-/etc/X11/Xserver} +XSERVER_PIDFILE=${XSERVER_PIDFILE:-/var/run/${SVCNAME}.pid} + +start() { + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --background --make-pidfile \ + --pidfile "${XSERVER_PIDFILE}" \ + --exec "${XSERVER_BINARY}" \ + + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet --pidfile "${XSERVER_PIDFILE}" + eend $? +} + diff --git a/x11-base/xglamo/xglamo-20080807.ebuild b/x11-base/xglamo/xglamo-20080807.ebuild new file mode 100644 index 0000000..92ea631 --- /dev/null +++ b/x11-base/xglamo/xglamo-20080807.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit autotools git toolchain-funcs + +DESCRIPTION="X server for the Openmoko Freerunner's smedia glamo GPU" +HOMEPAGE="http://www.openmoko.org/" + +MY_P="xglamo" + +SRC_URI="" +EGIT_REPO_URI="git://git.openmoko.org/git/${MY_P}.git" +EGIT_BRANCH="master" +EGIT_TREE="4067470ea4d569bae7b4161ca998645a0c9b96e7" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm ~x86 ~amd64" + +IUSE_INPUT_DEVICES="input_devices_tslib" +IUSE="dga doc dri kdrive sdl truetype xcomposite xinerama xprint xscreensaver xv + ${IUSE_INPUT_DEVICES}" +DOCS="" + +RDEPEND="input_devices_tslib? ( >=x11-libs/tslib-1.0 ) + x11-libs/xtrans + x11-libs/libxkbfile + x11-libs/libXfont + x11-libs/libXau + x11-libs/libfontenc + >=x11-proto/randrproto-1.2 + x11-proto/renderproto + >=x11-proto/fixesproto-4.0 + >=x11-proto/damageproto-1.1 + x11-proto/xcmiscproto + x11-proto/xextproto + x11-proto/xproto + x11-proto/xf86miscproto + x11-proto/xf86vidmodeproto + x11-proto/xf86bigfontproto + >=x11-proto/scrnsaverproto-1.1 + x11-proto/bigreqsproto + x11-proto/resourceproto + x11-proto/fontsproto + x11-proto/inputproto + x11-proto/xf86dgaproto + >=x11-proto/kbproto-1.0.3 + x11-proto/trapproto + x11-proto/recordproto + x11-proto/evieext + x11-proto/xineramaproto + x11-proto/videoproto + x11-apps/xinit + kdrive? ( sdl? ( media-libs/libsdl ) )" +DEPEND="" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + # Fetch and unpack current git sources + git_src_unpack + + if ! use doc; then + # Make sure we don't build a pdf documentation + epatch "${FILESDIR}"/xglamo-no-pdfdoc.patch + fi + + if tc-is-cross-compiler; then + epatch "${FILESDIR}"/xglamo-configure.patch + fi + + # reconfigure the autoconf stuff + eautoreconf --install || die "autoreconf failed" +} + +src_compile() { + local myconf + + # See the complete list at the end of this file + myconf="$(use_enable doc builddocs) \ + $(use_enable xcomposite composite) \ + $(use_enable xv) \ + $(use_enable dga) \ + $(use_enable xscreensaver screensaver) \ + $(use_enable dri) \ + $(use_enable xinerama) \ + $(use_enable input_devices_tslib tslib) \ + $(use_enable xprint) \ + $(use_enable kdrive) \ + $(use_enable truetype freetype) \ + --disable-xorgcfg \ + --disable-xfree86-utils \ + --disable-kbd_mode \ + --enable-install-setuid \ + --sysconfdir=/etc/X11 \ + --localstatedir=/var \ + --with-fontdir=/usr/share/fonts \ + --with-xkb-output=/var/lib/xkb" + + # SDL only available in kdrive build + if use kdrive && use sdl; then + myconf="${myconf} --enable-xsdl" + else + myconf="${myconf} --disable-xsdl" + fi + + econf ${myconf} || die "configuration failed" + emake || die "Make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + newinitd "${FILESDIR}/xserver-nodm" xserver-nodm + dodoc AUTHORS NEWS README +} diff --git a/x11-base/xglamo/xglamo-20081205-r1.ebuild b/x11-base/xglamo/xglamo-20081205-r1.ebuild new file mode 100644 index 0000000..ab99927 --- /dev/null +++ b/x11-base/xglamo/xglamo-20081205-r1.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit autotools git toolchain-funcs + +DESCRIPTION="X server for the Openmoko Freerunner's smedia glamo GPU" +HOMEPAGE="http://www.openmoko.org/" + +MY_P="xglamo" + +SRC_URI="" +EGIT_REPO_URI="git://git.openmoko.org/git/${MY_P}.git" +EGIT_BRANCH="master" +EGIT_TREE="a8f2c29efb2043a539f21d6ab40f17c3302ea463" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm ~x86 ~amd64" + +IUSE="dga doc dri sdl truetype xcomposite xinerama xprint xscreensaver xv + ${IUSE_INPUT_DEVICES}" +DOCS="" + +RDEPEND=">=x11-libs/tslib-1.0 + sys-apps/debianutils + x11-libs/xtrans + x11-libs/libxkbfile + x11-libs/libXfont + x11-libs/libXau + x11-libs/libfontenc + >=x11-proto/randrproto-1.2 + x11-proto/renderproto + >=x11-proto/fixesproto-4.0 + >=x11-proto/damageproto-1.1 + x11-proto/xcmiscproto + x11-proto/xextproto + x11-proto/xproto + x11-proto/xf86miscproto + x11-proto/xf86vidmodeproto + x11-proto/xf86bigfontproto + >=x11-proto/scrnsaverproto-1.1 + x11-proto/bigreqsproto + x11-proto/resourceproto + x11-proto/fontsproto + x11-proto/inputproto + x11-proto/xf86dgaproto + >=x11-proto/kbproto-1.0.3 + x11-proto/trapproto + x11-proto/recordproto + x11-proto/evieext + x11-proto/xineramaproto + x11-proto/videoproto + x11-apps/xinit + sdl? ( media-libs/libsdl )" +DEPEND="" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + # Fetch and unpack current git sources + git_src_unpack + + if ! use doc; then + # Make sure we don't build a pdf documentation + epatch "${FILESDIR}"/xglamo-no-pdfdoc.patch + fi + + if tc-is-cross-compiler; then + epatch "${FILESDIR}"/xglamo-configure.patch + fi + + # reconfigure the autoconf stuff + eautoreconf --install || die "autoreconf failed" +} + +src_compile() { + local myconf + + # See the complete list at the end of this file + myconf="$(use_enable doc builddocs) \ + $(use_enable xcomposite composite) \ + $(use_enable xv) \ + $(use_enable dga) \ + $(use_enable xscreensaver screensaver) \ + $(use_enable dri) \ + $(use_enable xinerama) \ + $(use_enable xprint) \ + $(use_enable truetype freetype) \ + --disable-xorgcfg \ + --disable-xfree86-utils \ + --disable-kbd_mode \ + --enable-install-setuid \ + --enable-tslib \ + --enable-kdrive \ + --sysconfdir=/etc/X11 \ + --localstatedir=/var \ + --with-fontdir=/usr/share/fonts \ + --with-xkb-output=/var/lib/xkb" + + econf ${myconf} || die "configuration failed" + emake || die "Make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + + # Create a symlink to enlightenment as the default wm if no + # display manager is installed. + cd ${D}/usr/bin + ln -s enlightenment_start x-window-manager + + # Create a init script for the case we want + # to start without display manager. + newinitd "${FILESDIR}/${P}/xserver-nodm" xserver-nodm + insinto /etc/X11 + newins "${FILESDIR}/${P}/Xsession" Xsession + keepdir /etc/X11/Xsession.d + insinto /etc/X11/Xsession.d + newins "${FILESDIR}/${P}/Xwindowmanager" Xwindowmanager + +} diff --git a/x11-base/xglamo/xglamo-20081205.ebuild b/x11-base/xglamo/xglamo-20081205.ebuild new file mode 100644 index 0000000..a26bebd --- /dev/null +++ b/x11-base/xglamo/xglamo-20081205.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit autotools git toolchain-funcs + +DESCRIPTION="X server for the Openmoko Freerunner's smedia glamo GPU" +HOMEPAGE="http://www.openmoko.org/" + +MY_P="xglamo" + +SRC_URI="" +EGIT_REPO_URI="git://git.openmoko.org/git/${MY_P}.git" +EGIT_BRANCH="master" +EGIT_TREE="a8f2c29efb2043a539f21d6ab40f17c3302ea463" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm ~x86 ~amd64" + +IUSE_INPUT_DEVICES="input_devices_tslib" +IUSE="dga doc dri kdrive sdl truetype xcomposite xinerama xprint xscreensaver xv + ${IUSE_INPUT_DEVICES}" +DOCS="" + +RDEPEND="input_devices_tslib? ( >=x11-libs/tslib-1.0 ) + x11-libs/xtrans + x11-libs/libxkbfile + x11-libs/libXfont + x11-libs/libXau + x11-libs/libfontenc + >=x11-proto/randrproto-1.2 + x11-proto/renderproto + >=x11-proto/fixesproto-4.0 + >=x11-proto/damageproto-1.1 + x11-proto/xcmiscproto + x11-proto/xextproto + x11-proto/xproto + x11-proto/xf86miscproto + x11-proto/xf86vidmodeproto + x11-proto/xf86bigfontproto + >=x11-proto/scrnsaverproto-1.1 + x11-proto/bigreqsproto + x11-proto/resourceproto + x11-proto/fontsproto + x11-proto/inputproto + x11-proto/xf86dgaproto + >=x11-proto/kbproto-1.0.3 + x11-proto/trapproto + x11-proto/recordproto + x11-proto/evieext + x11-proto/xineramaproto + x11-proto/videoproto + x11-apps/xinit + kdrive? ( sdl? ( media-libs/libsdl ) )" +DEPEND="" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + # Fetch and unpack current git sources + git_src_unpack + + if ! use doc; then + # Make sure we don't build a pdf documentation + epatch "${FILESDIR}"/xglamo-no-pdfdoc.patch + fi + + if tc-is-cross-compiler; then + epatch "${FILESDIR}"/xglamo-configure.patch + fi + + # reconfigure the autoconf stuff + eautoreconf --install || die "autoreconf failed" +} + +src_compile() { + local myconf + + # See the complete list at the end of this file + myconf="$(use_enable doc builddocs) \ + $(use_enable xcomposite composite) \ + $(use_enable xv) \ + $(use_enable dga) \ + $(use_enable xscreensaver screensaver) \ + $(use_enable dri) \ + $(use_enable xinerama) \ + $(use_enable input_devices_tslib tslib) \ + $(use_enable xprint) \ + $(use_enable kdrive) \ + $(use_enable truetype freetype) \ + --disable-xorgcfg \ + --disable-xfree86-utils \ + --disable-kbd_mode \ + --enable-install-setuid \ + --sysconfdir=/etc/X11 \ + --localstatedir=/var \ + --with-fontdir=/usr/share/fonts \ + --with-xkb-output=/var/lib/xkb" + + # SDL only available in kdrive build + if use kdrive && use sdl; then + myconf="${myconf} --enable-xsdl" + else + myconf="${myconf} --disable-xsdl" + fi + + econf ${myconf} || die "configuration failed" + emake || die "Make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + + # Create a symlink to enlightenment as the default wm if no + # display manager is installed. + cd ${D}/usr/bin + ln -s enlightenment_start x-window-manager + + # Create a init script for the case we want + # to start without display manager. + newinitd "${FILESDIR}/xserver-nodm" xserver-nodm + + dodoc AUTHORS NEWS README +} diff --git a/x11-libs/e_dbus/Manifest b/x11-libs/e_dbus/Manifest new file mode 100644 index 0000000..35b1c9d --- /dev/null +++ b/x11-libs/e_dbus/Manifest @@ -0,0 +1,5 @@ +AUX e_dbus-0.5.0.050-e_notify_send-Makefile.patch 566 RMD160 a16d9b3c30468ebe6ea5c389f95cfc5a62657ba1 SHA1 da6799956de2c0a477a0435c9ed551f0fe5b3f0c SHA256 b36435962b294cb3146b930bc7da46844f2641f437b62d133762c94e02a16c77 +DIST e_dbus-0.5.0.050.tar.bz2 240402 RMD160 a8709338da65aa9a8422a8f550f5e1a125f2fdca SHA1 4780cb3ce37cd3be6fe86af901db1215bda15c4b SHA256 7008c8f6e009b165108afc59319442eb98d6506409d9c4f11c31dac6cbcc06df +EBUILD e_dbus-0.5.0.050.ebuild 1028 RMD160 afeb8a93d7986dc65e837d5ac78ca320204bf826 SHA1 b05a6cf9f0434ae7928a8139721c2e4a35e8df4a SHA256 0e96b2e78a9270813b0ae1949a4908af7b6c9afaa3ee22dc504c4a8f4ebe434a +EBUILD e_dbus-20081209.ebuild 921 RMD160 f394ea92cae0a62386ed7cece49aec444aca2341 SHA1 a9176f5fac47d98d141fa52778a8271039f37b44 SHA256 41ea502e3c36d857622cf7e07dae39802048241d1250761ba8e013c632f218f5 +EBUILD e_dbus-20090108.ebuild 921 RMD160 66702c01ce27ef321a94f0857f0e09d05c61aa22 SHA1 5ab0fb167b0f7eef1194d5362ce723f00c8d0306 SHA256 ad94ea4e3905c0ae00e4b68f3007cd244554fcf936bca36d3b085c6cecd678a7 diff --git a/x11-libs/e_dbus/e_dbus-0.5.0.050.ebuild b/x11-libs/e_dbus/e_dbus-0.5.0.050.ebuild new file mode 100644 index 0000000..376fbf0 --- /dev/null +++ b/x11-libs/e_dbus/e_dbus-0.5.0.050.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="The Enlightenment dbus binding library." +HOMEPAGE="http://enlightenment.org" +SRC_URI="http://download.enlightenment.org/snapshots/2008-09-25/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm ~x86 ~amd64" +IUSE="hal" + +inherit autotools + +RDEPEND="" +DEPEND=">=dev-util/pkgconfig-0.9.0" + +src_unpack() { + # Fetch and unpack the source files + unpack ${A} + + cd "${S}" + + # Fix missing LD flag to libedus in src/bin/Makefile.am + epatch "${FILESDIR}/${P}-e_notify_send-Makefile.patch" + + # We have to renew the automake/autoconf scripts because we + # modified the Makefile.am above. + eautoreconf || die "autoreconf failed" +} + +src_compile() { + local myconf + + myconf="${myconf} + $(use_enable hal ehal)" + + econf ${myconf} || die "Configuration failed" + emake || die "Make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + dodoc AUTHORS NEWS README +} diff --git a/x11-libs/e_dbus/e_dbus-20081209.ebuild b/x11-libs/e_dbus/e_dbus-20081209.ebuild new file mode 100644 index 0000000..d9f849d --- /dev/null +++ b/x11-libs/e_dbus/e_dbus-20081209.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="The Enlightenment dbus binding library." +HOMEPAGE="http://enlightenment.org" +ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/${PN}" +ESVN_REVISION="r38061" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm ~x86 ~amd64" +IUSE="hal" + +inherit autotools subversion + +RDEPEND=">=dev-libs/eina-20081211 + >=sys-apps/dbus-1.2.1 + >=x11-libs/ecore-20081212" +DEPEND=">=dev-util/pkgconfig-0.9.0" + +src_unpack() { + # Fetch and unpack the source files + subversion_src_unpack + + cd "${S}" + + eautoreconf || die "autoreconf failed" +} + +src_compile() { + local myconf + + myconf="${myconf} + $(use_enable hal ehal)" + + econf ${myconf} || die "Configuration failed" + emake || die "Make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + dodoc AUTHORS NEWS README +} diff --git a/x11-libs/e_dbus/e_dbus-20090108.ebuild b/x11-libs/e_dbus/e_dbus-20090108.ebuild new file mode 100644 index 0000000..6c006e3 --- /dev/null +++ b/x11-libs/e_dbus/e_dbus-20090108.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="The Enlightenment dbus binding library." +HOMEPAGE="http://enlightenment.org" +ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/${PN}" +ESVN_REVISION="r38500" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm ~x86 ~amd64" +IUSE="hal" + +inherit autotools subversion + +RDEPEND=">=dev-libs/eina-20090108 + >=sys-apps/dbus-1.2.1 + >=x11-libs/ecore-20090108" +DEPEND=">=dev-util/pkgconfig-0.9.0" + +src_unpack() { + # Fetch and unpack the source files + subversion_src_unpack + + cd "${S}" + + eautoreconf || die "autoreconf failed" +} + +src_compile() { + local myconf + + myconf="${myconf} + $(use_enable hal ehal)" + + econf ${myconf} || die "Configuration failed" + emake || die "Make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + dodoc AUTHORS NEWS README +} diff --git a/x11-libs/e_dbus/files/e_dbus-0.5.0.050-e_notify_send-Makefile.patch b/x11-libs/e_dbus/files/e_dbus-0.5.0.050-e_notify_send-Makefile.patch new file mode 100644 index 0000000..2c17fdf --- /dev/null +++ b/x11-libs/e_dbus/files/e_dbus-0.5.0.050-e_notify_send-Makefile.patch @@ -0,0 +1,12 @@ +Add missing reference to libedbus to make e-notify-send compile. + +--- src/bin/Makefile.am 2008-08-17 09:42:43.000000000 +0200 ++++ src/bin/Makefile.am.new 2008-10-25 21:43:55.000000000 +0200 +@@ -90,6 +90,6 @@ + notify-send.c + + e_notify_send_CPPFLAGS = $(EDBUS_CPPFLAGS) +-e_notify_send_LDADD = $(top_builddir)/src/lib/notification/libenotify.la $(LIBS) ++e_notify_send_LDADD = $(top_builddir)/src/lib/dbus/libedbus.la $(top_builddir)/src/lib/notification/libenotify.la $(LIBS) + e_notify_send_DEPENDENCIES = $(top_builddir)/src/lib/notification/libenotify.la + endif diff --git a/x11-libs/ecore/Manifest b/x11-libs/ecore/Manifest index ecdcd19..ec7dde2 100644 --- a/x11-libs/ecore/Manifest +++ b/x11-libs/ecore/Manifest @@ -1,2 +1,4 @@ DIST ecore-0.9.9.050.tar.bz2 10412842 RMD160 f6e25f96fad4e6ab81c119162384ba6780d83c4a SHA1 8d63e2e7c8eed83e3cee1360ef3e4520003d21dd SHA256 66380d748e4fc8d9763a1cadc5438ba95febbf3dc98105828b9795f3db687095 -EBUILD ecore-0.9.9.050.ebuild 2405 RMD160 cb4234d056ea6cd31f8c8e1b714ca08defde1a7e SHA1 8887413268987f800af7b8a0175e2bbad107c1b8 SHA256 1e8eaf8351dde4f9e9359c979c6e71eb5033bebad9b4d6431b104ccb5bf6131b +EBUILD ecore-0.9.9.050.ebuild 2400 RMD160 c4c922e8360e32802a4634f757ce03f057850f98 SHA1 5087613b11584ca1ac1264f3b8611acf5a18706c SHA256 b6757bb0d6f68b723a524fd8627e7555f1c88ee657a23f1a8a9dfdddd35ea93d +EBUILD ecore-20081212.ebuild 2593 RMD160 887879fa21533d0e22d1bc07e24aa276901b135a SHA1 1474379ffce5c9742b8ffe5f8352b82a73c12f0d SHA256 32a555f3f1c30846645906002223ad5109124a4fac5a156618c1864e56b836d9 +EBUILD ecore-20090108.ebuild 2593 RMD160 128b0d04e04010fd64d1c18f60c5feebe3834ece SHA1 0e0439ca31d305871ccc84b1d8afba0d53b74fa2 SHA256 7363192dd3e1f037bf44d18bac9eedd238d74ec4e7a5e85272d4d3bd1c59f6c9 diff --git a/x11-libs/ecore/ecore-0.9.9.050.ebuild b/x11-libs/ecore/ecore-0.9.9.050.ebuild index 88116dc..bd02841 100644 --- a/x11-libs/ecore/ecore-0.9.9.050.ebuild +++ b/x11-libs/ecore/ecore-0.9.9.050.ebuild @@ -2,6 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ +inherit toolchain-funcs autotools + DESCRIPTION="The Enlightenment ecore library." HOMEPAGE="http://enlightenment.org" SRC_URI="http://download.enlightenment.org/snapshots/2008-09-25/${P}.tar.bz2" @@ -11,7 +13,8 @@ SLOT="0" KEYWORDS="~arm ~x86 ~amd64" IUSE="ssl curl X xcb opengl directfb fbcon sdl" -RDEPEND="ssl? ( dev-libs/openssl ) +RDEPEND=">=x11-libs/evas-0.9.9 + ssl? ( dev-libs/openssl ) curl? ( net-misc/curl ) X? ( x11-libs/libXrender ) xcb? ( x11-libs/libxcb ) @@ -24,37 +27,44 @@ DEPEND="${RDEPEND} x11-proto/xproto )" src_compile() { - local myconf - - # See the complete list at the end of this file - myconf="$(use_enable ssl openssl) \ - $(use_enable curl) \ - --enable-ecore-job \ - --enable-ecore-con \ - --enable-ecore-ipc \ - --enable-ecore-config \ - --enable-ecore-txt \ - --enable-ecore-evas \ - $(use_enable X simple-x11) \ - $(use_enable xcb ecore-x-xcb) \ - $(use_enable X ecore-x) \ - $(use_enable opengl ecore-evas-gl) \ - $(use_enable X evas-xrender) \ - $(use_enable X ecore-evas-x11-16) \ - $(use_enable directfb ecore-directfb) \ - $(use_enable directfb ecore-evas-dfb) \ - $(use_enable fbcon ecore-fb) \ - $(use_enable fbcon ecore-evas-fb) \ - $(use_enable sdl ecore-sdl) \ - $(use_enable sdl ecore-evas-sdl) \ - --enable-ecore-evas-buffer \ - --enable-ecore-file \ - --enable-inotify \ - --disable-poll \ - --enable-ecore-desktop" - - econf ${myconf} || die "Configuration failed" - emake || die "Make failed" + local myconf + + # See the complete list at the end of this file + myconf="$(use_enable ssl openssl) \ + $(use_enable curl) \ + --enable-ecore-job \ + --enable-ecore-con \ + --enable-ecore-ipc \ + --enable-ecore-config \ + --enable-ecore-txt \ + --enable-ecore-evas \ + $(use_enable X simple-x11) \ + $(use_enable xcb ecore-x-xcb) \ + $(use_enable X ecore-x) \ + $(use_enable opengl ecore-evas-gl) \ + $(use_enable X evas-xrender) \ + $(use_enable X ecore-evas-x11-16) \ + $(use_enable directfb ecore-directfb) \ + $(use_enable directfb ecore-evas-dfb) \ + $(use_enable fbcon ecore-fb) \ + $(use_enable fbcon ecore-evas-fb) \ + $(use_enable sdl ecore-sdl) \ + $(use_enable sdl ecore-evas-sdl) \ + --enable-ecore-evas-buffer \ + --enable-ecore-file \ + --enable-inotify \ + --disable-poll \ + --enable-ecore-desktop" + + + if tc-is-cross-compiler; then + sed -i -e 's%SDL_CFLAGS=`$SDL_CONFIG --cflags`%SDL_CFLAGS=`$SDL_CONFIG --prefix='${SYSROOT}' --cflags`%' configure.in + fi + + eautoreconf || die "Autoreconf failed" + + econf ${myconf} || die "Configuration failed" + emake || die "Make failed" } src_install() { diff --git a/x11-libs/ecore/ecore-20081212.ebuild b/x11-libs/ecore/ecore-20081212.ebuild new file mode 100644 index 0000000..7ee5544 --- /dev/null +++ b/x11-libs/ecore/ecore-20081212.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="The Enlightenment ecore library." +HOMEPAGE="http://enlightenment.org" +ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/${PN}" +ESVN_REVISION="r38119" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm ~x86 ~amd64" +IUSE="ssl curl X xcb opengl directfb fbcon sdl" + +inherit toolchain-funcs autotools subversion + +RDEPEND=">=x11-libs/evas-0.9.9 + ssl? ( dev-libs/openssl ) + curl? ( net-misc/curl ) + X? ( x11-libs/libXrender + x11-libs/libXtst ) + xcb? ( x11-libs/libxcb ) + opengl? ( virtual/opengl ) + directfb? ( dev-libs/DirectFB ) + sdl? ( media-libs/libsdl )" + +DEPEND="X? ( x11-proto/xextproto + x11-proto/xproto )" + +src_unpack() { + subversion_src_unpack + + cd "${S}" + + # Point to the sysroot SDL includes/libs on cross-compilation + if tc-is-cross-compiler; then + sed -i -e 's%SDL_CFLAGS=`$SDL_CONFIG --cflags`%SDL_CFLAGS=`$SDL_CONFIG --prefix='${SYSROOT}'/usr --cflags`%' configure.ac + fi + + touch README + touch ABOUT-NLS + + eautoreconf || die "Autoreconf failed" +} + +src_compile() { + local myconf + + # See the complete list at the end of this file + myconf="$(use_enable ssl openssl) \ + $(use_enable curl) \ + --enable-ecore-job \ + --enable-ecore-con \ + --enable-ecore-ipc \ + --enable-ecore-config \ + --enable-ecore-txt \ + --enable-ecore-evas \ + $(use_enable X simple-x11) \ + $(use_enable xcb ecore-x-xcb) \ + $(use_enable X ecore-x) \ + $(use_enable opengl ecore-evas-gl) \ + $(use_enable X evas-xrender) \ + $(use_enable X ecore-evas-x11-16) \ + $(use_enable directfb ecore-directfb) \ + $(use_enable directfb ecore-evas-dfb) \ + $(use_enable fbcon ecore-fb) \ + $(use_enable fbcon ecore-evas-fb) \ + $(use_enable sdl ecore-sdl) \ + $(use_enable sdl ecore-evas-sdl) \ + --enable-ecore-evas-buffer \ + --enable-ecore-file \ + --enable-inotify \ + --disable-poll" + + # We don't need the desktop part, it doesn't build and isn't used anymore! + myconf="${myconf} --disable-ecore-desktop" + + econf ${myconf} || die "Configuration failed" + emake || die "Make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + dodoc AUTHORS NEWS README +} diff --git a/x11-libs/ecore/ecore-20090108.ebuild b/x11-libs/ecore/ecore-20090108.ebuild new file mode 100644 index 0000000..a2b2397 --- /dev/null +++ b/x11-libs/ecore/ecore-20090108.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="The Enlightenment ecore library." +HOMEPAGE="http://enlightenment.org" +ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/${PN}" +ESVN_REVISION="r38500" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm ~x86 ~amd64" +IUSE="ssl curl X xcb opengl directfb fbcon sdl" + +inherit toolchain-funcs autotools subversion + +RDEPEND=">=x11-libs/evas-0.9.9 + ssl? ( dev-libs/openssl ) + curl? ( net-misc/curl ) + X? ( x11-libs/libXrender + x11-libs/libXtst ) + xcb? ( x11-libs/libxcb ) + opengl? ( virtual/opengl ) + directfb? ( dev-libs/DirectFB ) + sdl? ( media-libs/libsdl )" + +DEPEND="X? ( x11-proto/xextproto + x11-proto/xproto )" + +src_unpack() { + subversion_src_unpack + + cd "${S}" + + # Point to the sysroot SDL includes/libs on cross-compilation + if tc-is-cross-compiler; then + sed -i -e 's%SDL_CFLAGS=`$SDL_CONFIG --cflags`%SDL_CFLAGS=`$SDL_CONFIG --prefix='${SYSROOT}'/usr --cflags`%' configure.ac + fi + + touch README + touch ABOUT-NLS + + eautoreconf || die "Autoreconf failed" +} + +src_compile() { + local myconf + + # See the complete list at the end of this file + myconf="$(use_enable ssl openssl) \ + $(use_enable curl) \ + --enable-ecore-job \ + --enable-ecore-con \ + --enable-ecore-ipc \ + --enable-ecore-config \ + --enable-ecore-txt \ + --enable-ecore-evas \ + $(use_enable X simple-x11) \ + $(use_enable xcb ecore-x-xcb) \ + $(use_enable X ecore-x) \ + $(use_enable opengl ecore-evas-gl) \ + $(use_enable X evas-xrender) \ + $(use_enable X ecore-evas-x11-16) \ + $(use_enable directfb ecore-directfb) \ + $(use_enable directfb ecore-evas-dfb) \ + $(use_enable fbcon ecore-fb) \ + $(use_enable fbcon ecore-evas-fb) \ + $(use_enable sdl ecore-sdl) \ + $(use_enable sdl ecore-evas-sdl) \ + --enable-ecore-evas-buffer \ + --enable-ecore-file \ + --enable-inotify \ + --disable-poll" + + # We don't need the desktop part, it doesn't build and isn't used anymore! + myconf="${myconf} --disable-ecore-desktop" + + econf ${myconf} || die "Configuration failed" + emake || die "Make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + dodoc AUTHORS NEWS README +} diff --git a/x11-libs/evas/Manifest b/x11-libs/evas/Manifest index e8160ab..a229dbc 100644 --- a/x11-libs/evas/Manifest +++ b/x11-libs/evas/Manifest @@ -1,2 +1,4 @@ DIST evas-0.9.9.050.tar.bz2 12291950 RMD160 d358956e690c439b5d1bcdf5a05aae87a7ebfd98 SHA1 13cc5791023038b1ab12955fa52f1c93bf218859 SHA256 8c238493ec1649d100c624345aa16db055c7bc7c651a5bdf8efaa37de7e512d2 EBUILD evas-0.9.9.050.ebuild 3958 RMD160 af36154dc23cc84f329561f820dcbc2f7a29d63c SHA1 90a05bfca64d7bb6e93e186deed9c33707479601 SHA256 211f73c9621cc0239303ee8254987c855929f4330166ae8679bacbbea560f6da +EBUILD evas-20081212.ebuild 4104 RMD160 5f8a93abe2abc070f83b749bbf55767438b99419 SHA1 1c7e244aa73e3be6b6233fb28fad5e233d376e34 SHA256 457fdce531465cb96aa45471da4094b20e91aadd22720f98370cfae83cd5e0ab +EBUILD evas-20090108.ebuild 4104 RMD160 f3e7d13398c131d9b93170a5e92ffb2d93212731 SHA1 22cc6f7a5b67c049b721e4008f974fbeee4b6a9d SHA256 09eed609ef2914757a2f929520e3a11c939811f148cbdf0ec847a0c0396d6b6b diff --git a/x11-libs/evas/evas-20081212.ebuild b/x11-libs/evas/evas-20081212.ebuild new file mode 100644 index 0000000..f6c32da --- /dev/null +++ b/x11-libs/evas/evas-20081212.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="The Enlightenment evas library." +HOMEPAGE="http://enlightenment.org" +ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/${PN}" +ESVN_REVISION="r38120" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm ~x86 ~amd64" +IUSE="X xcb sdl fbcon opengl directfb threads mmx sse altivec cairo fontconfig + gif png jpeg eet edb tiff xpm svg" + +inherit autotools subversion + +RDEPEND="fontconfig? ( media-libs/fontconfig ) + X? ( x11-libs/libXrender ) + sdl? ( media-libs/libsdl ) + opengl? ( virtual/opengl ) + gif? ( media-libs/giflib ) + png? ( media-libs/libpng ) + jpeg? ( media-libs/jpeg ) + eet? ( dev-libs/eet ) + edb? ( dev-db/edb ) + tiff? ( media-libs/tiff ) + xpm? ( x11-libs/libXpm ) + svg? ( gnome-base/librsvg ) + cairo? ( x11-libs/cairo + x11-libs/libsvg-cairo ) + directfb? ( dev-libs/DirectFB )" + +DEPEND=">=dev-util/pkgconfig-0.9.0 + X? ( x11-proto/xextproto + x11-proto/xproto )" + +S="${WORKDIR}/${PN}" + +src_unpack() { + subversion_src_unpack + + cd "${S}" + + touch README + touch ABOUT-NLS + + eautoreconf || die "eautoreconf failed" +} + +src_compile() { + local myconf + + myconf="${myconf} + $(use_enable fontconfig) \ + $(use_enable X software-x11) \ + $(use_enable X software-16-x11) \ + $(use_enable xcb software-xcb) \ + $(use_enable sdl software-sdl) \ + $(use_enable sdl sdl-primitive) \ + $(use_enable fbcon fb) \ + $(use_enable opengl gl-x11) \ + $(use_enable X xrender-x11) \ + $(use_enable xcb xrender-xcb) \ + $(use_enable gif image-loader-gif) \ + $(use_enable png image-loader-png) \ + $(use_enable jpeg image-loader-jpeg) \ + $(use_enable eet image-loader-eet) \ + $(use_enable eet font-loader-eet) \ + $(use_enable edb image-loader-edb) \ + $(use_enable tiff image-loader-tiff) \ + $(use_enable xpm image-loader-xpm) \ + $(use_enable svg image-loader-svg) \ + $(use_enable threads pthreads) \ + $(use_enable mmx cpu-mmx) \ + $(use_enable sse cpu-sse) \ + $(use_enable altivec cpu-altivec) \ + $(use_enable cairo cairo-x11) \ + $(use_enable directfb) \ + --enable-buffer \ + --disable-image-loader-pmaps \ + --enable-cpu-c \ + --enable-scale-sample \ + --enable-scale-smooth \ + --enable-convert-8-rgb-332 \ + --enable-convert-8-rgb-666 \ + --enable-convert-8-rgb-232 \ + --enable-convert-8-rgb-222 \ + --enable-convert-8-rgb-221 \ + --enable-convert-8-rgb-121 \ + --enable-convert-8-rgb-111 \ + --enable-convert-16-rgb-565 \ + --enable-convert-16-rgb-555 \ + --enable-convert-16-rgb-444 \ + --enable-convert-16-rgb-rot-0 \ + --enable-convert-16-rgb-rot-270 \ + --enable-convert-16-rgb-rot-90 \ + --enable-convert-24-rgb-888 \ + --enable-convert-24-bgr-888 \ + --enable-convert-32-rgb-8888 \ + --enable-convert-32-rgbx-8888 \ + --enable-convert-32-bgr-8888 \ + --enable-convert-32-bgrx-8888 \ + --enable-convert-32-rgb-rot-0 \ + --enable-convert-32-rgb-rot-270 \ + --enable-convert-32-rgb-rot-90 \ + --x-includes=${SYSROOT}/usr/X11R6/include \ + --x-libraries=${SYSROOT}/usr/X11R6/lib" + + econf ${myconf} || die "Configuration failed" + emake || die "Make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + dodoc AUTHORS NEWS README +} diff --git a/x11-libs/evas/evas-20090108.ebuild b/x11-libs/evas/evas-20090108.ebuild new file mode 100644 index 0000000..e58d794 --- /dev/null +++ b/x11-libs/evas/evas-20090108.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="The Enlightenment evas library." +HOMEPAGE="http://enlightenment.org" +ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/${PN}" +ESVN_REVISION="r38500" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm ~x86 ~amd64" +IUSE="X xcb sdl fbcon opengl directfb threads mmx sse altivec cairo fontconfig + gif png jpeg eet edb tiff xpm svg" + +inherit autotools subversion + +RDEPEND="fontconfig? ( media-libs/fontconfig ) + X? ( x11-libs/libXrender ) + sdl? ( media-libs/libsdl ) + opengl? ( virtual/opengl ) + gif? ( media-libs/giflib ) + png? ( media-libs/libpng ) + jpeg? ( media-libs/jpeg ) + eet? ( dev-libs/eet ) + edb? ( dev-db/edb ) + tiff? ( media-libs/tiff ) + xpm? ( x11-libs/libXpm ) + svg? ( gnome-base/librsvg ) + cairo? ( x11-libs/cairo + x11-libs/libsvg-cairo ) + directfb? ( dev-libs/DirectFB )" + +DEPEND=">=dev-util/pkgconfig-0.9.0 + X? ( x11-proto/xextproto + x11-proto/xproto )" + +S="${WORKDIR}/${PN}" + +src_unpack() { + subversion_src_unpack + + cd "${S}" + + touch README + touch ABOUT-NLS + + eautoreconf || die "eautoreconf failed" +} + +src_compile() { + local myconf + + myconf="${myconf} + $(use_enable fontconfig) \ + $(use_enable X software-x11) \ + $(use_enable X software-16-x11) \ + $(use_enable xcb software-xcb) \ + $(use_enable sdl software-sdl) \ + $(use_enable sdl sdl-primitive) \ + $(use_enable fbcon fb) \ + $(use_enable opengl gl-x11) \ + $(use_enable X xrender-x11) \ + $(use_enable xcb xrender-xcb) \ + $(use_enable gif image-loader-gif) \ + $(use_enable png image-loader-png) \ + $(use_enable jpeg image-loader-jpeg) \ + $(use_enable eet image-loader-eet) \ + $(use_enable eet font-loader-eet) \ + $(use_enable edb image-loader-edb) \ + $(use_enable tiff image-loader-tiff) \ + $(use_enable xpm image-loader-xpm) \ + $(use_enable svg image-loader-svg) \ + $(use_enable threads pthreads) \ + $(use_enable mmx cpu-mmx) \ + $(use_enable sse cpu-sse) \ + $(use_enable altivec cpu-altivec) \ + $(use_enable cairo cairo-x11) \ + $(use_enable directfb) \ + --enable-buffer \ + --disable-image-loader-pmaps \ + --enable-cpu-c \ + --enable-scale-sample \ + --enable-scale-smooth \ + --enable-convert-8-rgb-332 \ + --enable-convert-8-rgb-666 \ + --enable-convert-8-rgb-232 \ + --enable-convert-8-rgb-222 \ + --enable-convert-8-rgb-221 \ + --enable-convert-8-rgb-121 \ + --enable-convert-8-rgb-111 \ + --enable-convert-16-rgb-565 \ + --enable-convert-16-rgb-555 \ + --enable-convert-16-rgb-444 \ + --enable-convert-16-rgb-rot-0 \ + --enable-convert-16-rgb-rot-270 \ + --enable-convert-16-rgb-rot-90 \ + --enable-convert-24-rgb-888 \ + --enable-convert-24-bgr-888 \ + --enable-convert-32-rgb-8888 \ + --enable-convert-32-rgbx-8888 \ + --enable-convert-32-bgr-8888 \ + --enable-convert-32-bgrx-8888 \ + --enable-convert-32-rgb-rot-0 \ + --enable-convert-32-rgb-rot-270 \ + --enable-convert-32-rgb-rot-90 \ + --x-includes=${SYSROOT}/usr/X11R6/include \ + --x-libraries=${SYSROOT}/usr/X11R6/lib" + + econf ${myconf} || die "Configuration failed" + emake || die "Make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + dodoc AUTHORS NEWS README +} diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest new file mode 100644 index 0000000..57822ba --- /dev/null +++ b/x11-libs/gtk+/Manifest @@ -0,0 +1,11 @@ +AUX gtk+-2.12.0-flash-workaround.patch 532 RMD160 24d6d96f11c1fd8c8d6fe3702de2dc4d824d7ee5 SHA1 7db980e782a5b04d27bffb55e3dc0190ad22e118 SHA256 da2ce04a400e45cc5e5cf78547699006e70e91e6620b4232a8fd7eea4de90007 +AUX gtk+-2.14.3-limit-gtksignal-includes.patch 513 RMD160 ad967a5fb6b9fe2d96119d478429f10032bad8a5 SHA1 5c0df3e543303dfe456479359fea2cbd0d4b723e SHA256 20e7536c29e2675d18fd3aff933621a4fcab9b5615ff96593e9f36ab4febb734 +AUX gtk+-2.8.0-multilib.patch 2456 RMD160 ba94fb0b16f9002dec8e92700ff3f7931f600548 SHA1 e65e843c6f1beecee7a0e1f7ec3292596c2a65a4 SHA256 595bddaa3e50a54f47dbcf30381e11bce0baa1ccd683ac1ba30ca0221b78a4fd +AUX hardcoded_libtool.patch 1714 RMD160 1625923c6fa97a55da3089a9fe69bbb1713b03cf SHA1 0decdb339992810deb96cae4afc9a1ccc279ab61 SHA256 295bca499ef1a15938175e0136695bce0aaeea839165c926bf6cf82f58c3299c +AUX no-demos.patch 789 RMD160 37829926bf2c146227b93dfce9ebbb2006bdf5b5 SHA1 8dd03430ea805e9c41f5a659b40a763a1e02d15d SHA256 8e78431862a4a2ddcae81c17e290f04749c27a18267b15a328422a476f604171 +AUX no-freeze.patch 1209 RMD160 6d2cdf1f7b04624985df66ea13696c4532159b45 SHA1 7219663128ac0a08474838caf2e848dceac5d1d0 SHA256 1bb898be00fed1c41f7f4f133af5576d5f5f7f8764ce8f96eb74644123ca7f00 +AUX run-iconcache.patch 1699 RMD160 020c8fb5fe2aef6d4b59a5e6b5c046b5a4558778 SHA1 270601b77ea15cd5a1849afd1c2dab31342561c3 SHA256 9dc9d0beb1335fd467b9f6ccef037560eee6cb984036e062f69b995cef26aca5 +AUX smallscreen_filechooser.patch 8289 RMD160 5dbb285695577219f75345e59564a98b2aa9cdd6 SHA1 fe7b7c37f8c6239ef398462d0fa55df875835f9c SHA256 a36b1d3d2aa2c9db41918f8f514949611c194ed4f0ae6924af651473c1d3917c +AUX toggle-font.diff 3275 RMD160 4d21cd5e4531927c8c5d7f6dfb1d86b66e757724 SHA1 892becbc52bd83e40c849d6d81f6f25f5d1d36ed SHA256 ef94de06ca252542e1f90c2f80b3c8394413895df2a939388d2428566b62e85a +DIST gtk+-2.14.5.tar.bz2 17426317 RMD160 08a6ad8a609a6214f9a1c3c52c26eabf97e320ec SHA1 6b7a988807627d5f4e70a2fc5b56c7832fe3e1b4 SHA256 05d01dfce51cd96cd7ce44c3a77c200a70f27551915d372cfc2de32ca9550c51 +EBUILD gtk+-2.14.5.ebuild 4848 RMD160 8c73c8a924c32bb705839d7f6102844c2ab153d1 SHA1 32b2271c6637e0c624482674950792eb64a03165 SHA256 3bf0f222f04ef118153bad5d82eb3f4734d710030c99d4b428291c140b12a893 diff --git a/x11-libs/gtk+/files/gtk+-2.12.0-flash-workaround.patch b/x11-libs/gtk+/files/gtk+-2.12.0-flash-workaround.patch new file mode 100644 index 0000000..7beccc3 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.12.0-flash-workaround.patch @@ -0,0 +1,12 @@ +Index: gtk+2.0-2.11.6/gtk/gtkclipboard.c +=================================================================== +--- gtk+2.0-2.11.6.orig/gtk/gtkclipboard.c 2007-08-31 16:52:48.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtkclipboard.c 2007-08-31 16:53:16.000000000 +0200 +@@ -287,6 +287,7 @@ + gtk_clipboard_get_for_display (GdkDisplay *display, + GdkAtom selection) + { ++ g_return_val_if_fail (display != NULL, NULL); + g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); + g_return_val_if_fail (!display->closed, NULL); + diff --git a/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch b/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch new file mode 100644 index 0000000..3fe8cff --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch @@ -0,0 +1,17 @@ +http://bugzilla.gnome.org/show_bug.cgi?id=536767 + +Makes inkscape and claws-mail buildable again. Basically all packages still using +GtkCList and single included headers. +--- gtk/gtksignal.h.orig 2008-06-12 01:40:59.000000000 -0400 ++++ gtk/gtksignal.h 2008-06-11 18:21:47.000000000 -0400 +@@ -29,7 +29,9 @@ + #ifndef __GTK_SIGNAL_H__ + #define __GTK_SIGNAL_H__ + +-#include <gtk/gtk.h> ++#include <gtk/gtkenums.h> ++#include <gtk/gtktypeutils.h> ++#include <gtk/gtkobject.h> + #include <gtk/gtkmarshal.h> + + G_BEGIN_DECLS diff --git a/x11-libs/gtk+/files/gtk+-2.8.0-multilib.patch b/x11-libs/gtk+/files/gtk+-2.8.0-multilib.patch new file mode 100644 index 0000000..4a1b73d --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.8.0-multilib.patch @@ -0,0 +1,63 @@ +diff -urN gtk+-2.8.0.orig/gdk-pixbuf/Makefile.am gtk+-2.8.0/gdk-pixbuf/Makefile.am +--- gtk+-2.8.0.orig/gdk-pixbuf/Makefile.am 2005-07-09 01:10:11.000000000 +0100 ++++ gtk+-2.8.0/gdk-pixbuf/Makefile.am 2005-08-17 17:59:20.000000000 +0100 +@@ -271,6 +271,7 @@ + -I$(top_srcdir)/gdk-pixbuf \ + -I$(top_builddir)/gdk-pixbuf \ + -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ ++ -DHOST=\"$(host_triplet)\" \ + -DGTK_VERSION=\"$(GTK_VERSION)\" \ + -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ + -DG_DISABLE_DEPRECATED \ +diff -urN gtk+-2.8.0.orig/gdk-pixbuf/Makefile.in gtk+-2.8.0/gdk-pixbuf/Makefile.in +--- gtk+-2.8.0.orig/gdk-pixbuf/Makefile.in 2005-08-17 17:38:06.000000000 +0100 ++++ gtk+-2.8.0/gdk-pixbuf/Makefile.in 2005-08-17 17:59:35.000000000 +0100 +@@ -504,6 +504,7 @@ + -I$(top_srcdir)/gdk-pixbuf \ + -I$(top_builddir)/gdk-pixbuf \ + -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ ++ -DHOST=\"$(host_triplet)\" \ + -DGTK_VERSION=\"$(GTK_VERSION)\" \ + -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ + -DG_DISABLE_DEPRECATED \ +diff -urN gtk+-2.8.0.orig/gdk-pixbuf/gdk-pixbuf-io.c gtk+-2.8.0/gdk-pixbuf/gdk-pixbuf-io.c +--- gtk+-2.8.0.orig/gdk-pixbuf/gdk-pixbuf-io.c 2005-07-22 16:34:32.000000000 +0100 ++++ gtk+-2.8.0/gdk-pixbuf/gdk-pixbuf-io.c 2005-08-17 17:44:48.000000000 +0100 +@@ -276,8 +276,15 @@ + gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE")); + + if (!result) +- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL); +- ++ { ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", HOST, "gdk-pixbuf.loaders", NULL); ++ if (!g_file_test (result, G_FILE_TEST_EXISTS)) ++ { ++ g_free (result); ++ ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL); ++ } ++ } + return result; + } + +diff -urN gtk+-2.8.0.orig/gtk/gtkrc.c gtk+-2.8.0/gtk/gtkrc.c +--- gtk+-2.8.0.orig/gtk/gtkrc.c 2005-04-06 14:49:28.000000000 +0100 ++++ gtk+-2.8.0/gtk/gtkrc.c 2005-08-17 17:54:36.000000000 +0100 +@@ -364,7 +364,15 @@ + if (im_module_file) + result = g_strdup (im_module_file); + else +- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); ++ { ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST, "gtk.immodules", NULL); ++ if (!g_file_test (result, G_FILE_TEST_EXISTS)) ++ { ++ g_free (result); ++ ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); ++ } ++ } + } + + return result; diff --git a/x11-libs/gtk+/files/hardcoded_libtool.patch b/x11-libs/gtk+/files/hardcoded_libtool.patch new file mode 100644 index 0000000..82fbbac --- /dev/null +++ b/x11-libs/gtk+/files/hardcoded_libtool.patch @@ -0,0 +1,31 @@ +Index: gtk+-2.14.2/configure.in +=================================================================== +--- gtk+-2.14.2.orig/configure.in 2008-09-23 15:52:44.000000000 +0100 ++++ gtk+-2.14.2/configure.in 2008-09-23 15:53:51.000000000 +0100 +@@ -401,7 +401,7 @@ + case $enable_explicit_deps in + auto) + export SED +- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` ++ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` + if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then + enable_explicit_deps=yes + else +@@ -759,7 +759,7 @@ + dnl Now we check to see if our libtool supports shared lib deps + dnl (in a rather ugly way even) + if $dynworks; then +- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" ++ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" + pixbuf_deplibs_check=`$pixbuf_libtool_config | \ + grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ + sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` +@@ -1893,7 +1893,7 @@ + # We are using gmodule-no-export now, but I'm leaving the stripping + # code in place for now, since pango and atk still require gmodule. + export SED +-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + if test -n "$export_dynamic"; then + GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` + GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/x11-libs/gtk+/files/no-demos.patch b/x11-libs/gtk+/files/no-demos.patch new file mode 100644 index 0000000..4ca66ca --- /dev/null +++ b/x11-libs/gtk+/files/no-demos.patch @@ -0,0 +1,21 @@ +--- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 ++++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 +@@ -1,6 +1,6 @@ + ## Makefile.am for GTK+ + +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros + + # require automake 1.4 +--- gtk+-2.14.5/Makefile.in~ 2008-12-28 18:14:40.054996133 +0000 ++++ gtk+-2.14.5/Makefile.in 2008-12-28 18:14:40.055974819 +0000 +@@ -520,7 +520,7 @@ + && DISPLAY=:$$XID && export DISPLAY + + +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros + + # require automake 1.4 diff --git a/x11-libs/gtk+/files/no-freeze.patch b/x11-libs/gtk+/files/no-freeze.patch new file mode 100644 index 0000000..267b38c --- /dev/null +++ b/x11-libs/gtk+/files/no-freeze.patch @@ -0,0 +1,34 @@ +# Patch taken from gnome bugzilla http://bugzilla.gnome.org/show_bug.cgi?id=561591 +--- gtk-2.12.11-clean/gdk/gdkwindow.c 2008-11-17 20:18:12.000000000 +0000 ++++ gtk-2.12.11-unfrozen/gdk/gdkwindow.c 2008-11-17 +20:23:59.000000000 +0000 +@@ -2304,8 +2304,7 @@ + gdk_window_schedule_update (GdkWindow *window) + { + if (window && +- (GDK_WINDOW_OBJECT (window)->update_freeze_count || +- gdk_window_is_toplevel_frozen (window))) ++ (GDK_WINDOW_OBJECT (window)->update_freeze_count )) + return; + + if (!update_idle) +@@ -2437,8 +2436,7 @@ + + if (!GDK_WINDOW_DESTROYED (tmp_list->data)) + { +- if (private->update_freeze_count || +- gdk_window_is_toplevel_frozen (tmp_list->data)) ++ if (private->update_freeze_count) + update_windows = g_slist_prepend (update_windows, private); + else + gdk_window_process_updates_internal (tmp_list->data); +@@ -2488,8 +2486,7 @@ + } + + if (private->update_area && +- !private->update_freeze_count && +- !gdk_window_is_toplevel_frozen (window)) ++ !private->update_freeze_count) + { + gdk_window_process_updates_internal (window); + update_windows = g_slist_remove (update_windows, window); diff --git a/x11-libs/gtk+/files/run-iconcache.patch b/x11-libs/gtk+/files/run-iconcache.patch new file mode 100644 index 0000000..a497cf8 --- /dev/null +++ b/x11-libs/gtk+/files/run-iconcache.patch @@ -0,0 +1,38 @@ +--- /tmp/Makefile.am 2007-01-08 17:44:47.000000000 +0100 ++++ gtk+-2.10.7/gtk/Makefile.am 2007-01-08 17:45:17.025251000 +0100 +@@ -1128,11 +1128,11 @@ + ./gtk-update-icon-cache + endif + +-gtkbuiltincache.h: @REBUILD@ stamp-icons +- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) +- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ +- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ +- mv gtkbuiltincache.h.tmp gtkbuiltincache.h ++#gtkbuiltincache.h: @REBUILD@ stamp-icons ++# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) ++# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ ++# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ ++# mv gtkbuiltincache.h.tmp gtkbuiltincache.h + + EXTRA_DIST += \ + $(STOCK_ICONS) \ +--- gtk+-2.14.5/gtk/Makefile.in~ 2008-12-28 18:16:05.801973512 +0000 ++++ gtk+-2.14.5/gtk/Makefile.in 2008-12-28 18:16:05.802973848 +0000 +@@ -3230,11 +3230,11 @@ + ) done \ + && touch stamp-icons + +-gtkbuiltincache.h: @REBUILD@ stamp-icons +- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) +- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ +- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ +- mv gtkbuiltincache.h.tmp gtkbuiltincache.h ++#gtkbuiltincache.h: @REBUILD@ stamp-icons ++# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) ++# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ ++# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ ++# mv gtkbuiltincache.h.tmp gtkbuiltincache.h + + install-data-local: + # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/x11-libs/gtk+/files/smallscreen_filechooser.patch b/x11-libs/gtk+/files/smallscreen_filechooser.patch new file mode 100644 index 0000000..2d3b2aa --- /dev/null +++ b/x11-libs/gtk+/files/smallscreen_filechooser.patch @@ -0,0 +1,235 @@ +diff -Naur gtk+-2.14.3.orig/gtk/gtkfilechooserdefault.c gtk+-2.14.3/gtk/gtkfilechooserdefault.c +--- gtk+-2.14.3.orig/gtk/gtkfilechooserdefault.c 2008-09-22 22:33:15.000000000 +0400 ++++ gtk+-2.14.3/gtk/gtkfilechooserdefault.c 2008-10-06 00:42:01.000000000 +0400 +@@ -252,7 +252,9 @@ + /* Icon size for if we can't get it from the theme */ + #define FALLBACK_ICON_SIZE 16 + +-#define PREVIEW_HBOX_SPACING 12 ++#define PREVIEW_HBOX_SPACING 2 ++#define NORMAL_SPACING 2 ++#define DOUBLE_SPACING 2 + #define NUM_LINES 45 + #define NUM_CHARS 60 + +@@ -460,6 +462,17 @@ + + + ++int ++_gtk_is_pda_mode() ++{ ++ /* PDA mode is when we have small screen width, plus small overall screen area ++ too. What we want to do when it is active is to prefer vertical packing over ++ horizontal (so we can show user filenames of as long length as possible), yet ++ still layout vertical space in such way so user can be able to see as many ++ files as possible. And of course, we save space overall - no big spacings and ++ borders. */ ++ return gdk_screen_width() < 490; ++} + + + /* Drag and drop interface declarations */ +@@ -803,7 +816,7 @@ + impl->operation_mode = OPERATION_MODE_BROWSE; + impl->recent_manager = gtk_recent_manager_get_default (); + +- gtk_box_set_spacing (GTK_BOX (impl), 12); ++ gtk_box_set_spacing (GTK_BOX (impl), DOUBLE_SPACING); + + set_file_system_backend (impl); + +@@ -3969,8 +3982,9 @@ + GtkWidget *vbox; + GtkWidget *hbox; + GtkWidget *widget; ++ gboolean is_pda = _gtk_is_pda_mode(); + +- vbox = gtk_vbox_new (FALSE, 6); ++ vbox = (is_pda?gtk_hbox_new:gtk_vbox_new) (FALSE, NORMAL_SPACING); + gtk_widget_show (vbox); + + /* Shortcuts tree */ +@@ -3980,7 +3994,7 @@ + + /* Box for buttons */ + +- hbox = gtk_hbox_new (TRUE, 6); ++ hbox = (is_pda?gtk_vbox_new:gtk_hbox_new) (TRUE, NORMAL_SPACING); + gtk_size_group_add_widget (size_group, hbox); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + gtk_widget_show (hbox); +@@ -3988,7 +4002,7 @@ + /* Add bookmark button */ + + impl->browse_shortcuts_add_button = button_new (impl, +- _("_Add"), ++ "", + GTK_STOCK_ADD, + FALSE, + TRUE, +@@ -4000,15 +4014,25 @@ + /* Remove bookmark button */ + + impl->browse_shortcuts_remove_button = button_new (impl, +- _("_Remove"), ++ "", + GTK_STOCK_REMOVE, + FALSE, + TRUE, + G_CALLBACK (remove_bookmark_button_clicked_cb)); ++ if (!is_pda) { ++/* Remove button is pretty reduntant, as that choice is available from popup ++ * menu (and would be intuitively expected to be there; compare that with ++ * the "Add to shortucts" in popup in files pane - most users would never ++ * try that and never new what shortcuts are). ++ * If we suspect we can be short of screen space (PDA device is what often ++ * has portrait layout), don't pack it, to allow more visually pleasing ++ * layout when minimizing location pane. Note that we still instantiate it, ++ * as it is referenced thruout the code. */ ++ + gtk_box_pack_start (GTK_BOX (hbox), impl->browse_shortcuts_remove_button, TRUE, TRUE, 0); + gtk_widget_set_tooltip_text (impl->browse_shortcuts_remove_button, + _("Remove the selected bookmark")); +- ++ } + return vbox; + } + +@@ -4661,7 +4685,7 @@ + GtkWidget *hbox; + GtkWidget *widget; + +- vbox = gtk_vbox_new (FALSE, 6); ++ vbox = gtk_vbox_new (FALSE, NORMAL_SPACING); + gtk_widget_show (vbox); + + /* Box for lists and preview */ +@@ -4677,13 +4701,13 @@ + + /* Preview */ + +- impl->preview_box = gtk_vbox_new (FALSE, 12); ++ impl->preview_box = gtk_vbox_new (FALSE, DOUBLE_SPACING); + gtk_box_pack_start (GTK_BOX (hbox), impl->preview_box, FALSE, FALSE, 0); + /* Don't show preview box initially */ + + /* Filter combo */ + +- impl->filter_combo_hbox = gtk_hbox_new (FALSE, 12); ++ impl->filter_combo_hbox = gtk_hbox_new (FALSE, DOUBLE_SPACING); + + widget = filter_create (impl); + +@@ -4835,13 +4859,13 @@ + + location_switch_to_path_bar (impl); + +- vbox = gtk_vbox_new (FALSE, 12); ++ vbox = gtk_vbox_new (FALSE, DOUBLE_SPACING); + + table = gtk_table_new (2, 2, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); + gtk_widget_show (table); +- gtk_table_set_row_spacings (GTK_TABLE (table), 12); +- gtk_table_set_col_spacings (GTK_TABLE (table), 12); ++ gtk_table_set_row_spacings (GTK_TABLE (table), DOUBLE_SPACING); ++ gtk_table_set_col_spacings (GTK_TABLE (table), DOUBLE_SPACING); + + /* Label */ + +@@ -5175,10 +5199,10 @@ + + /* size group is used by the [+][-] buttons and the filter combo */ + size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL); +- vbox = gtk_vbox_new (FALSE, 12); ++ vbox = gtk_vbox_new (FALSE, DOUBLE_SPACING); + + /* Location widgets */ +- hbox = gtk_hbox_new (FALSE, 12); ++ hbox = gtk_hbox_new (FALSE, DOUBLE_SPACING); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + gtk_widget_show (hbox); + impl->browse_path_bar_hbox = hbox; +@@ -5201,7 +5225,7 @@ + + /* Box for the location label and entry */ + +- impl->location_entry_box = gtk_hbox_new (FALSE, 12); ++ impl->location_entry_box = gtk_hbox_new (FALSE, DOUBLE_SPACING); + gtk_box_pack_start (GTK_BOX (vbox), impl->location_entry_box, FALSE, FALSE, 0); + + impl->location_label = gtk_label_new_with_mnemonic (_("_Location:")); +@@ -5209,12 +5233,16 @@ + gtk_box_pack_start (GTK_BOX (impl->location_entry_box), impl->location_label, FALSE, FALSE, 0); + + /* Paned widget */ +- hpaned = gtk_hpaned_new (); ++ if (_gtk_is_pda_mode()) ++ hpaned = gtk_vpaned_new (); ++ else ++ hpaned = gtk_hpaned_new (); ++ + gtk_widget_show (hpaned); + gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0); + + widget = shortcuts_pane_create (impl, size_group); +- gtk_paned_pack1 (GTK_PANED (hpaned), widget, FALSE, FALSE); ++ gtk_paned_pack1 (GTK_PANED (hpaned), widget, FALSE, TRUE); /* Shortcuts can shrink beyond requested size */ + widget = file_pane_create (impl, size_group); + gtk_paned_pack2 (GTK_PANED (hpaned), widget, TRUE, FALSE); + +diff -Naur gtk+-2.14.3.orig/gtk/gtkfilechooserdialog.c gtk+-2.14.3/gtk/gtkfilechooserdialog.c +--- gtk+-2.14.3.orig/gtk/gtkfilechooserdialog.c 2008-09-19 08:44:03.000000000 +0400 ++++ gtk+-2.14.3/gtk/gtkfilechooserdialog.c 2008-10-10 12:37:38.000000000 +0400 +@@ -32,8 +32,12 @@ + + #include <stdarg.h> + ++#define NORMAL_SPACING 1 ++#define DOUBLE_SPACING 2 ++ + #define GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE(o) (GTK_FILE_CHOOSER_DIALOG (o)->priv) + ++extern int _gtk_is_pda_mode(void); + static void gtk_file_chooser_dialog_finalize (GObject *object); + + static GObject* gtk_file_chooser_dialog_constructor (GType type, +@@ -89,9 +93,9 @@ + dialog->priv->response_requested = FALSE; + + gtk_dialog_set_has_separator (fc_dialog, FALSE); +- gtk_container_set_border_width (GTK_CONTAINER (fc_dialog), 5); +- gtk_box_set_spacing (GTK_BOX (fc_dialog->vbox), 2); /* 2 * 5 + 2 = 12 */ +- gtk_container_set_border_width (GTK_CONTAINER (fc_dialog->action_area), 5); ++ gtk_container_set_border_width (GTK_CONTAINER (fc_dialog), NORMAL_SPACING); ++ gtk_box_set_spacing (GTK_BOX (fc_dialog->vbox), NORMAL_SPACING); ++ gtk_container_set_border_width (GTK_CONTAINER (fc_dialog->action_area), NORMAL_SPACING); + + /* We do a signal connection here rather than overriding the method in + * class_init because GtkDialog::response is a RUN_LAST signal. We want *our* +@@ -170,8 +174,13 @@ + + gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); + +- if (width) +- *width = MIN (*width, (monitor.width * 3) / 4); ++ if (width) { ++ if (_gtk_is_pda_mode()) ++ /* If width is physically small, use it all */ ++ *width = monitor.width; ++ else ++ *width = MIN (*width, (monitor.width * 3) / 4); ++ } + + if (height) + *height = MIN (*height, (monitor.height * 3) / 4); +@@ -279,7 +288,7 @@ + g_signal_connect (priv->widget, "response-requested", + G_CALLBACK (file_chooser_widget_response_requested), object); + +- gtk_container_set_border_width (GTK_CONTAINER (priv->widget), 5); ++ gtk_container_set_border_width (GTK_CONTAINER (priv->widget), NORMAL_SPACING); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (object)->vbox), priv->widget, TRUE, TRUE, 0); + + gtk_widget_show (priv->widget); diff --git a/x11-libs/gtk+/files/toggle-font.diff b/x11-libs/gtk+/files/toggle-font.diff new file mode 100644 index 0000000..59ad150 --- /dev/null +++ b/x11-libs/gtk+/files/toggle-font.diff @@ -0,0 +1,100 @@ +Index: gtk/gtkcellrenderertoggle.c +=================================================================== +--- gtk/gtkcellrenderertoggle.c (revision 18523) ++++ gtk/gtkcellrenderertoggle.c (working copy) +@@ -71,6 +71,8 @@ + PROP_INDICATOR_SIZE + }; + ++/* This is a hard-coded default which promptly gets overridden by a size ++ calculated from the font size. */ + #define TOGGLE_WIDTH 13 + + static guint toggle_cell_signals[LAST_SIGNAL] = { 0 }; +@@ -80,8 +82,9 @@ + typedef struct _GtkCellRendererTogglePrivate GtkCellRendererTogglePrivate; + struct _GtkCellRendererTogglePrivate + { +- gint indicator_size; +- ++ gint indicator_size; /* This is the real size */ ++ gint override_size; /* This is the size set from the indicator-size property */ ++ GtkWidget *cached_widget; + guint inconsistent : 1; + }; + +@@ -104,6 +107,7 @@ + GTK_CELL_RENDERER (celltoggle)->ypad = 2; + + priv->indicator_size = TOGGLE_WIDTH; ++ priv->override_size = 0; + priv->inconsistent = FALSE; + } + +@@ -210,7 +214,7 @@ + g_value_set_boolean (value, celltoggle->radio); + break; + case PROP_INDICATOR_SIZE: +- g_value_set_int (value, priv->indicator_size); ++ g_value_set_int (value, priv->override_size ? priv->override_size : priv->indicator_size); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); +@@ -245,7 +249,7 @@ + celltoggle->radio = g_value_get_boolean (value); + break; + case PROP_INDICATOR_SIZE: +- priv->indicator_size = g_value_get_int (value); ++ priv->override_size = g_value_get_int (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); +@@ -273,6 +277,27 @@ + } + + static void ++on_widget_style_set (GtkWidget *widget, GtkStyle *previous, gpointer user_data) ++{ ++ GtkCellRendererTogglePrivate *priv = user_data; ++ PangoContext *context; ++ PangoFontMetrics *metrics; ++ int height; ++ ++ context = gtk_widget_get_pango_context (widget); ++ metrics = pango_context_get_metrics (context, ++ widget->style->font_desc, ++ pango_context_get_language (context)); ++ ++ height = pango_font_metrics_get_ascent (metrics) + ++ pango_font_metrics_get_descent (metrics); ++ ++ pango_font_metrics_unref (metrics); ++ ++ priv->indicator_size = PANGO_PIXELS (height * 0.85); ++} ++ ++static void + gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell, + GtkWidget *widget, + GdkRectangle *cell_area, +@@ -287,6 +312,20 @@ + + priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (cell); + ++ if (priv->override_size) { ++ priv->indicator_size = priv->override_size; ++ } else if (priv->cached_widget != widget) { ++ if (priv->cached_widget) { ++ g_object_remove_weak_pointer (widget, &priv->cached_widget); ++ g_signal_handlers_disconnect_by_func (priv->cached_widget, on_widget_style_set, priv); ++ } ++ priv->cached_widget = widget; ++ g_object_add_weak_pointer (widget, &priv->cached_widget); ++ g_signal_connect (widget, "style-set", on_widget_style_set, priv); ++ ++ on_widget_style_set (widget, NULL, priv); ++ } ++ + calc_width = (gint) cell->xpad * 2 + priv->indicator_size; + calc_height = (gint) cell->ypad * 2 + priv->indicator_size; + diff --git a/x11-libs/gtk+/gtk+-2.14.5.ebuild b/x11-libs/gtk+/gtk+-2.14.5.ebuild new file mode 100644 index 0000000..78380d5 --- /dev/null +++ b/x11-libs/gtk+/gtk+-2.14.5.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.14.5.ebuild,v 1.2 2008/11/30 13:13:59 eva Exp $ + +WANT_AUTOMAKE="1.7" + +inherit gnome.org flag-o-matic eutils libtool virtualx + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="http://www.gtk.org/" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="cups debug doc jpeg jpeg2k tiff vim-syntax xinerama" + +RDEPEND="x11-libs/libXrender + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXt + x11-libs/libXext + >=x11-libs/libXrandr-1.2 + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXcomposite + x11-libs/libXdamage + xinerama? ( x11-libs/libXinerama ) + >=dev-libs/glib-2.17.6 + >=x11-libs/pango-1.20 + >=dev-libs/atk-1.13 + >=x11-libs/cairo-1.6 + media-libs/fontconfig + x11-misc/shared-mime-info + >=media-libs/libpng-1.2.1 + cups? ( net-print/cups ) + jpeg? ( >=media-libs/jpeg-6b-r2 ) + jpeg2k? ( media-libs/jasper ) + tiff? ( >=media-libs/tiff-3.5.7 ) + !<gnome-base/gail-1000" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9 + x11-proto/xextproto + x11-proto/xproto + x11-proto/inputproto + x11-proto/damageproto + xinerama? ( x11-proto/xineramaproto ) + >=dev-util/gtk-doc-am-1.8 + doc? ( + >=dev-util/gtk-doc-1.8 + ~app-text/docbook-xml-dtd-4.1.2 + )" +PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" + +pkg_setup() { + if ! built_with_use x11-libs/cairo X; then + eerror "Please re-emerge x11-libs/cairo with the X USE flag set" + die "cairo needs the X flag set" + fi +} + +set_gtk2_confdir() { + # An arch specific config directory is used on multilib systems + has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" + GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0} +} + +src_unpack() { + unpack ${A} + cd "${S}" + + # use an arch-specific config directory so that 32bit and 64bit versions + # dont clash on multilib systems + has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch" + + # Workaround adobe flash infinite loop. Patch from http://bugzilla.gnome.org/show_bug.cgi?id=463773#c11 + epatch "${FILESDIR}/${PN}-2.12.0-flash-workaround.patch" + + # Don't break inclusion of gtkclist.h, upstream bug 536767 + epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch" + + # Cross compilation patches from OE + epatch "${FILESDIR}/hardcoded_libtool.patch" + epatch "${FILESDIR}/no-demos.patch" + epatch "${FILESDIR}/run-iconcache.patch" + epatch "${FILESDIR}/smallscreen_filechooser.patch" + epatch "${FILESDIR}/toggle-font.diff" + + # patch from gnome bug #561591 + epatch "${FILESDIR}/no-freeze.patch" + + # -O3 and company cause random crashes in applications. Bug #133469 + replace-flags -O3 -O2 + strip-flags + + use ppc64 && append-flags -mminimal-toc + + elibtoolize +} + +src_compile() { + # png always on to display icons (foser) + local myconf="$(use_enable doc gtk-doc) \ + $(use_with jpeg libjpeg) \ + $(use_with jpeg2k libjasper) \ + $(use_with tiff libtiff) \ + $(use_enable xinerama) \ + $(use_enable cups cups auto) \ + --with-libpng \ + --with-gdktarget=x11 \ + --with-xinput" + + # Passing --disable-debug is not recommended for production use + use debug && myconf="${myconf} --enable-debug=yes" + + econf ${myconf} || die "configure failed" + emake || die "compile failed" +} + +src_test() { + Xemake check || die "tests failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + + set_gtk2_confdir + dodir ${GTK2_CONFDIR} + keepdir ${GTK2_CONFDIR} + + # see bug #133241 + echo 'gtk-fallback-icon-theme = "gnome"' > "${D}/${GTK2_CONFDIR}/gtkrc" + + # Enable xft in environment as suggested by <utx@gentoo.org> + dodir /etc/env.d + echo "GDK_USE_XFT=1" > "${D}/etc/env.d/50gtk2" + + dodoc AUTHORS ChangeLog* HACKING NEWS* README* + + # This has to be removed, because it's multilib specific; generated in + # postinst + rm "${D}/etc/gtk-2.0/gtk.immodules" +} + +pkg_postinst() { + set_gtk2_confdir + + if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then + gtk-query-immodules-2.0 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules" + gdk-pixbuf-query-loaders > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" + else + ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;" + ewarn "to complete the installation of GTK+, please create the" + ewarn "directory and then manually run:" + ewarn " cd ${ROOT}${GTK2_CONFDIR}" + ewarn " gtk-query-immodules-2.0 > gtk.immodules" + ewarn " gdk-pixbuf-query-loaders > gdk-pixbuf.loaders" + fi + + if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then + elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]* + elog "to do that you can use qfile from portage-utils:" + elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)" + fi + + elog "Please install app-text/evince for print preview functionality." + elog "Alternatively, check \"gtk-print-preview-command\" documentation and" + elog "add it to your gtkrc." +} diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest new file mode 100644 index 0000000..91c80c6 --- /dev/null +++ b/x11-libs/libX11/Manifest @@ -0,0 +1,4 @@ +AUX libX11-1.1.3-crosscompile-makekeys.patch 1884 RMD160 73c0c5a6a48cc98f50ac6bb35c098f5594150a08 SHA1 a3b2ec48cdfb1a1c021528a41ed7e7241ad623f0 SHA256 e116bf288bf780c1d81aacb20845613c1bb5de13509e912b0b8d219acf36b737 +AUX libX11-1.1.3-xcb-locking.patch 966 RMD160 59f9bc11591454bea86e30574866d070dafcd3fb SHA1 3a0838317ba656aec70732353fccc38e26d466b6 SHA256 944357ec53cb862f7b4b7dfe16f876adfa5a1f5ad35bdd0f74d11ae7dc3ecab2 +DIST libX11-1.1.3.tar.bz2 1526958 RMD160 fcb8d5d31befa0ae227210dc7274c17b30c37fad SHA1 235f69172b262f874d2a2d7bd17e8197aea5b767 SHA256 4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a +EBUILD libX11-1.1.3-r1.ebuild 1534 RMD160 7525d37a8d187ee287b6f8f711e26da5a4094656 SHA1 29a039230f61d113ddd004f80a5514fbfdb7c2fd SHA256 980975d8013f1628e16faeb62d698dfbd7d2d4f3a12ffe1282391e434b9bf4f0 diff --git a/x11-libs/libX11/files/libX11-1.1.3-crosscompile-makekeys.patch b/x11-libs/libX11/files/libX11-1.1.3-crosscompile-makekeys.patch new file mode 100644 index 0000000..14e2054 --- /dev/null +++ b/x11-libs/libX11/files/libX11-1.1.3-crosscompile-makekeys.patch @@ -0,0 +1,67 @@ +For cross compilation we need to build the makekeys tool +using the host toolchain, because we need to execute this +tool later in the make process. + +--- configure.ac 2007-07-27 18:02:55.000000000 +0200 ++++ configure.ac.new +@@ -307,6 +307,17 @@ else + fi + AC_SUBST(XKBPROTO_REQUIRES) + ++AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ]) ++ ++AC_MSG_CHECKING([for CC_FOR_BUILD]) ++if test x$host != x$build ; then ++ CC_FOR_BUILD=${CC_FOR_BUILD-gcc} ++else ++ CC_FOR_BUILD=${CC} ++fi ++AC_MSG_RESULT([$CC_FOR_BUILD]) ++AC_SUBST(CC_FOR_BUILD) ++ + AC_FUNC_MMAP() + composecache_default=$ac_cv_func_mmap_fixed_mapped + AC_CHECK_FUNC(nl_langinfo, , [composecache_default=no]) + + +--- src/util/Makefile.am 2007-05-16 17:34:44.000000000 +0200 ++++ src/util/Makefile.am.new 2008-09-14 15:50:53.000000000 +0200 +@@ -1,11 +1,16 @@ + # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $ + +-noinst_PROGRAMS=makekeys ++noinst_PROGRAMS=makekeys$(EXEEXT) $(MAKEKEYS_PROG) + + makekeys_CFLAGS=$(X11_CFLAGS) + +-#override CC = gcc +-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++if CROSS_COMPILING ++MAKEKEYS_PROG=xmakekeys$(EXEEXT) ++ ++xmakekeys$(EXEEXT): makekeys.c ++ $(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \ ++ $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makekeys.c ++endif + + EXTRA_DIST = mkks.sh + + +--- src/Makefile.am 2008-09-14 15:53:27.000000000 +0200 ++++ src/Makefile.am.new 2008-09-14 15:56:19.000000000 +0200 +@@ -408,8 +408,14 @@ + + KEYSYMDEF=@KEYSYMDEF@ + ++if CROSS_COMPILING ++MAKEKEYS=$(top_builddir)/src/util/xmakekeys ++else ++MAKEKEYS=$(top_builddir)/src/util/makekeys ++endif ++ + ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT) +- $(top_builddir)/src/util/makekeys < $(KEYSYMDEF) > ks_tables_h ++ $(MAKEKEYS) < $(KEYSYMDEF) > ks_tables_h + mv ks_tables_h $@ + + $(top_builddir)/src/util/makekeys$(EXEEXT): force diff --git a/x11-libs/libX11/files/libX11-1.1.3-xcb-locking.patch b/x11-libs/libX11/files/libX11-1.1.3-xcb-locking.patch new file mode 100644 index 0000000..78845d3 --- /dev/null +++ b/x11-libs/libX11/files/libX11-1.1.3-xcb-locking.patch @@ -0,0 +1,28 @@ +commit e02e4ccafcaf3eb8993152dfcbfbee0240ea2db2 +Author: Adam Jackson <ajax@redhat.com> +Date: Sun Feb 24 20:00:43 2008 -0500 + + Bug #14029: Don't LockDisplay() recursively. + + See also Red Hat bugzilla #326461. + +diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c +index e190d00..4dc9265 100644 +--- a/src/xkb/XKBBind.c ++++ b/src/xkb/XKBBind.c +@@ -368,7 +368,6 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event) + changes= xkbi->changes; + else bzero(&changes,sizeof(changes)); + XkbNoteMapChanges(&changes,event,XKB_XLIB_MAP_MASK); +- LockDisplay(dpy); + if ((rtrn=XkbGetMapChanges(dpy,xkbi->desc,&changes))!=Success) { + #ifdef DEBUG + fprintf(stderr,"Internal Error! XkbGetMapChanges failed:\n"); +@@ -379,7 +378,6 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event) + xkbi->flags&= ~XkbMapPending; + bzero(&xkbi->changes,sizeof(XkbMapChangesRec)); + } +- UnlockDisplay(dpy); + return rtrn; + } + return BadMatch;
\ No newline at end of file diff --git a/x11-libs/libX11/libX11-1.1.3-r1.ebuild b/x11-libs/libX11/libX11-1.1.3-r1.ebuild new file mode 100644 index 0000000..3000fd8 --- /dev/null +++ b/x11-libs/libX11/libX11-1.1.3-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.1.3-r1.ebuild,v 1.1 2008/02/28 19:39:20 cardoe Exp $ + +# Must be before x-modular eclass is inherited +#SNAPSHOT="yes" + +inherit x-modular + +DESCRIPTION="X.Org X11 library" + +KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="ipv6 xcb" +RDEPEND=">=x11-libs/xtrans-1.0.1 + x11-libs/libXau + x11-libs/libXdmcp + x11-proto/kbproto + >=x11-proto/xproto-7.0.6 + xcb? ( >=x11-libs/libxcb-1.0 )" +DEPEND="${RDEPEND} + x11-proto/xf86bigfontproto + x11-proto/bigreqsproto + x11-proto/inputproto + x11-proto/xextproto + x11-proto/xcmiscproto + >=x11-misc/util-macros-0.99.0_p20051007" + +CONFIGURE_OPTIONS="$(use_enable ipv6) + $(use_with xcb)" +# xorg really doesn't like xlocale disabled. +# $(use_enable nls xlocale) + +PATCHES="${FILESDIR}/libX11-1.1.3-xcb-locking.patch" + +src_unpack() { + x-modular_src_unpack || die 'x-modular_src_unpack failed' + + # If the system is crosscompiled we need a 'host' version of makekeys. + # So we patch the autoconf/automake files to detect cross-compilation, + # find the correct compiler and build a xmakekeys, which is used later + # in the build process. + # ATTENTION: We have to do this BEFORE autoconfigure runs! + epatch "${FILESDIR}/libX11-1.1.3-crosscompile-makekeys.patch" || die 'epatch failed' + + eautoreconf || die 'eautoreconf failed' +} diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest new file mode 100644 index 0000000..9838956 --- /dev/null +++ b/x11-libs/libXt/Manifest @@ -0,0 +1,4 @@ +AUX crosscompile-configure.ac.patch 658 RMD160 bb8bcde9d855fab9eb6b9d91158bb829aa36f0c0 SHA1 6728dc1a0e7ec9585cf6aac5d541aab86b8e5054 SHA256 ada6b7c4138b278bfe74f49b88c491aaa83fd02e3eb563890cf2a9915106a347 +AUX crosscompile-makestrs.patch 3948 RMD160 c9aff88b260d274ec82cc3f54f33389175c02c03 SHA1 319379b184e7f8919a2ca715828bfc6200d08593 SHA256 282dababc6b9f28a6b852c06f866839b52af03964b8ac37645f1a3ba7bd1aae6 +DIST libXt-1.0.5.tar.bz2 500502 RMD160 7e5ef9e03dc860bf5b64b85a897dd1d2ae1ed0bf SHA1 5f33921e373ce162a39eabef2ce05d946935eb5b SHA256 43c472ada59a04428a463225cd4cd42cb81bc43eb687cc1890f2f1c81a3e9cf4 +EBUILD libXt-1.0.5.ebuild 1041 RMD160 b504964e44e23838c54e6cc4fc01c43fe17998b2 SHA1 0c670983250444f3143f45b07e5869b60a1becfa SHA256 e6d7468695324636b4deac1ab0529d95129a2eedbfe6a23a31973a8e5d7ce2e8 diff --git a/x11-libs/libXt/files/crosscompile-configure.ac.patch b/x11-libs/libXt/files/crosscompile-configure.ac.patch new file mode 100644 index 0000000..c816ea0 --- /dev/null +++ b/x11-libs/libXt/files/crosscompile-configure.ac.patch @@ -0,0 +1,29 @@ +--- configure.ac 2007-01-28 07:27:22.000000000 +0100 ++++ configure.ac.new 2008-09-13 12:51:52.000000000 +0200 +@@ -28,6 +28,10 @@ + dnl + dnl + AC_INIT(libXt, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXt) ++ ++AC_CANONICAL_BUILD ++AC_CANONICAL_HOST ++ + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + +@@ -37,6 +41,15 @@ + AC_PROG_CC + AC_PROG_LIBTOOL + ++AC_MSG_CHECKING([for CC_FOR_BUILD]) ++if test x$host != x$build ; then ++ CC_FOR_BUILD=${CC_FOR_BUILD-gcc} ++else ++ CC_FOR_BUILD=${CC} ++fi ++AC_MSG_RESULT([$CC_FOR_BUILD]) ++AC_SUBST(CC_FOR_BUILD) ++ + PKG_CHECK_MODULES(XT, sm x11 xproto kbproto) + + # Needed for including Xalloca.h diff --git a/x11-libs/libXt/files/crosscompile-makestrs.patch b/x11-libs/libXt/files/crosscompile-makestrs.patch new file mode 100644 index 0000000..0bc439c --- /dev/null +++ b/x11-libs/libXt/files/crosscompile-makestrs.patch @@ -0,0 +1,51 @@ +--- util/Makefile.in 2008-09-13 13:51:59.000000000 +0200 ++++ util/Makefile.in.new 2008-09-13 13:55:53.000000000 +0200 +@@ -52,20 +52,16 @@ + makestrs_OBJECTS = $(am_makestrs_OBJECTS) + makestrs_LDADD = $(LDADD) + makestrs_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(makestrs_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++ --mode=link $(CC_FOR_BUILD) $(makestrs_CFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++COMPILE = $(CC_FOR_BUILD) $(DEFS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) ++ --mode=compile $(CC_FOR_BUILD) $(DEFS) ++CCLD = $(CC_FOR_BUILD) + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++ --mode=link $(CC_FOR_BUILD) $(LDFLAGS) -o $@ + SOURCES = $(makestrs_SOURCES) + DIST_SOURCES = $(makestrs_SOURCES) + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +@@ -332,18 +328,18 @@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + makestrs-makestrs.o: makestrs.c +-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.o -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c ++@am__fastdepCC_TRUE@ $(CC_FOR_BUILD) $(DEFS) $(makestrs_CFLAGS) -MT makestrs-makestrs.o -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c + @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/makestrs-makestrs.Tpo $(DEPDIR)/makestrs-makestrs.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c ++@am__fastdepCC_FALSE@ $(CC_FOR_BUILD) $(DEFS) $(makestrs_CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c + + makestrs-makestrs.obj: makestrs.c +-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi` ++@am__fastdepCC_TRUE@ $(CC_FOR_BUILD) $(DEFS) $(makestrs_CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi` + @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/makestrs-makestrs.Tpo $(DEPDIR)/makestrs-makestrs.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi` ++@am__fastdepCC_FALSE@ $(CC_FOR_BUILD) $(DEFS) $(makestrs_CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi` + + mostlyclean-libtool: + -rm -f *.lo diff --git a/x11-libs/libXt/libXt-1.0.5.ebuild b/x11-libs/libXt/libXt-1.0.5.ebuild new file mode 100644 index 0000000..e49bc7c --- /dev/null +++ b/x11-libs/libXt/libXt-1.0.5.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.0.5.ebuild,v 1.12 2007/08/07 13:15:40 gustavoz Exp $ + +# Must be before x-modular eclass is inherited +# SNAPSHOT="yes" + +inherit x-modular flag-o-matic + +DESCRIPTION="X.Org Xt library" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" + +RDEPEND="x11-libs/libX11 + x11-libs/libSM + x11-proto/xproto + x11-proto/kbproto" +DEPEND="${RDEPEND}" + +CONFIGURE_OPTIONS="--disable-install-makestrs" +PATCHES="${FILESDIR}/crosscompile-configure.ac.patch" + +pkg_setup() { + # No such function yet + # x-modular_pkg_setup + + # (#125465) Broken with Bdirect support + filter-flags -Wl,-Bdirect + filter-ldflags -Bdirect + filter-ldflags -Wl,-Bdirect +} + +src_unpack() { + x-modular_src_unpack || die 'x-modular_src_unpack failed' + eautoreconf || die 'eautoreconf failed' + epatch "${FILESDIR}/crosscompile-makestrs.patch" || die 'epatch failed' +} diff --git a/x11-libs/tslib/Manifest b/x11-libs/tslib/Manifest new file mode 100644 index 0000000..af2ca0e --- /dev/null +++ b/x11-libs/tslib/Manifest @@ -0,0 +1,6 @@ +AUX tslib-1.0-UnknownEventType0.patch 272 RMD160 343925cc4c17a3660fc5b50735ddb58c83be451f SHA1 be1bf068009e08171f28b519a7e38800a4d912ba SHA256 d3102fcc61425c3845cbc5698a6e78967d2824a28781b22c24e91ddbc8d602b4 +AUX tslib-1.0-correct-libversion.patch 679 RMD160 9c0beb6189b99800d2374cd2ce0439041b28781a SHA1 2b03669009b4d01b61156f538b102dae08afc2d3 SHA256 605407dbfb3b8ef42e85319554286b0c2ea6d519dddc9140ef6f15fab71cd314 +DIST tslib-1.0-patches-1.tar.bz2 7541 RMD160 64f655a04a350cf78a504412e582574d6dacc7a6 SHA1 0b62c07291f9ef8795c703b14664e9f633f9ef44 SHA256 bd2198e1c3b20e0f7fa5a11e42177cb6b0dd7793045ab6994212ae1b0635093e +DIST tslib-1.0.tar.bz2 47522 RMD160 3c32f6696af70fc099ad25c95d6157763d2b7412 SHA1 2008fcb9cca6a59fa268235cd335f5f6cbcda83d SHA256 9c40d914e4f6fe00bdd77137d671c7ce4f211686228f2eb8b2d3c2360bc249c8 +EBUILD tslib-1.0.ebuild 1574 RMD160 59729a5f83b5a7c9d46fcd447c2dc3dbde474279 SHA1 aa3268c401a2334137c5312903349c0db31b0fa0 SHA256 e8534534c052e6c2aa65d986675b9a7ca08468570aedfbe448adb1c21a770c00 +EBUILD tslib-9999.ebuild 890 RMD160 52ccb8967102d72d70b240a89b8bcb047243690d SHA1 b226e03cbf4ed15bf5a567623d4e020f61479050 SHA256 3d49d3176a44b376952566f52a8c2afff3b7ddcfe5a61ae8e79f498bb9914a8e diff --git a/x11-libs/tslib/files/tslib-1.0-UnknownEventType0.patch b/x11-libs/tslib/files/tslib-1.0-UnknownEventType0.patch new file mode 100644 index 0000000..f2b4db1 --- /dev/null +++ b/x11-libs/tslib/files/tslib-1.0-UnknownEventType0.patch @@ -0,0 +1,13 @@ +# Patch taken from Tuxxx +--- plugins/input-raw.c 2006-08-24 23:02:54.000000000 +0200 ++++ plugins/input-raw.c.new 2008-09-12 18:43:07.000000000 +0200 +@@ -62,8 +62,7 @@ + return -1; + } + +- if (bit & (1 << EV_SYN)) +- i->using_syn = 1; ++ i->using_syn = 1; + + return 0; + } diff --git a/x11-libs/tslib/files/tslib-1.0-correct-libversion.patch b/x11-libs/tslib/files/tslib-1.0-correct-libversion.patch new file mode 100644 index 0000000..09adb28 --- /dev/null +++ b/x11-libs/tslib/files/tslib-1.0-correct-libversion.patch @@ -0,0 +1,28 @@ +--- configure.ac 2008-11-09 21:10:40.000000000 +0100 ++++ configure.ac.new 2008-11-09 21:12:18.000000000 +0100 +@@ -2,7 +2,7 @@ + # Process this file with autoconf to produce a configure script. + + AC_PREREQ(2.57) +-AC_INIT(tslib, 0.0.2, kergoth@handhelds.org) ++AC_INIT(tslib, 1.0, kergoth@handhelds.org) + # AC_CONFIG_AUX_DIR(config) + AM_INIT_AUTOMAKE(dist-bzip2) + AC_CONFIG_SRCDIR([src/ts_close.c]) +@@ -43,7 +43,6 @@ + + # Checks for library functions. + AC_PROG_GCC_TRADITIONAL +-AC_FUNC_MALLOC + AC_FUNC_MMAP + AC_FUNC_SELECT_ARGTYPES + AC_TYPE_SIGNAL +@@ -193,7 +192,7 @@ + AC_SUBST(TS_CONF) + + # Library versioning +-LT_RELEASE=0.0 ++LT_RELEASE=1.0 + LT_CURRENT=1 + LT_REVISION=1 + LT_AGE=1 diff --git a/x11-libs/tslib/tslib-1.0.ebuild b/x11-libs/tslib/tslib-1.0.ebuild new file mode 100644 index 0000000..63134f2 --- /dev/null +++ b/x11-libs/tslib/tslib-1.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 2008-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/tslib/tslib-1.0.ebuild,v 1.3 2008/10/26 17:31:57 solar Exp $ + +inherit eutils toolchain-funcs autotools + +DESCRIPTION="Touchscreen Access Library" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="" +#extras arctic2 collie corgi h3600 linear-h2200 mk712 ucb1x00" +DEPEND="" +RDEPEND="" +HOMEPAGE="http://tslib.berlios.de/" +SRC_URI="mirror://gentoo/${PN}-${PV}-patches-1.tar.bz2 mirror://berlios/${PN}/${PN}-${PV}.tar.bz2" +SLOT="0" +LICENSE="LGPL-2" + +src_unpack() { + unpack ${A} + cd "${S}" + + # patches come from buildroot + openembedded + suse + epatch "${WORKDIR}"/patches/*.patch + + # correct the version for tslib and disable the check for + # the malloc function to compile for Openmoko Freerunner + epatch "${FILESDIR}"/tslib-1.0-correct-libversion.patch + + # get rid of the nasty 'Unknown event type 0' message + epatch "${FILESDIR}"/tslib-1.0-UnknownEventType0.patch + + eautoreconf +} + +src_compile() { + # compile everything. INSTALL_MASK= what you don't want. + econf --enable-linear --enable-dejitter \ + --enable-variance --enable-pthres \ + --enable-input --enable-shared \ + --enable-arctic2 --enable-collie \ + --enable-corgi --enable-h3600 \ + --enable-linear-h2200 --enable-mk712 \ + --enable-ucb1x00 --disable-debug || die "Configure failed" + + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS NEWS README +} diff --git a/x11-libs/tslib/tslib-9999.ebuild b/x11-libs/tslib/tslib-9999.ebuild new file mode 100644 index 0000000..41ae299 --- /dev/null +++ b/x11-libs/tslib/tslib-9999.ebuild @@ -0,0 +1,35 @@ +# Copyright 2008-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/tslib/tslib-1.0.ebuild,v 1.3 2008/10/26 17:31:57 solar Exp $ + +inherit eutils toolchain-funcs autotools subversion + +DESCRIPTION="Touchscreen Access Library" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="" +#extras arctic2 collie corgi h3600 linear-h2200 mk712 ucb1x00" +DEPEND="" +RDEPEND="" +HOMEPAGE="http://tslib.berlios.de/" +ESVN_REPO_URI="http://svn.berlios.de/svnroot/repos/tslib/trunk/${PN}" +SLOT="0" +LICENSE="LGPL-2" + +src_unpack() { + subversion_src_unpack + + cd "${S}" + + eautoreconf +} + +src_compile() { + econf --disable-debug || die "Configure failed" + + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS NEWS README +} diff --git a/x11-terms/vala-terminal/Manifest b/x11-terms/vala-terminal/Manifest new file mode 100644 index 0000000..ee15de5 --- /dev/null +++ b/x11-terms/vala-terminal/Manifest @@ -0,0 +1 @@ +EBUILD vala-terminal-20081210.ebuild 1049 RMD160 19cc2b05ab1ae3cc19f3939f9a64c72b6e5b3cba SHA1 d2b02889e95191a28c37a07690a4cbc11e19d6ba SHA256 c7029350637f8bd0a4b2653d12181fe6322bb2ec0ef53262db8d517940e40ca2 diff --git a/x11-terms/vala-terminal/vala-terminal-20081210.ebuild b/x11-terms/vala-terminal/vala-terminal-20081210.ebuild new file mode 100644 index 0000000..90447ed --- /dev/null +++ b/x11-terms/vala-terminal/vala-terminal-20081210.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit git autotools + +DESCRIPTION="The FreeSmartPhone.org terminal emulator written in vala." +HOMEPAGE="http://www.freesmartphone.org/" + +EGIT_REPO_URI="git://git.freesmartphone.org/vala-terminal.git" +EGIT_TREE="8def2fcfc86864654c8b614391a446a09ab62e70" +EGIT_PROJECT="vala-terminal" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~arm" +DOCS="README" + +RDEPEND=">=x11-libs/vte-0.16.9 + >=x11-libs/gtk+-2.10.0 + >=dev-libs/glib-2.12.0" +DEPEND="${RDEPEND} + dev-lang/vala" + + +src_unpack() { + # Fetch and unpack current git sources + git_src_unpack + + cd "${S}" + eautoreconf || die "autoreconf failed" + glib-gettextize --force --copy || die "glib-gettextize failed" + intltoolize --force || die "intltoolize failed" +} + +src_compile() { + + econf || die + + if tc-is-cross-compiler; then + emake CC=$(tc-getCC) || die + else + emake || die + fi +} + + +src_install() { + emake DESTDIR="${D}" install || die "emake failed" +} diff --git a/x11-wm/e/Manifest b/x11-wm/e/Manifest new file mode 100644 index 0000000..9a5d376 --- /dev/null +++ b/x11-wm/e/Manifest @@ -0,0 +1,4 @@ +AUX applications.menu 2267 RMD160 812c2384ccbd6e0403c593ca7cd9295f15a22fcd SHA1 5a83b3f38fdf605cbe40809a9b5c70e1e3c62ba1 SHA256 f3d7dda0693bc51be70acb267fb5b5183c9dffc05c37d13cb6b1ced66d1c61f8 +EBUILD e-20081014.ebuild 1441 RMD160 e93e2cee7b3ed55366a54eb7fd61644e6b2cde04 SHA1 97b371a921cec7c54a5a511d5295177fa33ceccd SHA256 2e9ac82dd2cfd450d1868febca88d078502760a4a564271c0c77642589ccb740 +EBUILD e-20081210.ebuild 1626 RMD160 a8c9404bdf805d372f4ba7ccfefc71bb619111fc SHA1 fa8936182419ddee224d08743c2b90e722c9bd7f SHA256 29874c7c3cf911272d7dd7cf668dd467398276ed87846046122c39bcb980cb3d +EBUILD e-20090108.ebuild 1755 RMD160 d2df810d8fe1a9f0fe0908669f84441d1f332821 SHA1 84d4f8d927307fbf7c8982dc1f497c17c0b7d250 SHA256 c99a0b0a945f440efa9b1506d2242de580ae1a2161c0150c155adcb86113f3da diff --git a/x11-wm/e/e-20081014.ebuild b/x11-wm/e/e-20081014.ebuild new file mode 100644 index 0000000..e3837fd --- /dev/null +++ b/x11-wm/e/e-20081014.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="Enlightenment E17 window manager" +HOMEPAGE="http://www.enlightenment.org/" +ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/${PN}" +ESVN_REVISION="r36661" +LICENSE="GPL" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" +IUSE="X alsa dbus nls files" + +inherit autotools subversion + +RDEPEND="dev-libs/eina + x11-libs/ecore + dev-libs/eet + dbus? ( x11-libs/e_dbus ) + X? ( x11-libs/libX11 ) + alsa? ( media-libs/alsa-lib )" + +DEPEND=">=dev-util/pkgconfig-0.9.0 + media-libs/edje" + +S="${WORKDIR}/${PN}" + +pkg_setup() { + if use dbus && ! built_with_use x11-libs/e_dbus hal; then + die "Please rebuild x11-libs/e_dbus with the hal use flag enabled!" + fi +} + +src_unpack() { + subversion_src_unpack + + cd "${S}" + + touch README + touch ABOUT-NLS + autopoint -f || die "autopoint faile" + eautoreconf || die "eautoreconf failed" +} + +src_compile() { + local myconf + + myconf="${myconf} \ + $(use_enable alsa) \ + $(use_enable files) \ + $(use_enable nls) \ + $(use_with X x) \ + --x-includes=${SYSROOT}/usr/X11R6/include \ + --x-libraries=${SYSROOT}/usr/X11R6/lib\ + --with-edje-cc=/usr/bin/edje_cc\ + --with-eet-eet=/usr/bin/eet" + + econf $myconf || die "econf failed" + + emake || die "emake failed" +} + +src_install () { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog COPYING NEWS README +} diff --git a/x11-wm/e/e-20081210.ebuild b/x11-wm/e/e-20081210.ebuild new file mode 100644 index 0000000..496e523 --- /dev/null +++ b/x11-wm/e/e-20081210.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="Enlightenment E17 window manager" +HOMEPAGE="http://www.enlightenment.org/" +ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/${PN}" +ESVN_REVISION="r38100" +LICENSE="GPL" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" +IUSE="X alsa dbus nls files pam" + +inherit autotools subversion + +RDEPEND="dev-libs/eet + =dev-libs/eina-20081211 + =dev-libs/efreet-20081114 + =x11-libs/ecore-20081212 + =x11-libs/evas-20081212 + >=media-libs/edje-0.5.0 + dbus? ( =x11-libs/e_dbus-20081209 ) + X? ( x11-libs/libX11 ) + alsa? ( media-libs/alsa-lib ) + pam? ( sys-libs/pam )" + +DEPEND=">=dev-util/pkgconfig-0.9.0 + media-libs/edje + dev-util/cvs" + +S="${WORKDIR}/${PN}" + +pkg_setup() { + if use dbus && ! built_with_use x11-libs/e_dbus hal; then + die "Please rebuild x11-libs/e_dbus with the hal use flag enabled!" + fi +} + +src_unpack() { + subversion_src_unpack + + cd "${S}" + + touch README + touch ABOUT-NLS + + autopoint -f || die "autopoint failed" + eautoreconf || die "eautoreconf failed" +} + +src_compile() { + local myconf + + myconf="${myconf} \ + $(use_enable alsa) \ + $(use_enable files) \ + $(use_enable nls) \ + $(use_enable pam) \ + $(use_with X x) \ + --x-includes=${SYSROOT}/usr/X11R6/include \ + --x-libraries=${SYSROOT}/usr/X11R6/lib\ + --with-edje-cc=/usr/bin/edje_cc\ + --with-eet-eet=/usr/bin/eet" + + econf $myconf || die "econf failed" + + emake || die "emake failed" +} + +src_install () { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog COPYING NEWS README +} diff --git a/x11-wm/e/e-20090108.ebuild b/x11-wm/e/e-20090108.ebuild new file mode 100644 index 0000000..4838d18 --- /dev/null +++ b/x11-wm/e/e-20090108.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="Enlightenment E17 window manager" +HOMEPAGE="http://www.enlightenment.org/" +ESVN_REPO_URI="http://svn.enlightenment.org/svn/e/trunk/${PN}" +ESVN_REVISION="r38500" +LICENSE="GPL" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" +IUSE="X alsa dbus nls files pam" + +inherit autotools subversion + +RDEPEND="dev-libs/eet + =dev-libs/eina-20090108 + =dev-libs/efreet-20090108 + =x11-libs/ecore-20090108 + =x11-libs/evas-20090108 + >=media-libs/edje-0.5.0 + dbus? ( =x11-libs/e_dbus-20090108 ) + X? ( x11-libs/libX11 ) + alsa? ( media-libs/alsa-lib ) + pam? ( sys-libs/pam )" + +DEPEND=">=dev-util/pkgconfig-0.9.0 + media-libs/edje + dev-util/cvs" + +S="${WORKDIR}/${PN}" + +pkg_setup() { + if use dbus && ! built_with_use x11-libs/e_dbus hal; then + die "Please rebuild x11-libs/e_dbus with the hal use flag enabled!" + fi +} + +src_unpack() { + subversion_src_unpack + + cd "${S}" + + touch README + touch ABOUT-NLS + + autopoint -f || die "autopoint failed" + eautoreconf || die "eautoreconf failed" +} + +src_compile() { + local myconf + + myconf="${myconf} \ + $(use_enable alsa) \ + $(use_enable files) \ + $(use_enable nls) \ + $(use_enable pam) \ + $(use_with X x) \ + --x-includes=${SYSROOT}/usr/X11R6/include \ + --x-libraries=${SYSROOT}/usr/X11R6/lib\ + --with-edje-cc=/usr/bin/edje_cc\ + --with-eet-eet=/usr/bin/eet" + + econf $myconf || die "econf failed" + + emake || die "emake failed" +} + +src_install () { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog COPYING NEWS README + + keepdir /etc/xdg/menus + insinto /etc/xdg/menus + newins "${FILESDIR}/applications.menu" applications.menu + +} diff --git a/x11-wm/e/files/applications.menu b/x11-wm/e/files/applications.menu new file mode 100644 index 0000000..77c6f04 --- /dev/null +++ b/x11-wm/e/files/applications.menu @@ -0,0 +1,105 @@ +<?xml version="1.0"?> +<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://standards.freedesktop.org/menu-spec/menu-1.0.dtd"> +<Menu> + <Name>Applications</Name> + <!-- <Directory>Applications.directory</Directory> --> + + <!-- Read standard .directory and .desktop file locations --> + <DefaultAppDirs>/usr/share/applications</DefaultAppDirs> + <DefaultDirectoryDirs/> + + <Menu> + <Name>Office</Name> + <Directory>Office.directory</Directory> + <Include> + <And> + <Category>Office</Category> + </And> + </Include> + </Menu> + + <Menu> + <Name>Multimedia</Name> + <Directory>Multimedia.directory</Directory> + <Include> + <And> + <Category>AudioVideo</Category> + </And> + </Include> + </Menu> + + <Menu> + <Name>Graphics</Name> + <Directory>Graphics.directory</Directory> + <Include> + <And> + <Category>Graphics</Category> + </And> + </Include> + </Menu> + + <Menu> + <Name>Games</Name> + <Directory>Games.directory</Directory> + <Include> + <And> + <Or> + <Category>Game</Category> + <Category>Games</Category> + </Or> + </And> + </Include> + </Menu> + + <Menu> + <Name>Internet</Name> + <Directory>Internet.directory</Directory> + <Include> + <And> + <Or> + <Category>Internet</Category> + <Category>Network</Category> + </Or> + </And> + </Include> + </Menu> + + <Menu> + <Name>Settings</Name> + <Directory>Settings.directory</Directory> + <Include> + <And> + <Or> + <Category>SystemSettings</Category> + <Category>Settings</Category> + </Or> + <Not> + <Category>System</Category> + </Not> + </And> + </Include> + </Menu> + + <Menu> + <Name>Accessories</Name> + <Directory>Accessories.directory</Directory> + <Include> + <And> + <Or> + <Category>Applications</Category> + <Category>Utility</Category> + </Or> + <Not> + <Category>System</Category> + <Category>Office</Category> + <Category>Internet</Category> + <Category>AudioVideo</Category> + <Category>Graphics</Category> + <Category>Games</Category> + </Not> + </And> + </Include> + </Menu> + +</Menu> + |