* [gentoo-commits] proj/betagarden:master commit in: sys-fs/udev/files/161/, dev-lang/php/files/eblits/, sys-fs/udev/, ...
@ 2011-04-20 17:29 Justin Lecher
0 siblings, 0 replies; only message in thread
From: Justin Lecher @ 2011-04-20 17:29 UTC (permalink / raw
To: gentoo-commits
commit: e27cd69294adc750890430cdeee0d0246f3b448e
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 17:28:56 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 17:28:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=e27cd692
Cleaned ebuilds with higher version in the tree
---
.../rsyslog/files/5-stable/rsyslog-gentoo.conf | 60 --
app-admin/rsyslog/files/5-stable/rsyslog.conf | 14 -
app-admin/rsyslog/files/5-stable/rsyslog.init | 38 --
app-admin/rsyslog/files/5-stable/rsyslog.logrotate | 11 -
app-admin/rsyslog/rsyslog-5.4.0.ebuild | 113 ----
app-admin/rsyslog/rsyslog-5.5.7.ebuild | 113 ----
app-text/ronn/ronn-0.5.ebuild | 31 --
dev-cpp/ctemplate/ctemplate-0.96.ebuild | 60 --
dev-cpp/ctemplate/metadata.xml | 5 -
dev-lang/php/files/20php5-envd | 2 -
dev-lang/php/files/70_mod_php5.conf-apache2 | 14 -
dev-lang/php/files/70_mod_php5.conf-apache2-r1 | 17 -
.../php/files/70_mod_php5_concurr.conf-apache2 | 14 -
.../php/files/70_mod_php5_concurr.conf-apache2-r1 | 17 -
dev-lang/php/files/eblits/common-v1.eblit | 9 -
dev-lang/php/files/eblits/pkg_postinst-v1.eblit | 72 ---
dev-lang/php/files/eblits/pkg_setup-v1.eblit | 28 -
dev-lang/php/files/eblits/src_compile-v1.eblit | 60 --
dev-lang/php/files/eblits/src_configure-v52.eblit | 296 ----------
dev-lang/php/files/eblits/src_install-v1.eblit | 156 ------
dev-lang/php/files/eblits/src_prepare-v1.eblit | 70 ---
dev-lang/php/files/eblits/src_test-v1.eblit | 54 --
dev-lang/php/files/php-5.2.12-libpng14.patch | 11 -
dev-lang/php/files/php-fpm.init | 26 -
dev-lang/php/files/php5-ldvs | 1 -
dev-lang/php/php-5.2.14.ebuild | 328 -----------
dev-python/restkit/restkit-1.3.1.ebuild | 19 -
dev-ruby/bundler/bundler-1.0.0.ebuild | 39 --
dev-ruby/mustache/mustache-0.11.1.ebuild | 19 -
net-analyzer/nagios-core/files/99_nagios3.conf | 15 -
net-analyzer/nagios-core/files/conf.d | 10 -
.../nagios-core/files/lighttpd_nagios3-r1.conf | 24 -
.../files/nagios-3.2.3-escalation.patch | 12 -
net-analyzer/nagios-core/files/nagios3 | 57 --
net-analyzer/nagios-core/nagios-core-3.2.3.ebuild | 211 --------
.../glusterfs/files/50glusterfs-mode-gentoo.el | 5 -
.../glusterfs/files/glusterfs-2.0.8-docdir.patch | 51 --
.../files/glusterfs-2.0.8-parallel-make.patch | 11 -
sys-cluster/glusterfs/files/glusterfs.vim | 8 -
sys-cluster/glusterfs/files/glusterfsd.initd-r1 | 58 --
sys-cluster/glusterfs/glusterfs-3.0.4.ebuild | 106 ----
sys-fs/udev/files/161/40-gentoo.rules | 14 -
sys-fs/udev/files/161/90-network.rules | 8 -
sys-fs/udev/files/161/shell-compat-KV.sh | 45 --
sys-fs/udev/files/161/shell-compat-addon.sh | 71 ---
sys-fs/udev/files/161/udev-dev-tarball.initd | 95 ----
sys-fs/udev/files/161/udev-mount.initd | 107 ----
sys-fs/udev/files/161/udev-postmount.initd | 37 --
sys-fs/udev/files/161/udev-start.sh | 55 --
sys-fs/udev/files/161/udev-stop.sh | 13 -
sys-fs/udev/files/161/udev.confd | 64 ---
sys-fs/udev/files/161/udev.initd | 272 ----------
.../udev/files/move_tmp_persistent_rules-112-r1.sh | 25 -
sys-fs/udev/files/net-130-r1.sh | 34 --
sys-fs/udev/files/pnp-aliases | 17 -
sys-fs/udev/files/write_root_link_rule-125 | 29 -
sys-fs/udev/udev-162.ebuild | 566 --------------------
57 files changed, 0 insertions(+), 3717 deletions(-)
diff --git a/app-admin/rsyslog/files/5-stable/rsyslog-gentoo.conf b/app-admin/rsyslog/files/5-stable/rsyslog-gentoo.conf
deleted file mode 100644
index c25e168..0000000
--- a/app-admin/rsyslog/files/5-stable/rsyslog-gentoo.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-# rsyslog v5: load input modules
-# If you do not load inputs, nothing happens!
-# You may need to set the module load path if modules are not found.
-
-$ModLoad immark.so # provides --MARK-- message capability
-$ModLoad imuxsock.so # provides support for local system logging (e.g. via logger command)
-$ModLoad imklog.so # kernel logging (formerly provided by rklogd)
-
-# Log all kernel messages to the console.
-# Logging much else clutters up the screen.
-#kern.* /dev/console
-
-# Log anything (except mail) of level info or higher.
-# Don't log private authentication messages!
-*.info;mail.none;authpriv.none;cron.none -/var/log/messages
-
-# The authpriv file has restricted access.
-authpriv.* /var/log/secure
-
-# Log all the mail messages in one place.
-mail.* -/var/log/maillog
-
-
-# Log cron stuff
-cron.* -/var/log/cron
-
-# Everybody gets emergency messages
-*.emerg *
-
-# Save news errors of level crit and higher in a special file.
-uucp,news.crit -/var/log/spooler
-
-# Save boot messages also to boot.log
-local7.* /var/log/boot.log
-
-# Remote Logging (we use TCP for reliable delivery)
-# An on-disk queue is created for this action. If the remote host is
-# down, messages are spooled to disk and sent when it is up again.
-#$WorkDirectory /rsyslog/spool # where to place spool files
-#$ActionQueueFileName uniqName # unique name prefix for spool files
-#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible)
-#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
-#$ActionQueueType LinkedList # run asynchronously
-#$ActionResumeRetryCount -1 # infinety retries if host is down
-# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
-#*.* @@remote-host
-
-
-# ######### Receiving Messages from Remote Hosts ##########
-# TCP Syslog Server:
-# provides TCP syslog reception and GSS-API (if compiled to support it)
-#$ModLoad imtcp.so # load module
-# Note: as of now, you need to use the -t command line option to
-# enable TCP reception (e.g. -t514 to run a server at port 514/tcp)
-# This will change in later v3 releases.
-
-# UDP Syslog Server:
-#$ModLoad imudp.so # provides UDP syslog reception
-#$UDPServerRun 514 # start a UDP syslog server at standard port 514
-
diff --git a/app-admin/rsyslog/files/5-stable/rsyslog.conf b/app-admin/rsyslog/files/5-stable/rsyslog.conf
deleted file mode 100644
index 7a9a2a7..0000000
--- a/app-admin/rsyslog/files/5-stable/rsyslog.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# Config file for /etc/init.d/rsyslog for Gentoo Linux
-
-CONFIGFILE="/etc/rsyslog.conf"
-
-PIDFILE="/var/run/rsyslogd.pid"
-
-# Options to rsyslogd
-# See rsyslogd(8) for more details
-# Notes:
-# * Do not specify another PIDFILE but use the variable above to change the location
-# * Do not specify another CONFIGFILE but use the variable above to change the location
-# * "-c5" tells rsyslog to _not_ run in sysklogd compatibility mode
-
-RSYSLOG_OPTS="-c5"
diff --git a/app-admin/rsyslog/files/5-stable/rsyslog.init b/app-admin/rsyslog/files/5-stable/rsyslog.init
deleted file mode 100644
index 3b09da6..0000000
--- a/app-admin/rsyslog/files/5-stable/rsyslog.init
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/3-stable/rsyslog.init,v 1.2 2008/08/14 06:47:38 dev-zero Exp $
-
-opts="reload"
-
-depend() {
- provide logger
-}
-
-start() {
- ebegin "Starting rsyslogd"
- start-stop-daemon \
- --start --quiet --exec /usr/sbin/rsyslogd \
- -- ${RSYSLOG_OPTS} -i "${PIDFILE}" -f "${CONFIGFILE}"
- eend $?
-}
-
-stop() {
- ebegin "Stopping rsyslogd"
- start-stop-daemon \
- --stop --quiet \
- --pidfile "${PIDFILE}"
- eend $?
-}
-
-reload() {
- if [ ! -f "${PIDFILE}" ]; then
- eerror "rsyslogd not running"
- return 1
- fi
-
- ebegin "Reloading configuration and re-opening log files"
- start-stop-daemon --stop --oknodo --signal HUP \
- --pidfile "${PIDFILE}"
- eend $?
-}
diff --git a/app-admin/rsyslog/files/5-stable/rsyslog.logrotate b/app-admin/rsyslog/files/5-stable/rsyslog.logrotate
deleted file mode 100644
index 4477272..0000000
--- a/app-admin/rsyslog/files/5-stable/rsyslog.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/3-stable/rsyslog.logrotate,v 1.1 2008/04/09 17:32:56 dev-zero Exp $
-#
-# Syslog-ng logrotate snippet for Gentoo Linux
-#
-
-/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log {
- sharedscripts
- postrotate
- /etc/init.d/rsyslog reload > /dev/null 2>&1 || true
- endscript
-}
diff --git a/app-admin/rsyslog/rsyslog-5.4.0.ebuild b/app-admin/rsyslog/rsyslog-5.4.0.ebuild
deleted file mode 100644
index a5b4fd5..0000000
--- a/app-admin/rsyslog/rsyslog-5.4.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit autotools
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more."
-HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
-SLOT="0"
-IUSE="relp gnutls kerberos dbi logrotate mysql postgres oracle snmp zlib debug static-libs"
-
-DEPEND="net-libs/libnet
- kerberos? ( virtual/krb5 )
- dbi? ( dev-db/libdbi )
- gnutls? ( net-libs/gnutls )
- mysql? ( virtual/mysql )
- postgres? ( virtual/postgresql-base )
- oracle? ( dev-db/oracle-instantclient-basic )
- relp? ( >=dev-libs/librelp-0.1.1 )
- snmp? ( net-analyzer/net-snmp )
- zlib? ( sys-libs/zlib )
- logrotate? ( app-admin/logrotate )"
-RDEPEND="${DEPEND}"
-PROVIDE="virtual/logger"
-
-BRANCH="5-stable"
-
-# need access to certain device nodes
-RESTRICT="test"
-
-src_configure() {
- # Maintainer notes:
- # * rfc3195 needs a library and development of that library
- # is suspended, so we disable it
- #
- # About the java GUI:
- # The maintainer says there is no real installation support
- # for the java GUI, so we disable it for now.
- econf \
- --disable-gui \
- --disable-rfc3195 \
- --enable-largefile \
- --enable-imdiag \
- --enable-imfile \
- --enable-imtemplate \
- --enable-mail \
- --enable-omprog \
- --enable-omstdout \
- --enable-omudpspoof \
- --enable-omtemplate \
- $(use_enable zlib) \
- $(use_enable mysql) \
- $(use_enable dbi libdbi) \
- $(use_enable postgres pgsql) \
- $(use_enable oracle oracle) \
- $(use_enable gnutls) \
- $(use_enable kerberos gssapi-krb5) \
- $(use_enable relp) \
- $(use_enable snmp) \
- $(use_enable debug) \
- $(use_enable debug rtinst) \
- $(use_enable debug diagtools) \
- $(use_enable debug memcheck) \
- $(use_enable debug valgrind) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc AUTHORS ChangeLog doc/rsyslog-example.conf || die
- dohtml -r doc/*
-
- insinto /etc
- newins "${FILESDIR}/${BRANCH}/rsyslog-gentoo.conf" rsyslog.conf
-
- newconfd "${FILESDIR}/${BRANCH}/rsyslog.conf" rsyslog
- newinitd "${FILESDIR}/${BRANCH}/rsyslog.init" rsyslog
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${BRANCH}/rsyslog.logrotate" rsyslog
-
- if use mysql; then
- insinto /usr/share/doc/${PF}/scripts/mysql
- doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
- fi
-
- if use postgres; then
- insinto /usr/share/doc/${PF}/scripts/pgsql
- doins plugins/ompgsql/createDB.sql
- fi
-}
-
-pkg_postinst() {
- echo
- if use mysql || use postgres; then
- einfo "SQL scripts to create the tables for MySQL or PostgreSQL have been installed to:"
- einfo " /usr/share/doc/${PF}/scripts"
- echo
- fi
-
- if use gnutls; then
- einfo "To encrypt syslog traffic with TLS (SSL), read:"
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
- echo
- fi
-}
diff --git a/app-admin/rsyslog/rsyslog-5.5.7.ebuild b/app-admin/rsyslog/rsyslog-5.5.7.ebuild
deleted file mode 100644
index a5b4fd5..0000000
--- a/app-admin/rsyslog/rsyslog-5.5.7.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit autotools
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more."
-HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
-SLOT="0"
-IUSE="relp gnutls kerberos dbi logrotate mysql postgres oracle snmp zlib debug static-libs"
-
-DEPEND="net-libs/libnet
- kerberos? ( virtual/krb5 )
- dbi? ( dev-db/libdbi )
- gnutls? ( net-libs/gnutls )
- mysql? ( virtual/mysql )
- postgres? ( virtual/postgresql-base )
- oracle? ( dev-db/oracle-instantclient-basic )
- relp? ( >=dev-libs/librelp-0.1.1 )
- snmp? ( net-analyzer/net-snmp )
- zlib? ( sys-libs/zlib )
- logrotate? ( app-admin/logrotate )"
-RDEPEND="${DEPEND}"
-PROVIDE="virtual/logger"
-
-BRANCH="5-stable"
-
-# need access to certain device nodes
-RESTRICT="test"
-
-src_configure() {
- # Maintainer notes:
- # * rfc3195 needs a library and development of that library
- # is suspended, so we disable it
- #
- # About the java GUI:
- # The maintainer says there is no real installation support
- # for the java GUI, so we disable it for now.
- econf \
- --disable-gui \
- --disable-rfc3195 \
- --enable-largefile \
- --enable-imdiag \
- --enable-imfile \
- --enable-imtemplate \
- --enable-mail \
- --enable-omprog \
- --enable-omstdout \
- --enable-omudpspoof \
- --enable-omtemplate \
- $(use_enable zlib) \
- $(use_enable mysql) \
- $(use_enable dbi libdbi) \
- $(use_enable postgres pgsql) \
- $(use_enable oracle oracle) \
- $(use_enable gnutls) \
- $(use_enable kerberos gssapi-krb5) \
- $(use_enable relp) \
- $(use_enable snmp) \
- $(use_enable debug) \
- $(use_enable debug rtinst) \
- $(use_enable debug diagtools) \
- $(use_enable debug memcheck) \
- $(use_enable debug valgrind) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc AUTHORS ChangeLog doc/rsyslog-example.conf || die
- dohtml -r doc/*
-
- insinto /etc
- newins "${FILESDIR}/${BRANCH}/rsyslog-gentoo.conf" rsyslog.conf
-
- newconfd "${FILESDIR}/${BRANCH}/rsyslog.conf" rsyslog
- newinitd "${FILESDIR}/${BRANCH}/rsyslog.init" rsyslog
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${BRANCH}/rsyslog.logrotate" rsyslog
-
- if use mysql; then
- insinto /usr/share/doc/${PF}/scripts/mysql
- doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
- fi
-
- if use postgres; then
- insinto /usr/share/doc/${PF}/scripts/pgsql
- doins plugins/ompgsql/createDB.sql
- fi
-}
-
-pkg_postinst() {
- echo
- if use mysql || use postgres; then
- einfo "SQL scripts to create the tables for MySQL or PostgreSQL have been installed to:"
- einfo " /usr/share/doc/${PF}/scripts"
- echo
- fi
-
- if use gnutls; then
- einfo "To encrypt syslog traffic with TLS (SSL), read:"
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
- echo
- fi
-}
diff --git a/app-text/ronn/ronn-0.5.ebuild b/app-text/ronn/ronn-0.5.ebuild
deleted file mode 100644
index 7fe0395..0000000
--- a/app-text/ronn/ronn-0.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-USE_RUBY="ruby18"
-inherit ruby-fakegem
-
-DESCRIPTION="Creates man pages from a subset of Markdown"
-HOMEPAGE="http://rtomayko.github.com/ronn/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=">=dev-ruby/hpricot-0.8.2"
-RDEPEND="${DEPEND}"
-
-src_install() {
- ruby-ng_src_install
- cd all/${P} || die 'cd failed'
-
- doman man/*.[1-9] || die 'doman failed'
-
- insinto /usr/share/${PF}/samples
- doins man/*.ronn || die 'doins failed'
-
- dodoc README.md
-}
diff --git a/dev-cpp/ctemplate/ctemplate-0.96.ebuild b/dev-cpp/ctemplate/ctemplate-0.96.ebuild
deleted file mode 100644
index a655339..0000000
--- a/dev-cpp/ctemplate/ctemplate-0.96.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ctemplate/ctemplate-0.95.ebuild,v 1.1 2009/07/22 14:16:47 dev-zero Exp $
-
-EAPI="2"
-
-inherit elisp-common
-
-DESCRIPTION="A simple but powerful template language for C++"
-HOMEPAGE="http://code.google.com/p/google-ctemplate/"
-SRC_URI="http://google-ctemplate.googlecode.com/files/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs vim-syntax"
-
-DEPEND=""
-RDEPEND="vim-syntax? ( >=app-editors/vim-core-7 )
- emacs? ( virtual/emacs )"
-
-SITEFILE="70ctemplate-gentoo.el"
-
-src_compile() {
- emake || die "emake failed"
-
- if use emacs ; then
- elisp-compile contrib/tpl-mode.el || die "elisp-compile failed"
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- # Installs just every piece
- rm -rf "${D}/usr/share/doc"
-
- dodoc AUTHORS ChangeLog NEWS README
- dohtml doc/*
-
- if use vim-syntax ; then
- cd "${S}/contrib"
- sh highlighting.vim || die "unpacking vim scripts failed"
- insinto /usr/share/vim/vimfiles
- doins -r .vim/*
- fi
-
- if use emacs ; then
- cd "${S}/contrib"
- elisp-install ${PN} tpl-mode.el tpl-mode.elc || die "elisp-install failed"
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-cpp/ctemplate/metadata.xml b/dev-cpp/ctemplate/metadata.xml
deleted file mode 100644
index 8434377..0000000
--- a/dev-cpp/ctemplate/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>cpp</herd>
-</pkgmetadata>
diff --git a/dev-lang/php/files/20php5-envd b/dev-lang/php/files/20php5-envd
deleted file mode 100644
index f6033ae..0000000
--- a/dev-lang/php/files/20php5-envd
+++ /dev/null
@@ -1,2 +0,0 @@
-MANPATH="/usr/lib/php5/man/"
-CONFIG_PROTECT_MASK="/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache2-php5/ext-active/"
diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2 b/dev-lang/php/files/70_mod_php5.conf-apache2
deleted file mode 100644
index 7ec8739..0000000
--- a/dev-lang/php/files/70_mod_php5.conf-apache2
+++ /dev/null
@@ -1,14 +0,0 @@
-<IfDefine PHP5>
- # Load the module first
- <IfModule !mod_php5.c>
- LoadModule php5_module modules/libphp5.so
- </IfModule>
-
- # Set it to handle the files
- <IfModule mod_mime.c>
- AddHandler application/x-httpd-php .php .php5 .phtml
- AddHandler application/x-httpd-php-source .phps
- </IfModule>
-
- DirectoryIndex index.php index.phtml
-</IfDefine>
diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2-r1 b/dev-lang/php/files/70_mod_php5.conf-apache2-r1
deleted file mode 100644
index 50911ad..0000000
--- a/dev-lang/php/files/70_mod_php5.conf-apache2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-<IfDefine PHP5>
- # Load the module first
- <IfModule !mod_php5.c>
- LoadModule php5_module modules/libphp5.so
- </IfModule>
-
- # Set it to handle the files
- <FilesMatch "\.ph(p5?|tml)$">
- SetHandler application/x-httpd-php
- </FilesMatch>
-
- <FilesMatch "\.phps$">
- SetHandler application/x-httpd-php-source
- </FilesMatch>
-
- DirectoryIndex index.php index.phtml
-</IfDefine>
diff --git a/dev-lang/php/files/70_mod_php5_concurr.conf-apache2 b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2
deleted file mode 100644
index 7ec8739..0000000
--- a/dev-lang/php/files/70_mod_php5_concurr.conf-apache2
+++ /dev/null
@@ -1,14 +0,0 @@
-<IfDefine PHP5>
- # Load the module first
- <IfModule !mod_php5.c>
- LoadModule php5_module modules/libphp5.so
- </IfModule>
-
- # Set it to handle the files
- <IfModule mod_mime.c>
- AddHandler application/x-httpd-php .php .php5 .phtml
- AddHandler application/x-httpd-php-source .phps
- </IfModule>
-
- DirectoryIndex index.php index.phtml
-</IfDefine>
diff --git a/dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1 b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1
deleted file mode 100644
index cd1c380..0000000
--- a/dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-<IfDefine PHP5>
- # Load the module first
- <IfModule !mod_php5.c>
- LoadModule php5_module modules/libphp5.so
- </IfModule>
-
- # Set it to handle the files
- <FilesMatch "\.ph(p5?|tml)$">
- SetHandler application/x-httpd-php5
- </FilesMatch>
-
- <FilesMatch "\.phps$">
- SetHandler application/x-httpd-php5-source
- </FilesMatch>
-
- DirectoryIndex index.php index.phtml
-</IfDefine>
diff --git a/dev-lang/php/files/eblits/common-v1.eblit b/dev-lang/php/files/eblits/common-v1.eblit
deleted file mode 100644
index ae21475..0000000
--- a/dev-lang/php/files/eblits/common-v1.eblit
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/common-v1.eblit,v 1.2 2010/10/08 18:25:10 olemarkus Exp $
-
-php_set_ini_dir() {
- PHP_INI_DIR="/etc/php/${1}-php${SLOT}"
- PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
- PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
diff --git a/dev-lang/php/files/eblits/pkg_postinst-v1.eblit b/dev-lang/php/files/eblits/pkg_postinst-v1.eblit
deleted file mode 100644
index 3441735..0000000
--- a/dev-lang/php/files/eblits/pkg_postinst-v1.eblit
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v1.eblit,v 1.1 2010/05/27 23:05:04 mabi Exp $
-
-eblit-php-pkg_postinst() {
- # Output some general info to the user
- if use apache2 ; then
- APACHE2_MOD_DEFINE="PHP${PHP_MV}"
- if use concurrentmodphp ; then
- APACHE2_MOD_CONF="70_mod_php${PHP_MV}_concurr"
- else
- APACHE2_MOD_CONF="70_mod_php${PHP_MV}"
- fi
- apache-module_pkg_postinst
- fi
-
- # Update Apache2 to use mod_php
- if use apache2 ; then
- "${ROOT}/usr/sbin/php-select" -t apache2 php${PHP_MV} > /dev/null 2>&1
- exitStatus=$?
- if [[ ${exitStatus} == 2 ]] ; then
- php-select apache2 php${PHP_MV}
- elif [[ ${exitStatus} == 4 ]] ; then
- ewarn "To make Apache2 use php-${PHP_MV}, use"
- ewarn " php-select apache2 php${PHP_MV}"
- ewarn
- fi
- fi
-
- # Create the symlinks for php-cli
- if use cli ; then
- "${ROOT}/usr/sbin/php-select" -t php php${PHP_MV} > /dev/null 2>&1
- exitStatus=$?
- if [[ ${exitStatus} == 5 ]] ; then
- php-select php php${PHP_MV}
- elif [[ ${exitStatus} == 4 ]] ; then
- ewarn "To make usr/bin/php point to php-${PHP_MV}, use"
- ewarn " php-select php php${PHP_MV}"
- ewarn
- fi
- fi
-
- # Create the symlinks for php-cgi
- if use cgi ; then
- "${ROOT}/usr/sbin/php-select" -t php-cgi php${PHP_MV} > /dev/null 2>&1
- exitStatus=$?
- if [[ ${exitStatus} == 5 ]] ; then
- php-select php-cgi php${PHP_MV}
- elif [[ ${exitStatus} == 4 ]] ; then
- ewarn "To make usr/bin/php-cgi point to php-${PHP_MV}, use"
- ewarn " php-select php-cgi php${PHP_MV}"
- ewarn
- fi
- fi
-
- # Create the symlinks for php-devel
- "${ROOT}/usr/sbin/php-select" -t php-devel php${PHP_MV} > /dev/null 2>&1
- exitStatus=$?
- if [[ $exitStatus == 5 ]] ; then
- php-select php-devel php${PHP_MV}
- elif [[ $exitStatus == 4 ]] ; then
- ewarn "To make usr/bin/php-config and usr/bin/phpize point to php-${PHP_MV}, use"
- ewarn " php-select php-devel php${PHP_MV}"
- ewarn
- fi
-
- ewarn "You may have to recompile third-party extensions now"
- ewarn "(includes every dev-php5/pecl-* package and probably others in that category)"
- ewarn
-}
-
-
diff --git a/dev-lang/php/files/eblits/pkg_setup-v1.eblit b/dev-lang/php/files/eblits/pkg_setup-v1.eblit
deleted file mode 100644
index f487a0b..0000000
--- a/dev-lang/php/files/eblits/pkg_setup-v1.eblit
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_setup-v1.eblit,v 1.2 2010/07/08 22:39:52 mabi Exp $
-
-eblit-php-pkg_setup() {
- if use concurrentmodphp || use kolab ; then
- ewarn "concurrentmodphp and kolab are Gentoo-specific experimental"
- ewarn "patches. Before reporting any bugs to bugs.php.net, make sure to"
- ewarn "rebuild PHP with those USE flags disabled"
- ewarn
- fi
-
- # Mail support
- php_check_mta
-
- # imap support
- # if virtuals/imap-c-client goes to new style virtual, we can exchange this
- # for proper use-deps
- php_check_imap
-
- # Oracle support
- php_check_oracle_8
-
- phpconfutils_warn_about_external_deps
- depend.apache_pkg_setup
-}
-
-
diff --git a/dev-lang/php/files/eblits/src_compile-v1.eblit b/dev-lang/php/files/eblits/src_compile-v1.eblit
deleted file mode 100644
index cb0d56c..0000000
--- a/dev-lang/php/files/eblits/src_compile-v1.eblit
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_compile-v1.eblit,v 1.6 2010/08/14 19:37:31 mabi Exp $
-
-eblit-php-src_compile() {
- # snmp seems to run during src_compile, too (bug #324739)
- addpredict /usr/share/snmp/mibs/.index
-
- SAPI_DIR="${WORKDIR}/sapis"
-
- for sapi in ${SAPIS} ; do
- use "${sapi}" || continue
-
- php_sapi_build "${sapi}"
- php_sapi_copy "${sapi}"
- done
-}
-
-php_sapi_build() {
- mkdir -p "${SAPI_DIR}/$1"
-
- cd "${WORKDIR}/sapis-build/$1"
- emake || die "emake failed"
-}
-
-php_sapi_copy() {
- local sapi="$1"
- local source=""
-
- case "$sapi" in
- cli)
- source="sapi/cli/php"
- ;;
- cgi)
- source="sapi/cgi/php-cgi"
- ;;
- fpm)
- source="sapi/fpm/php-fpm"
- ;;
- embed)
- source="libs/libphp${PHP_MV}.so"
- ;;
-
- apache2)
- # apache2 is a special case; the necessary files
- # (yes, multiple) are copied by make install, not
- # by the ebuild; that's the reason, why apache2 has
- # to be the last sapi
- emake INSTALL_ROOT="${SAPI_DIR}/${sapi}/" install-sapi
- ;;
-
- *)
- die "unhandled sapi in php_sapi_copy"
- ;;
- esac
-
- if [[ "${source}" ]] ; then
- cp "$source" "${SAPI_DIR}/$sapi" || die "Unable to copy ${sapi} SAPI"
- fi
-}
diff --git a/dev-lang/php/files/eblits/src_configure-v52.eblit b/dev-lang/php/files/eblits/src_configure-v52.eblit
deleted file mode 100644
index 421af93..0000000
--- a/dev-lang/php/files/eblits/src_configure-v52.eblit
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v52.eblit,v 1.5 2010/09/19 15:15:08 mabi Exp $
-
-eblit-php-src_configure() {
- export CFLAGS="${CFLAGS} -D_GNU_SOURCE"
- PHP_DESTDIR="/usr/$(get_libdir)/php${SLOT}"
-
- # This is a global variable and should be in caps. It isn't because the
- # phpconfutils eclass relies on exactly this name...
- my_conf="
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}"/man
- --infodir="${PHP_DESTDIR}"/info
- --libdir="${PHP_DESTDIR}"/lib
- --with-libdir=$(get_libdir)
- --without-pear
- $(use_enable threads maintainer-zts)"
-
- phpconfutils_init
-
- # extension USE flag shared
- phpconfutils_extension_enable "bcmath" "bcmath" 1
- phpconfutils_extension_with "bz2" "bzip2" 1
- phpconfutils_extension_enable "calendar" "calendar" 1
- phpconfutils_extension_disable "ctype" "ctype" 0
- phpconfutils_extension_with "curl" "curl" 1
- phpconfutils_extension_with "curlwrappers" "curlwrappers" 0
- phpconfutils_extension_enable "dbase" "dbase" 1
- phpconfutils_extension_disable "dom" "xml" 0
- phpconfutils_extension_enable "exif" "exif" 1
- phpconfutils_extension_with "fbsql" "frontbase" 1
- phpconfutils_extension_with "fdftk" "fdftk" 1 "/opt/fdftk-6.0"
- phpconfutils_extension_disable "filter" "filter" 0
- phpconfutils_extension_enable "ftp" "ftp" 1
- phpconfutils_extension_with "gettext" "nls" 1
- phpconfutils_extension_with "gmp" "gmp" 1
- phpconfutils_extension_disable "hash" "hash" 0
- phpconfutils_extension_without "iconv" "iconv" 0
- phpconfutils_extension_disable "ipv6" "ipv6" 0
- phpconfutils_extension_disable "json" "json" 0
- phpconfutils_extension_with "kerberos" "kerberos" 0 "/usr"
- phpconfutils_extension_disable "libxml" "xml" 0
- phpconfutils_extension_enable "mbstring" "unicode" 1
- phpconfutils_extension_with "mcrypt" "crypt" 1
- phpconfutils_extension_with "mhash" "mhash" 1
- phpconfutils_extension_with "msql" "msql" 1
- phpconfutils_extension_with "mssql" "mssql" 1
- phpconfutils_extension_with "ncurses" "ncurses" 1
- phpconfutils_extension_with "openssl" "ssl" 0
- phpconfutils_extension_with "openssl-dir" "ssl" 0 "/usr"
- phpconfutils_extension_enable "pcntl" "pcntl" 1
- phpconfutils_extension_without "pcre-regex" "pcre" 0
- phpconfutils_extension_disable "pdo" "pdo" 0
- phpconfutils_extension_with "pgsql" "postgres" 1
- phpconfutils_extension_disable "posix" "posix" 0
- phpconfutils_extension_with "pspell" "spell" 1
- phpconfutils_extension_with "recode" "recode" 1
- phpconfutils_extension_disable "reflection" "reflection" 0
- phpconfutils_extension_disable "simplexml" "simplexml" 0
- phpconfutils_extension_enable "shmop" "sharedmem" 0
- phpconfutils_extension_with "snmp" "snmp" 1
- phpconfutils_extension_enable "soap" "soap" 1
- phpconfutils_extension_enable "sockets" "sockets" 1
- phpconfutils_extension_disable "spl" "spl" 0
- phpconfutils_extension_with "sybase-ct" "sybase-ct" 1
- phpconfutils_extension_enable "sysvmsg" "sysvipc" 1
- phpconfutils_extension_enable "sysvsem" "sysvipc" 1
- phpconfutils_extension_enable "sysvshm" "sysvipc" 1
- phpconfutils_extension_with "tidy" "tidy" 1
- phpconfutils_extension_disable "tokenizer" "tokenizer" 0
- phpconfutils_extension_enable "wddx" "wddx" 1
- phpconfutils_extension_disable "xml" "xml" 0
- phpconfutils_extension_disable "xmlreader" "xmlreader" 0
- phpconfutils_extension_disable "xmlwriter" "xmlwriter" 0
- phpconfutils_extension_with "xmlrpc" "xmlrpc" 1
- phpconfutils_extension_with "xsl" "xsl" 1
- phpconfutils_extension_enable "zip" "zip" 1
- phpconfutils_extension_with "zlib" "zlib" 1
- phpconfutils_extension_enable "debug" "debug" 0
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm ; then
- my_conf="${my_conf} --enable-dba${shared}"
- fi
-
- # DBA drivers support
- phpconfutils_extension_with "cdb" "cdb" 0
- phpconfutils_extension_with "db4" "berkdb" 0
- phpconfutils_extension_enable "flatfile" "flatfile" 0
- phpconfutils_extension_with "gdbm" "gdbm" 0
- phpconfutils_extension_enable "inifile" "inifile" 0
- phpconfutils_extension_with "qdbm" "qdbm" 0
-
- # Support for the GD graphics library
- if use gd-external ; then
- phpconfutils_extension_with "freetype-dir" "truetype" 0 "/usr"
- phpconfutils_extension_with "t1lib" "truetype" 0 "/usr"
- phpconfutils_extension_enable "gd-jis-conv" "cjk" 0
- phpconfutils_extension_with "gd" "gd-external" 1 "/usr"
- else
- phpconfutils_extension_with "freetype-dir" "truetype" 0 "/usr"
- phpconfutils_extension_with "t1lib" "truetype" 0 "/usr"
- phpconfutils_extension_enable "gd-jis-conv" "cjk" 0
- phpconfutils_extension_with "jpeg-dir" "gd" 0 "/usr"
- phpconfutils_extension_with "png-dir" "gd" 0 "/usr"
- phpconfutils_extension_with "xpm-dir" "xpm" 0 "/usr"
- # enable gd last, so configure can pick up the previous settings
- phpconfutils_extension_with "gd" "gd" 0
- fi
-
- # IMAP support
- if use imap ; then
- phpconfutils_extension_with "imap" "imap" 1
- phpconfutils_extension_with "imap-ssl" "ssl" 0
- fi
-
- phpconfutils_extension_with "interbase" "interbase" 0 "/opt"
- phpconfutils_extension_with "interbase" "firebird" 0 "/usr"
-
- # LDAP support
- if use ldap ; then
- if use oci8 ; then
- phpconfutils_extension_with "ldap" "ldap" 1 "${ORACLE_HOME}"
- else
- phpconfutils_extension_with "ldap" "ldap" 1
- phpconfutils_extension_with "ldap-sasl" "ldap-sasl" 0
- fi
- fi
-
- # MySQL support
- if use mysql ; then
- phpconfutils_extension_with "mysql" "mysql" 1 "/usr"
- phpconfutils_extension_with "mysql-sock" "mysql" 0 "/var/run/mysqld/mysqld.sock"
- fi
-
- # MySQLi support
- phpconfutils_extension_with "mysqli" "mysqli" 1 "/usr/bin/mysql_config"
-
- # ODBC support
- if use odbc ; then
- phpconfutils_extension_with "unixODBC" "odbc" 1 "/usr"
- phpconfutils_extension_with "adabas" "adabas" 1
- phpconfutils_extension_with "birdstep" "birdstep" 1
- phpconfutils_extension_with "dbmaker" "dbmaker" 1
- phpconfutils_extension_with "empress" "empress" 1
- if use empress ; then
- phpconfutils_extension_with "empress-bcs" "empress-bcs" 0
- fi
- phpconfutils_extension_with "esoob" "esoob" 1
- # Needed to run conftest for IBM DB2
- [[ -n ${DB2_HOME} ]] && export LD_LIBRARY_PATH="${DB2_HOME}/`get_libdir`"
- phpconfutils_extension_with "ibm-db2" "db2" 1 "${DB2_HOME}"
- phpconfutils_extension_with "sapdb" "sapdb" 1
- phpconfutils_extension_with "solid" "solid" 1
- fi
-
- if use iodbc ; then
- phpconfutils_extension_with "iodbc" "iodbc" 1 "/usr"
- fi
-
- # Oracle support
- phpconfutils_extension_with "oci8" "oci8" 1
- if use oci8-instant-client ; then
- OCI8IC_PKG="$(best_version dev-db/oracle-instantclient-basic | \
- sed -e 's|dev-db/oracle-instantclient-basic-||g' | \
- sed -e 's|-r.*||g')"
-
- phpconfutils_extension_with "oci8" "oci8-instant-client" 1 \
- "instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib"
- fi
-
- # PDO support
- if use pdo ; then
- phpconfutils_extension_with "pdo-dblib" "mssql" 1
- phpconfutils_extension_with "pdo-mysql" "mysql" 1 "/usr"
- phpconfutils_extension_with "pdo-pgsql" "postgres" 1
- phpconfutils_extension_with "pdo-sqlite" "sqlite" 1 "/usr"
- phpconfutils_extension_with "pdo-odbc" "odbc" 1 "unixODBC,/usr"
- if use oci8 ; then
- phpconfutils_extension_with "pdo-oci" "oci8" 1
- fi
- if use oci8-instant-client ; then
- phpconfutils_extension_with "pdo-oci" "oci8-instant-client" 1 \
- "instantclient,/usr,${OCI8IC_PKG}"
- fi
- fi
-
- # readline/libedit support
- phpconfutils_extension_with "readline" "readline" 0
- phpconfutils_extension_with "libedit" "libedit" 0
-
- # Session support
- if use session ; then
- phpconfutils_extension_with "mm" "sharedmem" 0
- else
- phpconfutils_extension_disable "session" "session" 0
- fi
-
- # SQLite support
- if use sqlite ; then
- phpconfutils_extension_with "sqlite" "sqlite" 0 "/usr"
- phpconfutils_extension_enable "sqlite-utf8" "unicode" 0
- else
- phpconfutils_extension_without "sqlite" "sqlite" 0
- fi
-
- if use pic ; then
- my_conf="${my_conf} --with-pic"
- fi
-
- # we use the system copy of pcre
- # --with-pcre-regex affects ext/pcre
- # --with-pcre-dir affects ext/filter and ext/zip
- if use pcre ; then
- my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr"
- fi
-
- # Catch CFLAGS problems
- php_check_cflags
-
- # Support user-passed configuration parameters
- my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
- if use apache2 ; then
- # Concurrent PHP Apache2 modules support
- if use concurrentmodphp ; then
- append-ldflags "-Wl,--version-script=${FILESDIR}/php${PHP_MV}-ldvs"
- fi
- fi
-
- mkdir -p "${WORKDIR}/sapis-build"
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
- cd "${WORKDIR}/sapis-build/${one_sapi}"
-
- sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
- --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|embed)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --enable-${sapi}"
- else
- sapi_conf="${sapi_conf} --disable-${sapi}"
- fi
- ;;
-
- fpm)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} \
- --with-fpm \
- --with-libevent=shared,/usr/lib \
- --with-fpm-conf=/etc/php/fpm-php5/php-fpm.conf \
- --with-fpm-user=php-fpm \
- --with-fpm-group=php-fpm \
- --with-fpm-log=/var/log/php-fpm.log \
- --with-fpm-pid=/var/run/php-fpm.pid"
- sapi_conf+=" --enable-cgi --enable-fastcgi"
- use discard-path && sapi_conf+=" --enable-discard-path"
- use force-cgi-redirect && sapi_conf+=" --enable-force-cgi-redirect"
- else
- sapi_conf+=" --without-fpm"
- fi
- ;;
-
- cgi)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=" --enable-cgi --enable-fastcgi"
- use discard-path && sapi_conf+=" --enable-discard-path"
- use force-cgi-redirect && sapi_conf+=" --enable-force-cgi-redirect"
- else
- sapi_conf+=" --disable-${sapi}"
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs"
- else
- sapi_conf="${sapi_conf} --without-apxs2"
- fi
- ;;
- esac
- done
-
- econf ${sapi_conf}
- done
-}
diff --git a/dev-lang/php/files/eblits/src_install-v1.eblit b/dev-lang/php/files/eblits/src_install-v1.eblit
deleted file mode 100644
index 4ec1324..0000000
--- a/dev-lang/php/files/eblits/src_install-v1.eblit
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v 1.10 2010/08/11 19:13:32 mabi Exp $
-
-eblit-php-src_install() {
- # see bug #324739 for what happens when we don't have that
- addpredict /usr/share/snmp/mibs/.index
-
- # grab the first SAPI that got built and install common files from there
- local first_sapi=""
- for sapi in $SAPIS ; do
- if use $sapi ; then
- first_sapi=$sapi
- break
- fi
- done
-
- # Makefile forgets to create this before trying to write to it...
- dodir "${PHP_DESTDIR}/bin"
-
- # Install php environment (without any sapis)
- cd "${WORKDIR}/sapis-build/$first_sapi"
- emake INSTALL_ROOT="${D}" \
- install-build install-headers install-programs \
- || die "emake install failed"
-
- local extension_dir="$("${D}/${PHP_DESTDIR}/bin/php-config" --extension-dir)"
-
- # And install the modules to it
- if use sharedext ; then
- insinto "${extension_dir}"
- doins "${WORKDIR}/sapis-build/${first_sapi}/modules/"*.so
- fi
-
- # Generate the USE file for PHP
- phpconfutils_generate_usefile
-
- # Create the directory where we'll put version-specific php scripts
- keepdir /usr/share/php${PHP_MV}
-
- local sapi="", file=""
- local sapi_list=""
-
- for sapi in ${SAPIS}; do
- if use "${sapi}" ; then
- einfo "Installing SAPI: ${sapi}"
- cd "${WORKDIR}/sapis-build/${sapi}"
- # needed each time, php_install_ini would reset it
- into "${PHP_DESTDIR}"
- file=$(find "${SAPI_DIR}/${sapi}/" -type f | head -n 1)
-
- if [[ "${file: -3}" == ".so" ]]; then
- if [[ "${sapi}" == "apache2" ]]; then
- insinto "${PHP_DESTDIR}/../apache2/modules/"
- newins "${file}" "${file/*\/}"
- else
- dolib.so "${file}" || die "Unable to install ${sapi} sapi"
- fi
- else
- dobin "${file}" || die "Unable to install ${sapi} sapi"
- fi
-
- php_install_ini "${sapi}"
-
- # construct correct SAPI string for php-config
- # thanks to ferringb for the bash voodoo
- if [[ "${sapi}" == "apache2" ]]; then
- sapi_list="${sapi_list:+${sapi_list} }apache2handler"
- else
- sapi_list="${sapi_list:+${sapi_list} }${sapi}"
- fi
- fi
- done
-
- # Install env.d files
- newenvd "${FILESDIR}/20php${PHP_MV}-envd" \
- "20php${PHP_MV}"
- sed -e "s|/lib/|/$(get_libdir)/|g" -i \
- "${D}/etc/env.d/20php${PHP_MV}"
-
- # set php-config variable correctly (bug #278439)
- sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
- "${D}/usr/$(get_libdir)/php5/bin/php-config"
-}
-
-php_install_ini() {
- local phpsapi="${1}"
-
- # work out where we are installing the ini file
- php_set_ini_dir "${phpsapi}"
-
- local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
- cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
- # default to expose_php=Off, bug 300695
- sed -e 's|^expose_php .*|expose_php = Off|g' -i "${phpinisrc}"
-
- # default to /tmp for save_path, bug #282768
- sed -e 's|^;session.save_path .*$|session.save_path = "/tmp"|g' -i "${phpinisrc}"
-
- # Set the extension dir
- sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
- # Set the include path to point to where we want to find PEAR packages
- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:/usr/share/php'${PHP_MV}':/usr/share/php"|' -i "${phpinisrc}"
-
- dodir "${PHP_INI_DIR}"
- insinto "${PHP_INI_DIR}"
- newins "${phpinisrc}" "${PHP_INI_FILE}"
-
- dodir "${PHP_EXT_INI_DIR}"
- dodir "${PHP_EXT_INI_DIR_ACTIVE}"
-
- # Install any extensions built as shared objects
- if use sharedext ; then
- insinto "${PHP_EXT_INI_DIR}"
- for extension in "${D}/${extension_dir}/"*.so ; do
- extension="${extension##*/}"
- inifilename="${extension/.so/.ini}"
- echo "extension=${extension}" > "${WORKDIR}/sapis-build/${phpsapi}/modules/$inifilename"
- doins "${WORKDIR}/sapis-build/${phpsapi}/modules/$inifilename"
- dosym "${PHP_EXT_INI_DIR}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE}/${inifilename}"
- done
- fi
-
- # SAPI-specific handling
- if [[ "${sapi}" == "apache2" ]] ; then
- if use concurrentmodphp ; then
- einfo "Installing Apache2 config file 70_mod_php${PHP_MV}_concurr.conf"
- insinto "${APACHE_MODULES_CONFDIR}"
- newins "${FILESDIR}/70_mod_php${PHP_MV}_concurr.conf-apache2" \
- "70_mod_php${PHP_MV}_concurr.conf"
-
- # Put the ld version script in the right place so
- # it's always accessible
- insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/"
- doins "${FILESDIR}/php${PHP_MV}-ldvs"
- else
- einfo "Installing Apache2 config 70_mod_php${PHP_MV}.conf"
- insinto ${APACHE_MODULES_CONFDIR}
- newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
- "70_mod_php${PHP_MV}.conf"
- fi
- fi
-
- if [[ "${sapi}" == "fpm" ]] ; then
- einfo "Installing FPM CGI config file php-fpm.conf"
- insinto ${PHP_INI_DIR}
- newins "${WORKDIR}/sapis-build/fpm/sapi/fpm/php_fpm.conf" "php-fpm.conf"
- dodir "/etc/init.d"
- insinto "/etc/init.d"
- newins "${FILESDIR}/php-fpm.init" "php-fpm"
- fperms 755 "/etc/init.d/php-fpm"
- dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm"
- fi
-}
diff --git a/dev-lang/php/files/eblits/src_prepare-v1.eblit b/dev-lang/php/files/eblits/src_prepare-v1.eblit
deleted file mode 100644
index d6856b8..0000000
--- a/dev-lang/php/files/eblits/src_prepare-v1.eblit
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v1.eblit,v 1.3 2010/06/01 16:17:05 mabi Exp $
-
-eblit-php-src_prepare() {
- # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
- # ([empty session.save_path]/session_mm_[sapi][gid].sem)
- # there is no easy way to circumvent that, all php calls during
- # install use -n, so no php.ini file will be used.
- # As such, this is the easiest way to get around
- addpredict /session_mm_cli250.sem
- addpredict /session_mm_cli0.sem
-
- # Concurrent PHP Apache2 modules support
- use apache2 && use concurrentmodphp && \
- epatch "${WORKDIR}/${PV}/opt/concurrent_apache_modules.patch"
-
- # kolab support (support for imap annotations)
- use kolab && epatch "${WORKDIR}/${PV}/opt/imap-kolab-annotations.patch"
-
- # Change PHP branding
- sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1${PHP_EXTRA_BRANDING}-pl${PR/r/}-gentoo\2|g" \
- -i configure.in || die "Unable to change PHP branding"
-
- # Apply generic PHP patches
- EPATCH_SOURCE="${WORKDIR}/${PV}/generic" EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch
-
- # Patch PHP to show Gentoo as the server platform
- sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
- -i configure.in || die "Failed to fix server platform name"
-
- # Prevent PHP from activating the Apache config,
- # as we will do that ourselves
- sed -i \
- -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
- -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
- configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
- # Patch PHP to support heimdal instead of mit-krb5
- if has_version "app-crypt/heimdal" ; then
- sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
- || die "Failed to fix heimdal libname"
- sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
- || die "Failed to fix heimdal crypt library reference"
- fi
-
- # Suhosin support
- if use suhosin ; then
- epatch "${WORKDIR}/${SUHOSIN_PATCH}"
- fi
-
- # rebuild the whole autotools stuff as we are heavily patching it
- # (suhosin, fastbuild, ...)
-
- # eaclocal doesn't accept --force, so we try to force re-generation
- # this way
- rm aclocal.m4
-
- # work around divert() issues with newer autoconf, bug #281697
- if has_version '>=sys-devel/autoconf-2.64' ; then
- sed -i -r \
- -e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
- $(grep -l divert $(find . -name '*.m4') configure.in) || die
- fi
- eautoreconf --force -W no-cross
-}
-
-
diff --git a/dev-lang/php/files/eblits/src_test-v1.eblit b/dev-lang/php/files/eblits/src_test-v1.eblit
deleted file mode 100644
index 95ebc7d..0000000
--- a/dev-lang/php/files/eblits/src_test-v1.eblit
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_test-v1.eblit,v 1.2 2010/08/09 10:47:57 mabi Exp $
-
-eblit-php-src_test() {
- vecho ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
- if [[ ! -x "${WORKDIR}/sapis/cli/php" ]] ; then
- ewarn "Test phase requires USE=cli, skipping"
- return
- else
- export TEST_PHP_EXECUTABLE="${WORKDIR}/sapis/cli/php"
- fi
-
- if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
- fi
-
-
- REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \
- "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
- for name in ${EXPECTED_TEST_FAILURES}; do
- mv "${name}.out" "${name}.out.orig" 2>/dev/null
- done
-
- local failed="$(find -name '*.out')"
- if [[ ${failed} != "" ]] ; then
- ewarn "The following test cases failed unexpectedly:"
- for name in ${failed}; do
- ewarn " ${name/.out/}"
- done
- else
- einfo "No unexpected test failures, all fine"
- fi
-
- if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
- local passed=""
- for name in ${EXPECTED_TEST_FAILURES}; do
- [[ -f "${name}.diff" ]] && continue
- passed="${passed} ${name}"
- done
- if [[ ${passed} != "" ]] ; then
- einfo "The following test cases passed unexpectedly:"
- for name in ${passed}; do
- ewarn " ${passed}"
- done
- else
- einfo "None of the known-to-fail tests passed, all fine"
- fi
- fi
-}
-
-
diff --git a/dev-lang/php/files/php-5.2.12-libpng14.patch b/dev-lang/php/files/php-5.2.12-libpng14.patch
deleted file mode 100644
index 90f015f..0000000
--- a/dev-lang/php/files/php-5.2.12-libpng14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/gd/libgd/gd_png.c
-+++ ext/gd/libgd/gd_png.c
-@@ -139,7 +139,7 @@
- return NULL;
- }
-
-- if (!png_check_sig (sig, 8)) { /* bad signature */
-+ if (png_sig_cmp (sig, 0, 8)) { /* bad signature */
- return NULL;
- }
-
diff --git a/dev-lang/php/files/php-fpm.init b/dev-lang/php/files/php-fpm.init
deleted file mode 100644
index e0965bc..0000000
--- a/dev-lang/php/files/php-fpm.init
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-
-opts="reload"
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting PHP FastCGI server"
- start-stop-daemon --start --pidfile=/var/run/php-fpm.pid \
- --exec /usr/bin/php-fpm
- eend $?
-}
-
-stop() {
- ebegin "Stopping PHP FastCGI server"
- start-stop-daemon --stop --pidfile=/var/run/php-fpm.pid
- eend $?
-}
-
-reload() {
- ebegin "Restart gracefully PHP FastCGI server"
- kill -SIGUSR2 `cat /var/run/php-fpm.pid` &>/dev/null
- eend $?
-}
diff --git a/dev-lang/php/files/php5-ldvs b/dev-lang/php/files/php5-ldvs
deleted file mode 100644
index 783b0f6..0000000
--- a/dev-lang/php/files/php5-ldvs
+++ /dev/null
@@ -1 +0,0 @@
-PHP_5 { global: *; };
diff --git a/dev-lang/php/php-5.2.14.ebuild b/dev-lang/php/php-5.2.14.ebuild
deleted file mode 100644
index 58f2a48..0000000
--- a/dev-lang/php/php-5.2.14.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.14.ebuild,v 1.11 2010/09/07 21:22:40 mabi Exp $
-
-EAPI=2
-
-PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob
-interbase msql oci8 sapdb solid"
-
-# inherit autotools, because we call eautoreconf in the eblits
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
-
-PHP_PATCHSET="1"
-SUHOSIN_VERSION="$PV-0.9.7"
-EXPECTED_TEST_FAILURES=""
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-function php_get_uri ()
-{
- case "${1}" in
- "php-pre")
- echo "http://downloads.php.net/johannes/${2}"
- ;;
- "php")
- echo "http://www.php.net/distributions/${2}"
- ;;
- "suhosin")
- echo "http://download.suhosin.org/${2}"
- ;;
- "gentoo")
- echo "mirror://gentoo/${2}"
- ;;
- *)
- die "unhandled case in php_get_uri"
- ;;
- esac
-}
-
-PHP_MV="$(get_major_version)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_RELEASE="php"
-PHP_P="${PN}-${PHP_PV}"
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_PATCHSET="${PHP_PATCHSET:-${PR/r/}}"
-PHP_PATCHSET_URI="
- $(php_get_uri gentoo "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
-
-if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
- # in some cases we use our own suhosin patch (very recent version,
- # patch conflicts, etc.)
- SUHOSIN_TYPE="gentoo"
-else
- SUHOSIN_TYPE="suhosin"
-fi
-
-SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"
-SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
-
-FPM_PATCH="php-fpm-0.6~5.2.patch"
-FPM_URI="http://code.launchpad.net/php-fpm/master/0.6/+download/${FPM_PATCH}"
-
-SRC_URI="
- ${PHP_SRC_URI}
- ${PHP_PATCHSET_URI}
- suhosin? ( ${SUHOSIN_URI} )
- fpm? ( ${FPM_URI} )"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, Apache2 and embed SAPIs."
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-# We can build the following SAPIs in the given order
-SAPIS="cli cgi fpm embed apache2"
-
-# Gentoo-specific, common features
-IUSE="kolab"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- discard-path force-cgi-redirect
- concurrentmodphp threads"
-
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
- crypt +ctype curl curlwrappers db2 dbase dbmaker debug doc empress
- empress-bcs esoob exif fdftk frontbase +filter firebird
- flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile
- interbase iodbc ipv6 +json kerberos ldap ldap-sasl libedit
- mcve mhash msql mssql mysql mysqli ncurses nls oci8
- oci8-instant-client odbc pcntl +pcre pdo pic +posix postgres qdbm
- readline recode +reflection sapdb +session sharedext sharedmem
- +simplexml snmp soap sockets solid spell +spl sqlite ssl suhosin
- sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
- +xml +xmlreader +xmlwriter xmlrpc xpm xsl yaz zip zlib"
-
-DEPEND="app-admin/php-toolkit
- pcre? ( >=dev-libs/libpcre-7.9[unicode] )
- adabas? ( >=dev-db/unixODBC-1.8.13 )
- apache2? ( www-servers/apache[threads=] )
- berkdb? ( =sys-libs/db-4* )
- birdstep? ( >=dev-db/unixODBC-1.8.13 )
- bzip2? ( app-arch/bzip2 )
- cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
- cjk? ( !gd? ( !gd-external? (
- >=media-libs/jpeg-6b
- media-libs/libpng
- sys-libs/zlib
- ) ) )
- crypt? ( >=dev-libs/libmcrypt-2.4 )
- curl? ( >=net-misc/curl-7.10.5 )
- db2? ( >=dev-db/unixODBC-1.8.13 )
- dbmaker? ( >=dev-db/unixODBC-1.8.13 )
- empress? ( >=dev-db/unixODBC-1.8.13 )
- empress-bcs? ( >=dev-db/unixODBC-1.8.13 )
- esoob? ( >=dev-db/unixODBC-1.8.13 )
- exif? ( !gd? ( !gd-external? (
- >=media-libs/jpeg-6b
- media-libs/libpng
- sys-libs/zlib
- ) ) )
- fdftk? ( app-text/fdftk )
- firebird? ( dev-db/firebird )
- fpm? ( >=dev-libs/libxml2-2.7.2-r2 >=dev-libs/libevent-1.4.12 )
- gd? ( >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib )
- gd-external? ( media-libs/gd )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )
- gmp? ( >=dev-libs/gmp-4.1.2 )
- iconv? ( virtual/libiconv )
- imap? ( virtual/imap-c-client )
- iodbc? ( dev-db/libiodbc )
- kerberos? ( virtual/krb5 )
- kolab? ( >=net-libs/c-client-2004g-r1 )
- ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) )
- ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) )
- libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
- mhash? ( app-crypt/mhash )
- mssql? ( dev-db/freetds[mssql] )
- mysql? ( virtual/mysql )
- mysqli? ( >=virtual/mysql-4.1 )
- ncurses? ( sys-libs/ncurses )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( >=dev-db/unixODBC-1.8.13 )
- postgres? ( dev-db/postgresql-base )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline )
- recode? ( app-text/recode )
- sapdb? ( >=dev-db/unixODBC-1.8.13 )
- sharedmem? ( dev-libs/mm )
- simplexml? ( >=dev-libs/libxml2-2.6.8 )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- soap? ( >=dev-libs/libxml2-2.6.8 )
- solid? ( >=dev-db/unixODBC-1.8.13 )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( =dev-db/sqlite-2* pdo? ( =dev-db/sqlite-3* ) )
- ssl? ( >=dev-libs/openssl-0.9.7 )
- sybase-ct? ( dev-db/freetds )
- tidy? ( app-text/htmltidy )
- truetype? (
- =media-libs/freetype-2*
- >=media-libs/t1lib-5.0.0
- !gd? ( !gd-external? (
- >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) )
- )
- wddx? ( >=dev-libs/libxml2-2.6.8 )
- xml? ( >=dev-libs/libxml2-2.6.8 )
- xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
- xmlreader? ( >=dev-libs/libxml2-2.6.8 )
- xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
- xpm? (
- x11-libs/libXpm
- >=media-libs/jpeg-6b
- media-libs/libpng sys-libs/zlib
- )
- xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
- zip? ( sys-libs/zlib )
- zlib? ( sys-libs/zlib )
- virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-RDEPEND="${DEPEND}
- truetype? ( || ( $php[gd] $php[gd-external] ) )
- cjk? ( || ( $php[gd] $php[gd-external] ) )
- exif? ( || ( $php[gd] $php[gd-external] ) )
-
- xpm? ( $php[gd] )
- gd? ( $php[zlib,-gd-external] )
- gd-external? ( $php[-gd] )
- simplexml? ( $php[xml] )
- soap? ( $php[xml] )
- wddx? ( $php[xml] )
- xmlrpc? ( || ( $php[xml] $php[iconv] ) )
- xmlreader? ( $php[xml] )
- xsl? ( $php[xml] )
- ldap-sasl? ( $php[ldap,-oci8] )
- suhosin? ( $php[unicode] )
- adabas? ( $php[odbc] )
- birdstep? ( $php[odbc] )
- dbmaker? ( $php[odbc] )
- empress-bcs? ( $php[empress] )
- empress? ( $php[odbc] )
- esoob? ( $php[odbc] )
- db2? ( $php[odbc] )
- sapdb? ( $php[odbc] )
- solid? ( $php[odbc] )
- kolab? ( $php[imap] )
-
- oci8? ( $php[-oci8-instant-client,-ldap-sasl] )
- oci8-instant-client? ( $php[-oci8] )
-
- qdbm? ( $php[-gdbm] )
- readline? ( $php[-libedit] )
- recode? ( $php[-imap,-mysql,-mysqli] )
- firebird? ( $php[-interbase] )
- sharedmem? ( $php[-threads] )
-
- !cli? ( !cgi? ( !apache2? ( !embed? ( $php[cli] ) ) ) )
-
- filter? ( !dev-php${PHP_MV}/pecl-filter )
- json? ( !dev-php${PHP_MV}/pecl-json )
- zip? ( !dev-php${PHP_MV}/pecl-zip )"
-
-DEPEND="${DEPEND}
- sys-devel/flex
- >=sys-devel/m4-1.4.3
- >=sys-devel/libtool-1.5.18"
-
-# They are in PDEPEND because we need PHP installed first!
-PDEPEND="doc? ( app-doc/php-docs )
- suhosin? ( dev-php${PHP_MV}/suhosin )
- mcve? ( dev-php${PHP_MV}/pecl-mcve )
- yaz? ( dev-php${PHP_MV}/pecl-yaz )"
-
-# Portage doesn't support setting PROVIDE based on the USE flags that
-# have been enabled, so we have to PROVIDE everything for now and hope
-# for the best
-PROVIDE="virtual/php"
-
-SLOT="${PHP_MV}"
-S="${WORKDIR}/${PHP_P}"
-
-PHP_INI_FILE="php.ini"
-PHP_INI_UPSTREAM="php.ini-dist"
-
-want_apache
-
-# eblit-core
-# Usage: <function> [version] [eval]
-# Main eblit engine
-eblit-core() {
- [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files"
- local e v func=$1 ver=$2 eval_=$3
- for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
- e="${FILESDIR}/eblits/${func}${v}.eblit"
- if [[ -e ${e} ]] ; then
- . "${e}"
- [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
- return 0
- fi
- done
- return 1
-}
-
-# eblit-include
-# Usage: [--skip] <function> [version]
-# Includes an "eblit" -- a chunk of common code among ebuilds in a given
-# package so that its functions can be sourced and utilized within the
-# ebuild.
-eblit-include() {
- local skipable=false r=0
- [[ $1 == "--skip" ]] && skipable=true && shift
- [[ $1 == pkg_* ]] && skipable=true
-
- [[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
- eblit-core $1 $2
- r="$?"
- ${skipable} && return 0
- [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe
-# Usage: <function>
-# Runs a function if it is defined in an eblit
-eblit-run-maybe() {
- [[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run
-# Usage: <function> [version]
-# Runs a function defined in an eblit
-eblit-run() {
- eblit-include --skip common "${*:2}"
- eblit-include "$@"
- eblit-run-maybe eblit-$1-pre
- eblit-${PN}-$1
- eblit-run-maybe eblit-$1-post
-}
-
-# eblit-pkg
-# Usage: <phase> [version]
-# Includes the given functions AND evals them so they're included in the binpkgs
-eblit-pkg() {
- [[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
- eblit-core $1 $2 1
-}
-
-eblit-pkg pkg_setup v1
-
-src_prepare() {
- if use fpm; then
- EPATCH_OPTS="-p1 -d ${S}" epatch "${DISTDIR}/${FPM_PATCH}"
- fi
-
- eblit-run src_prepare v1
-}
-
-src_configure() { eblit-run src_configure v52 ; }
-src_compile() { eblit-run src_compile v1 ; }
-src_install() { eblit-run src_install v1 ; }
-src_test() { eblit-run src_test v1 ; }
-
-eblit-pkg pkg_postinst v1
diff --git a/dev-python/restkit/restkit-1.3.1.ebuild b/dev-python/restkit/restkit-1.3.1.ebuild
deleted file mode 100644
index ce87719..0000000
--- a/dev-python/restkit/restkit-1.3.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit distutils
-
-DESCRIPTION="An HTTP resource kit for Python."
-HOMEPAGE="http://bitbucket.org/benoitc/restkit"
-SRC_URI="http://pypi.python.org/packages/source/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="${DEPEND}"
-RDEPEND="${RDEPEND}"
diff --git a/dev-ruby/bundler/bundler-1.0.0.ebuild b/dev-ruby/bundler/bundler-1.0.0.ebuild
deleted file mode 100644
index 9009ca2..0000000
--- a/dev-ruby/bundler/bundler-1.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-0.9.26.ebuild,v 1.2 2010/06/30 12:05:31 flameeyes Exp $
-
-EAPI=2
-
-# ruby19 → uncountable number of test failures
-# jruby → needs to be tested because jruby-1.5.1 fails in multiple
-# ways unrelated to this package
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-# No documentation task
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md ROADMAP.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="http://github.com/carlhuda/bundler"
-
-GITHUB_USER="carlhuda"
-SRC_URI="http://github.com/${GITHUB_USER}/${PN}/tarball/${PV} -> ${PN}-git-${PV}.tgz"
-S="${WORKDIR}/${GITHUB_USER}-${PN}-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend dev-ruby/rubygems
-
-ruby_add_bdepend "test? ( dev-ruby/rspec )"
-
-RDEPEND="${RDEPEND}
- dev-vcs/git"
-DEPEND="${DEPEND}
- test? ( dev-vcs/git )"
diff --git a/dev-ruby/mustache/mustache-0.11.1.ebuild b/dev-ruby/mustache/mustache-0.11.1.ebuild
deleted file mode 100644
index 7acfb47..0000000
--- a/dev-ruby/mustache/mustache-0.11.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-USE_RUBY="ruby18"
-inherit ruby-fakegem
-
-DESCRIPTION="Tool to render logic-less templates"
-HOMEPAGE="http://mustache.github.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/net-analyzer/nagios-core/files/99_nagios3.conf b/net-analyzer/nagios-core/files/99_nagios3.conf
deleted file mode 100644
index 074f9ce..0000000
--- a/net-analyzer/nagios-core/files/99_nagios3.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-<IfDefine NAGIOS>
- ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
- <Directory "/usr/lib/nagios/cgi-bin/">
- AllowOverride AuthConfig
- Options ExecCGI
- Order allow,deny
- Allow from all
- </Directory>
- Alias /nagios /usr/share/nagios/htdocs
- <Directory "/usr/share/nagios/htdocs">
- AllowOverride AuthConfig
- Order allow,deny
- Allow from all
- </Directory>
-</IfDefine>
diff --git a/net-analyzer/nagios-core/files/conf.d b/net-analyzer/nagios-core/files/conf.d
deleted file mode 100644
index 338311a..0000000
--- a/net-analyzer/nagios-core/files/conf.d
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/files/conf.d,v 1.1 2004/08/20 13:38:13 eldad Exp $
-
-# Distributed monitoring users will want to configure here the ip/hostname of the central server.
-# It will be used by submit_check_result_via_nsca.
-NAGIOS_NSCA_HOST="localhost"
-
-
-
diff --git a/net-analyzer/nagios-core/files/lighttpd_nagios3-r1.conf b/net-analyzer/nagios-core/files/lighttpd_nagios3-r1.conf
deleted file mode 100644
index 6e25770..0000000
--- a/net-analyzer/nagios-core/files/lighttpd_nagios3-r1.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-server.modules += ("mod_cgi")
-server.modules += ("mod_auth")
-server.modules += ("mod_alias")
-
-auth.require += ( "/nagios" =>
- (
- "method" => "digest",
- "realm" => "nagios",
- "require" => "valid-user"
- )
-)
-
-$HTTP["url"] =~ "^/nagios/cgi-bin/" {
- dir-listing.activate = "disable"
- cgi.assign = (
- ".pl" => "/usr/bin/perl",
- ".cgi" => ""
- )
-}
-
-alias.url += (
- "/nagios/cgi-bin" => "/usr/lib/nagios/cgi-bin",
- "/nagios" => "/usr/share/nagios/htdocs"
-)
diff --git a/net-analyzer/nagios-core/files/nagios-3.2.3-escalation.patch b/net-analyzer/nagios-core/files/nagios-3.2.3-escalation.patch
deleted file mode 100644
index c4875b0..0000000
--- a/net-analyzer/nagios-core/files/nagios-3.2.3-escalation.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/common/macros.c b/common/macros.c
-index 6cddd00..e628da8 100644
---- a/common/macros.c
-+++ b/common/macros.c
-@@ -2602,6 +2602,7 @@ int init_macrox_names(void){
- add_macrox_name(MACRO_HOSTATTEMPT,"HOSTATTEMPT");
- add_macrox_name(MACRO_NOTIFICATIONTYPE,"NOTIFICATIONTYPE");
- add_macrox_name(MACRO_NOTIFICATIONNUMBER,"NOTIFICATIONNUMBER");
-+ add_macrox_name(MACRO_NOTIFICATIONISESCALATED,"NOTIFICATIONISESCALATED");
- add_macrox_name(MACRO_HOSTEXECUTIONTIME,"HOSTEXECUTIONTIME");
- add_macrox_name(MACRO_SERVICEEXECUTIONTIME,"SERVICEEXECUTIONTIME");
- add_macrox_name(MACRO_HOSTLATENCY,"HOSTLATENCY");
diff --git a/net-analyzer/nagios-core/files/nagios3 b/net-analyzer/nagios-core/files/nagios3
deleted file mode 100644
index 83b9332..0000000
--- a/net-analyzer/nagios-core/files/nagios3
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/files/nagios3,v 1.1 2008/04/27 18:41:25 dertobi123 Exp $
-
-opts="${opts} reload checkconfig"
-
-depend() {
- need net
- use dns logger firewall
- after mysql postgresql
-}
-
-reload()
-{
- checkconfig || return 1
- ebegin "Reloading configuration"
- killall -HUP nagios &>/dev/null
- eend $?
-}
-
-checkconfig() {
- # Silent Check
- /usr/sbin/nagios -v /etc/nagios/nagios.cfg &>/dev/null && return 0
-
- # Now we know there's problem - run again and display errors
- /usr/sbin/nagios -v /etc/nagios/nagios.cfg
- eend $? "Configuration Error. Please fix your configfile"
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting nagios"
- touch /var/nagios/nagios.log /var/nagios/status.sav
- chown nagios:nagios /var/nagios/nagios.log /var/nagios/status.sav
- rm -f /var/nagios/rw/nagios.cmd
- start-stop-daemon --quiet --start --startas /usr/sbin/nagios \
- -e HOME="/var/nagios/home" --pidfile /var/nagios/nagios.lock \
- -- -d /etc/nagios/nagios.cfg
- eend $?
-}
-
-stop() {
- ebegin "Stopping nagios"
- start-stop-daemon --quiet --stop --pidfile /var/nagios/nagios.lock
- rm -f /var/nagios/status.log /var/nagios/nagios.tmp /var/nagios/nagios.lock /var/nagios/rw/nagios.cmd
- eend $?
-}
-
-svc_restart() {
- checkconfig || return 1
- ebegin "Restarting nagios"
- svc_stop
- svc_start
- eend $?
-}
-
diff --git a/net-analyzer/nagios-core/nagios-core-3.2.3.ebuild b/net-analyzer/nagios-core/nagios-core-3.2.3.ebuild
deleted file mode 100644
index 7e6393b..0000000
--- a/net-analyzer/nagios-core/nagios-core-3.2.3.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.2.3.ebuild,v 1.1 2010/10/07 16:24:10 dertobi123 Exp $
-
-EAPI="2"
-
-inherit eutils depend.apache toolchain-funcs
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug lighttpd perl +web vim-syntax"
-DEPEND="virtual/mailx
- web? (
- >=media-libs/gd-1.8.3-r5[jpeg,png]
- lighttpd? ( www-servers/lighttpd dev-lang/php[cgi] )
- apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) )
- )
- perl? ( >=dev-lang/perl-5.6.1-r7 )"
-RDEPEND="${DEPEND}
- vim-syntax? ( app-vim/nagios-syntax )"
-
-want_apache2
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- depend.apache_pkg_setup
-
- enewgroup nagios
- enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_prepare() {
- local strip="$(echo '$(MAKE) strip-post-install')"
- sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in"
- epatch "${FILESDIR}"/nagios-3.2.3-escalation.patch
-}
-
-src_configure() {
- local myconf
-
- if use perl ; then
- myconf="${myconf} --enable-embedded-perl --with-perlcache"
- fi
-
- if use debug; then
- myconf="${myconf} --enable-DEBUG0"
- myconf="${myconf} --enable-DEBUG1"
- myconf="${myconf} --enable-DEBUG2"
- myconf="${myconf} --enable-DEBUG3"
- myconf="${myconf} --enable-DEBUG4"
- myconf="${myconf} --enable-DEBUG5"
- fi
-
- if use !apache2 && use !lighttpd ; then
- myconf="${myconf} --with-command-group=nagios"
- else
- if use apache2 ; then
- myconf="${myconf} --with-command-group=apache"
- myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
- elif use lighttpd ; then
- myconf="${myconf} --with-command-group=lighttpd"
- fi
- fi
-
- econf ${myconf} \
- --prefix=/usr \
- --bindir=/usr/sbin \
- --sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
- --datadir=/usr/share/nagios/htdocs \
- --localstatedir=/var/nagios \
- --sysconfdir=/etc/nagios \
- --libexecdir=/usr/$(get_libdir)/nagios/plugins \
- || die "./configure failed"
-}
-
-src_compile() {
- emake CC=$(tc-getCC) nagios || die "make failed"
-
- if use web ; then
- # Only compile the CGI's if "web" useflag is set.
- emake CC=$(tc-getCC) DESTDIR="${D}" cgis || die
- fi
-}
-
-src_install() {
- dodoc Changelog INSTALLING LEGAL README UPGRADING
-
- if ! use web ; then
- sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due missing web use flag/' \
- -e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due missing web use flag/' \
- Makefile
- fi
-
- sed -i -e 's/^contactgroups$//g' Makefile
-
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install-config
- emake DESTDIR="${D}" install-commandmode
-
- newinitd "${FILESDIR}"/nagios3 nagios
- newconfd "${FILESDIR}"/conf.d nagios
-
- # Apache Module
- if use web ; then
- if use apache2 ; then
- insinto "${APACHE_MODULES_CONFDIR}"
- doins "${FILESDIR}"/99_nagios3.conf
- elif use lighttpd ; then
- insinto /etc/lighttpd
- newins "${FILESDIR}/lighttpd_nagios3-r1.conf" nagios.conf
- else
- ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
- ewarn "out-of-the-box. Since you are not using one of them, you"
- ewarn "have to configure your webserver accordingly yourself."
- fi
-
- fi
-
- for dir in etc/nagios var/nagios ; do
- chown -R nagios:nagios "${D}/${dir}" || die "Failed chown of ${D}/${dir}"
- done
-
- chown -R root:root "${D}"/usr/$(get_libdir)/nagios
- find "${D}"/usr/$(get_libdir)/nagios -type d -print0 | xargs -0 chmod 755
- find "${D}"/usr/$(get_libdir)/nagios/cgi-bin -type f -print0 | xargs -0 chmod 755
-
- keepdir /etc/nagios
- keepdir /var/nagios
- keepdir /var/nagios/archives
- keepdir /var/nagios/rw
- keepdir /var/nagios/spool/checkresults
-
- if use !apache2 && use !lighttpd; then
- chown -R nagios:nagios "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
- else
- if use apache2 ; then
- chown -R nagios:apache "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
- elif use lighttpd ; then
- chown -R nagios:lighttpd "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
- fi
- fi
-
- chmod ug+s "${D}"/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw"
- chmod 0750 "${D}"/etc/nagios || die "Failed chmod of ${D}/etc/nagios"
-}
-
-pkg_postinst() {
- elog "If you want nagios to start at boot time"
- elog "remember to execute:"
- elog " rc-update add nagios default"
- elog
-
- if use web ; then
- elog "This does not include cgis that are perl-dependent"
- elog "Currently traceroute.cgi is perl-dependent"
- elog "To have ministatus.cgi requires copying of ministatus.c"
- elog "to cgi directory for compiling."
-
- elog "Note that the user your webserver is running at needs"
- elog "read-access to /etc/nagios."
- elog
-
- if use apache2 || use lighttpd ; then
- elog "There are several possible solutions to accomplish this,"
- elog "choose the one you are most comfortable with:"
- elog
- if use apache2 ; then
- elog " usermod -G nagios apache"
- elog "or"
- elog " chown nagios:apache /etc/nagios"
- elog
- elog "Also edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
- elif use lighttpd ; then
- elog " usermod -G nagios lighttpd "
- elog "or"
- elog " chown nagios:lighttpd /etc/nagios"
- fi
- elog
- elog "That will make nagios's web front end visable via"
- elog "http://localhost/nagios/"
- elog
- else
- elog "IMPORTANT: Do not forget to add the user your webserver"
- elog "is running as to the nagios group!"
- fi
-
- else
- elog "Please note that you have installed Nagios without web interface."
- elog "Please don't file any bugs about having no web interface when you do this."
- elog "Thank you!"
- fi
-
- elog
- elog "If your kernel has /proc protection, nagios"
- elog "will not be happy as it relies on accessing the proc"
- elog "filesystem. You can fix this by adding nagios into"
- elog "the group wheel, but this is not recomended."
- elog
-}
-
-pkg_postinst() {
- einfo "Fixing permissions"
- chown nagios:nagios "${ROOT}"var/nagios
-}
diff --git a/sys-cluster/glusterfs/files/50glusterfs-mode-gentoo.el b/sys-cluster/glusterfs/files/50glusterfs-mode-gentoo.el
deleted file mode 100644
index c14b0d8..0000000
--- a/sys-cluster/glusterfs/files/50glusterfs-mode-gentoo.el
+++ /dev/null
@@ -1,5 +0,0 @@
-
-;;; puppet-mode site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'glusterfs-mode "glusterfs-mode" "Major mode for editing glusterfs manifests")
diff --git a/sys-cluster/glusterfs/files/glusterfs-2.0.8-docdir.patch b/sys-cluster/glusterfs/files/glusterfs-2.0.8-docdir.patch
deleted file mode 100644
index 5e26f63..0000000
--- a/sys-cluster/glusterfs/files/glusterfs-2.0.8-docdir.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 6a17bb8523c4c7810bf7797371df22cfb259f7a7 Mon Sep 17 00:00:00 2001
-From: MATSUU Takuto <matsuu@gentoo.org>
-Date: Sat, 16 May 2009 07:01:53 +0900
-Subject: [PATCH] Use the standard autoconf $docdir variable.
-
----
- doc/examples/Makefile.am | 1 -
- extras/Makefile.am | 3 +--
- extras/benchmarking/Makefile.am | 4 +---
- 3 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
-index b4c93f4..5296d83 100644
---- a/doc/examples/Makefile.am
-+++ b/doc/examples/Makefile.am
-@@ -1,7 +1,6 @@
- EXTRA = README unify.vol replicate.vol stripe.vol protocol-client.vol protocol-server.vol posix-locks.vol trash.vol write-behind.vol io-threads.vol io-cache.vol read-ahead.vol filter.vol trace.vol
- EXTRA_DIST = $(EXTRA)
-
--docdir = $(datadir)/doc/$(PACKAGE_NAME)
- Examplesdir = $(docdir)/examples
- Examples_DATA = $(EXTRA)
-
-diff --git a/extras/Makefile.am b/extras/Makefile.am
-index 9be3973..ea0b33d 100644
---- a/extras/Makefile.am
-+++ b/extras/Makefile.am
-@@ -1,6 +1,5 @@
-
--docdir = $(datadir)/doc/glusterfs/
--EditorModedir = $(docdir)/
-+EditorModedir = $(docdir)
- EditorMode_DATA = glusterfs-mode.el glusterfs.vim
-
- SUBDIRS = init.d benchmarking
-diff --git a/extras/benchmarking/Makefile.am b/extras/benchmarking/Makefile.am
-index 04cc061..bfcc592 100644
---- a/extras/benchmarking/Makefile.am
-+++ b/extras/benchmarking/Makefile.am
-@@ -1,7 +1,5 @@
-
--docdir = $(datadir)/doc/$(PACKAGE_NAME)/benchmarking
--
--benchmarkingdir = $(docdir)
-+benchmarkingdir = $(docdir)/benchmarking
-
- benchmarking_DATA = rdd.c glfs-bm.c README launch-script.sh local-script.sh
-
---
-1.6.3
-
diff --git a/sys-cluster/glusterfs/files/glusterfs-2.0.8-parallel-make.patch b/sys-cluster/glusterfs/files/glusterfs-2.0.8-parallel-make.patch
deleted file mode 100644
index fbe6333..0000000
--- a/sys-cluster/glusterfs/files/glusterfs-2.0.8-parallel-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/glusterfsd/src/Makefile.am b/glusterfsd/src/Makefile.am
-index 0609179..548ed3a 100644
---- a/glusterfsd/src/Makefile.am
-+++ b/glusterfsd/src/Makefile.am
-@@ -20,5 +20,6 @@ uninstall-local:
- install-data-local:
- $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/run
- $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/log/glusterfs
-+ $(INSTALL) -d -m 755 $(DESTDIR)$(sbindir)
- rm -f $(DESTDIR)$(sbindir)/glusterfs
- ln -s glusterfsd $(DESTDIR)$(sbindir)/glusterfs
diff --git a/sys-cluster/glusterfs/files/glusterfs.vim b/sys-cluster/glusterfs/files/glusterfs.vim
deleted file mode 100644
index bbb9cb1..0000000
--- a/sys-cluster/glusterfs/files/glusterfs.vim
+++ /dev/null
@@ -1,8 +0,0 @@
-if &compatible || v:version < 603
- finish
-endif
-
-
-" GlusterFS Volume files
-au BufNewFile,BufRead *.vol
- \ set filetype=glusterfs
diff --git a/sys-cluster/glusterfs/files/glusterfsd.initd-r1 b/sys-cluster/glusterfs/files/glusterfsd.initd-r1
deleted file mode 100755
index d627ee7..0000000
--- a/sys-cluster/glusterfs/files/glusterfsd.initd-r1
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-depend() {
- need net
- use dns
- before netmount
- after firewall ntp-client ntpd
-}
-
-checkconfig() {
- GLUSTERFS_NAME="${SVCNAME#glusterfsd.}"
- GLUSTERFS_PIDFILE="/var/run/${SVCNAME}.pid"
-
- : ${GLUSTERFS_LOGFILE:=/var/log/glusterfs/${GLUSTERFS_NAME}.log}
- : ${GLUSTERFS_VOLFILE:=/etc/glusterfs/${GLUSTERFS_NAME}.vol}
- : ${GLUSTERFS_PORT:=6996}
- : ${GLUSTERFS_TRANSPORT:=socket}
-
- if [[ -z "${GLUSTERFS_NAME}" ]]; then
- eerror "The service name is not properly formatted."
- return 1
- fi
-
- if [[ -z "${GLUSTERFS_VOLFILE}" ]]; then
- eerror "No GlusterFS volume file source has been defined. Edit /etc/conf.d/${SVCNAME}"
- eerror "and configure a volume file source for ${SVCNAME}."
- return 1
- else
- if [[ ! -f "${GLUSTERFS_VOLFILE}" ]]; then
- eerror "Cannot find volume file: ${GLUSTERFS_VOLFILE}"
- return 1
- fi
- fi
-}
-
-start() {
- checkconfig || return 1
-
- ebegin "Starting GlusterFS daemon (${SVCNAME})"
- start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \
- --exec /usr/sbin/glusterfsd -- \
- --pid-file=${GLUSTERFS_PIDFILE} \
- --log-file=${GLUSTERFS_LOGFILE} \
- --volfile=${GLUSTERFS_VOLFILE} \
- ${GLUSTERFS_OPTS} ${GLUSTERFS_MOUNTPOINT}
- eend $?
-}
-
-stop() {
- checkconfig || return 1
-
- ebegin "Stopping GlusterFS daemon (${SVCNAME})"
- start-stop-daemon --stop --pidfile ${GLUSTERFS_PIDFILE}
- eend $?
-}
diff --git a/sys-cluster/glusterfs/glusterfs-3.0.4.ebuild b/sys-cluster/glusterfs/glusterfs-3.0.4.ebuild
deleted file mode 100644
index 0a865c1..0000000
--- a/sys-cluster/glusterfs/glusterfs-3.0.4.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.0.2.ebuild,v 1.1 2010/02/22 22:31:39 alexxy Exp $
-
-EAPI="2"
-
-inherit autotools elisp-common eutils multilib versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://ftp.gluster.com/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +fuse infiniband static vim-syntax extras"
-
-DEPEND="emacs? ( virtual/emacs )
- fuse? ( >=sys-fs/fuse-2.7.0 )
- infiniband? ( sys-infiniband/libibverbs )"
-RDEPEND="${DEPEND}
- !net-fs/glusterfs"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.0.8-parallel-make.patch"
- epatch "${FILESDIR}/${PN}-2.0.8-docdir.patch"
- eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
- econf \
- $(use_enable fuse fuse-client) \
- $(use_enable infiniband ibverbs) \
- $(use_enable static) \
- --disable-bdb \
- --docdir=/usr/share/doc/${PF} \
- --localstatedir=/var || die
-}
-
-src_compile() {
- emake || die "Emake failed"
- if use emacs; then
- elisp-compile extras/glusterfs-mode.el || die "elisp-compile failed"
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- if use emacs; then
- elisp-install ${PN} extras/glusterfs-mode.el* || die "elisp-install failed"
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/glusterfs.vim" || die
- insinto /usr/share/vim/vimfiles/syntax
- doins extras/glusterfs.vim || die
- fi
-
- if use extras; then
- newbin extras/volgen/glusterfs-volgen glusterfs-volgen || die "Failed to install bins"
- newbin extras/backend-xattr-sanitize.sh glusterfs-backend-xattr-sanitize || die "Failed to install bins"
- newbin extras/migrate-unify-to-distribute.sh glusterfs-migrate-unify-to-distribute || die "Failed to install bins"
- fi
-
- dodoc AUTHORS ChangeLog NEWS README THANKS || die "dodoc failed"
-
- newinitd "${FILESDIR}/glusterfsd.initd-r1" glusterfsd || die "newinitd failed"
-
- keepdir /var/log/${PN} || die "keepdir failed"
-}
-
-pkg_postinst() {
- elog "The glusterfs startup scripts can be multiplexed."
- elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
- elog "separate service. To create additional instances of the glusterfsd service"
- elog "simply create a symlink to the glusterfsd startup script."
- elog
- elog "Daemon example:"
- elog " # ln -s glusterfsd /etc/init.d/glusterfsd.myexport"
- elog " # ${EDITOR} /etc/glusterfs/myexport.vol"
- elog "You can now treat glusterfsd.myexport like any other service"
- elog
- elog "Client example:"
- elog " # ln -s glusterfs /etc/init.d/glusterfs.mymount"
- elog " # ${EDITOR} /etc/glusterfs/mymount.vol"
- elog "You can now treat glusterfs.mymount like any other service"
- echo
- elog "You can also mount exported GlusterFS filesystems through /etc/fstab instead"
- elog "of through a startup script instance. For more information visit:"
- elog "http://www.gluster.org/docs/index.php/Mounting_a_GlusterFS_Volume"
- echo
- ewarn "You need to use a ntp client to keep the clocks synchronized across all"
- ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
- ewarn "run GlusterFS."
-
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/sys-fs/udev/files/161/40-gentoo.rules b/sys-fs/udev/files/161/40-gentoo.rules
deleted file mode 100644
index fa99ba9..0000000
--- a/sys-fs/udev/files/161/40-gentoo.rules
+++ /dev/null
@@ -1,14 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# setting permissions
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-
-# dialout devices
-KERNEL=="ippp*|isdn*|dcbri*|rfcomm*|ttyACM[0-9]*|pilot", GROUP="uucp"
-
-# sound devices (oss)
-SUBSYSTEM=="snd", GROUP="audio"
-
-# Sony Vaio Jogdial sonypi device
-KERNEL=="sonypi", MODE="0666"
-
diff --git a/sys-fs/udev/files/161/90-network.rules b/sys-fs/udev/files/161/90-network.rules
deleted file mode 100644
index 50903af..0000000
--- a/sys-fs/udev/files/161/90-network.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# /etc/udev/rules/90-network.rules: triggering network init-scripts
-
-# Activate our network if we can
-SUBSYSTEM=="net", ACTION=="add", RUN+="net.sh %k start"
-SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop"
-
diff --git a/sys-fs/udev/files/161/shell-compat-KV.sh b/sys-fs/udev/files/161/shell-compat-KV.sh
deleted file mode 100644
index ce92e71..0000000
--- a/sys-fs/udev/files/161/shell-compat-KV.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# provides get_KV and KV_to_int as not all openrc-versions installed via ebuild have these
-
-cmd_exist()
-{
- type "$1" >/dev/null 2>&1
-}
-
-# does exist in baselayout-1
-# does not exist in openrc, but is added by openrc-ebuild since some time
-if ! cmd_exist KV_to_int; then
- KV_to_int() {
- [ -z $1 ] && return 1
-
- local x=${1%%-*}
- local KV_MAJOR=${x%%.*}
- x=${x#*.}
- local KV_MINOR=${x%%.*}
- x=${x#*.}
- local KV_MICRO=${x%%.*}
- local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} ))
-
- # We make version 2.2.0 the minimum version we will handle as
- # a sanity check ... if its less, we fail ...
- [ "${KV_int}" -lt 131584 ] && return 1
-
- echo "${KV_int}"
- }
-fi
-
-# same as KV_to_int
-if ! cmd_exist get_KV; then
- _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}")"
-
- return $?
- }
-fi
-
diff --git a/sys-fs/udev/files/161/shell-compat-addon.sh b/sys-fs/udev/files/161/shell-compat-addon.sh
deleted file mode 100644
index efe7726..0000000
--- a/sys-fs/udev/files/161/shell-compat-addon.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# functions that may not be defined, but are used by the udev-start and udev-stop addon
-# used by baselayout-1 and openrc before version 0.4.0
-
-cmd_exist()
-{
- type "$1" >/dev/null 2>&1
-}
-
-# does not exist in baselayout-1, does exist in openrc
-if ! cmd_exist yesno; then
- yesno() {
- [ -z "$1" ] && return 1
- case "$1" in
- yes|Yes|YES) return 0 ;;
- esac
- return 1
- }
-fi
-
-# does not exist in baselayout-1, does exist in openrc
-#
-# mountinfo <path>
-# check if some filesystem is mounted at mountpoint <path>
-#
-# return value:
-# 0 filesystem is mounted at <path>
-# 1 no filesystem is mounted exactly at <path>
-if ! cmd_exist mountinfo; then
- mountinfo() {
- [ "$1" = "-q" ] && shift
- local dir="$1"
-
- # check if entry is in /proc/mounts
- local ret=$(gawk 'BEGIN { found="false"; }
- $1 ~ "^#" { next }
- $2 == "'$dir'" { found="true"; }
- END { print found; }
- ' /proc/mounts)
-
- "${ret}"
- }
-fi
-
-# does not exist in baselayout-1, does exist in openrc
-#
-# used syntax: fstabinfo --mount /dev
-# it should mount /dev if an entry exists in /etc/fstab
-#
-# return value:
-# 0 mount succeeded
-# 1 mount failed or no entry exists
-#
-if ! cmd_exist fstabinfo; then
- fstabinfo() {
- [ "$1" = "--mount" ] || return 1
- local dir="$2"
-
- # RC_USE_FSTAB does only exist in baselayout-1
- # this emulation is only needed on bl-1, so check always
- yesno "${RC_USE_FSTAB}" || return 1
-
- # no need to check fstab, mount does this already for us
-
- # try mounting - better first check fstab and then mount without surpressing errors
- mount -n "${dir}" 2>/dev/null
- return $?
- }
-fi
diff --git a/sys-fs/udev/files/161/udev-dev-tarball.initd b/sys-fs/udev/files/161/udev-dev-tarball.initd
deleted file mode 100644
index 7d5a6b7..0000000
--- a/sys-fs/udev/files/161/udev-dev-tarball.initd
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Maintain a tarball of not udev managed device nodes"
-[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev
-
-rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}}
-device_tarball=/lib/udev/state/devices.tar.bz2
-
-depend() {
- if [ -f /etc/init.d/sysfs ]; then
- need udev-mount
- fi
-}
-
-start()
-{
- _start
-}
-
-_start() {
- if yesno "${rc_device_tarball}" && \
- [ -s "${device_tarball}" ]
- then
- ebegin "Populating /dev with saved device nodes"
- tar -jxpf "${device_tarball}" -C /dev
- eend $?
- fi
-}
-
-stop() {
- if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \
- ! yesno "${rc_device_tarball}" || \
- ! touch "${device_tarball}" 2>/dev/null
- then
- return 0
- fi
-
- ebegin "Saving device nodes"
- # Handle our temp files
- save_tmp_base=/tmp/udev.savedevices."$$"
- devices_udev="${save_tmp_base}"/devices.udev
- devices_real="${save_tmp_base}"/devices.real
- devices_totar="${save_tmp_base}"/devices.totar
- device_tmp_tarball="${save_tmp_base}"/devices
-
- rm -rf "${save_tmp_base}"
- mkdir "${save_tmp_base}"
- touch "${devices_udev}" "${devices_real}" \
- "${devices_totar}" "${device_tmp_tarball}"
-
- if [ -f "${devices_udev}" -a -f "${devices_real}" -a \
- -f "${devices_totar}" -a -f "${device_tmp_tarball}" ]
- then
- cd /dev
- # Find all devices, but ignore .udev directory
- find . -xdev -type b -or -type c -or -type l | \
- cut -d/ -f2- | \
- grep -v ^\\.udev >"${devices_real}"
-
- # Figure out what udev created
- udevadm info --export-db | sed -ne 's,^[SN]: \(.*\),\1,p' >"${devices_udev}"
- # These ones we also do not want in there
- for x in MAKEDEV core fd initctl pts shm stderr stdin stdout root; do
- echo "${x}" >> "${devices_udev}"
- done
- if [ -d /lib/udev/devices ]; then
- cd /lib/udev/devices
- find . -xdev -type b -or -type c -or -type l | \
- cut -d/ -f2- >> "${devices_udev}"
- cd /dev
- fi
-
- fgrep -x -v -f "${devices_udev}" "${devices_real}" > "${devices_totar}"
-
- # Now only tarball those not created by udev if we have any
- if [ -s "${devices_totar}" ]; then
- # we dont want to descend into mounted filesystems (e.g. devpts)
- # looking up username may involve NIS/network
- # and net may be down
- tar --one-file-system --numeric-owner \
- -jcpf "${device_tmp_tarball}" -T "${devices_totar}"
- mv -f "${device_tmp_tarball}" "${device_tarball}"
- else
- rm -f "${device_tarball}"
- fi
- eend 0
- else
- eend 1 "Could not create temporary files!"
- fi
-
- rm -rf "${save_tmp_base}"
-}
-
diff --git a/sys-fs/udev/files/161/udev-mount.initd b/sys-fs/udev/files/161/udev-mount.initd
deleted file mode 100644
index 3e4f884..0000000
--- a/sys-fs/udev/files/161/udev-mount.initd
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Mount tmpfs on /dev"
-[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev
-
-# get_KV and KV_to_int
-. /lib/udev/shell-compat-KV.sh
-
-# FIXME
-# Instead of this script testing kernel version, udev itself should
-# Maybe something like udevd --test || exit $?
-check_kernel()
-{
- if [ $(get_KV) -lt $(KV_to_int '%KV_MIN%') ]; then
- eerror "Your kernel is too old to work with this version of udev."
- eerror "Current udev only supports Linux kernel %KV_MIN% and newer."
- return 1
- fi
-
- yesno "${unreliable_kernel_warning:-yes}" || return 0
-
- if [ $(get_KV) -lt $(KV_to_int '%KV_MIN_RELIABLE%') ]; then
- ewarn "You need at least Linux kernel %KV_MIN_RELIABLE% for reliable operation of udev."
- fi
- return 0
-}
-
-
-mount_dev_directory()
-{
- if mountinfo -q /dev; then
- einfo "/dev is already mounted"
- return 0
- fi
-
- # No options are processed here as they should all be in /etc/fstab
- ebegin "Mounting /dev"
- if ! fstabinfo --mount /dev; then
- # we mount devtmpfs if supported
- local fs=tmpfs
- grep -qs devtmpfs /proc/filesystems && fs=devtmpfs
-
- # Some devices require exec, Bug #92921
- mount -n -t "$fs" -o "exec,nosuid,mode=0755,size=10M" udev /dev
- fi
- eend $?
-}
-
-seed_dev()
-{
- # Seed /dev with some things that we know we need
-
- # creating /dev/console, /dev/tty and /dev/tty1 to be able to write
- # to $CONSOLE with/without bootsplash before udevd creates it
- [ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
- [ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1
- [ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0
-
- # udevd will dup its stdin/stdout/stderr to /dev/null
- # and we do not want a file which gets buffered in ram
- [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3
- ${HAVE_SELINUX} && restorecon /dev/null
-
- # so udev can add its start-message to dmesg
- [ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
-
- # Create problematic directories
- mkdir -p /dev/pts /dev/shm
- ${HAVE_SELINUX} && restorecon -R /dev >/dev/null
- return 0
-}
-
-
-start()
-{
- # do not run this on too old baselayout - udev-addon is already loaded!
- if [ ! -f /etc/init.d/sysfs ]; then
- eerror "The $SVCNAME init-script is written for baselayout-2!"
- eerror "Please do not use it with baselayout-1!".
- return 1
- fi
-
- _start
-}
-
-_start()
-{
- check_kernel || return 1
- mount_dev_directory || return 1
-
- # Selinux lovin; /selinux should be mounted by selinux-patched init
- if [ -x /sbin/restorecon -a -c /selinux/null ]; then
- HAVE_SELINUX=true
- restorecon /dev > /selinux/null
- else
- HAVE_SELINUX=false
- fi
-
- # make sure it exists
- mkdir -p /dev/.udev /dev/.udev/rules.d
-
- seed_dev
-
- return 0
-}
diff --git a/sys-fs/udev/files/161/udev-postmount.initd b/sys-fs/udev/files/161/udev-postmount.initd
deleted file mode 100644
index 33a412f..0000000
--- a/sys-fs/udev/files/161/udev-postmount.initd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/161/udev-postmount.initd,v 1.1 2010/08/24 18:41:29 zzam Exp $
-
-depend() {
- need localmount
- after dbus # for trigger failed
-}
-
-dir_writeable()
-{
- printf "" 2>/dev/null >"$1"/.test.$$ && rm "$1"/.test.$$
-}
-
-start() {
- # check if this system uses udev
- [ -d /dev/.udev/ ] || return 0
-
- einfo "Doing udev cleanups"
-
- # Run the events that failed at first udev trigger
- udevadm trigger --type=failed -v
-
- # only continue if rules-directory is writable
- dir_writeable /etc/udev/rules.d || return 0
-
- # store persistent-rules that got created while booting
- # when / was still read-only
- /lib/udev/move_tmp_persistent_rules.sh
-}
-
-stop() {
- :
-}
-
-# vim:ts=4
diff --git a/sys-fs/udev/files/161/udev-start.sh b/sys-fs/udev/files/161/udev-start.sh
deleted file mode 100644
index a85d0c3..0000000
--- a/sys-fs/udev/files/161/udev-start.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev
-
-. /lib/udev/shell-compat-addon.sh
-
-compat_volume_nodes()
-{
- # Only do this for baselayout-1*
- # This check is likely to get false positives due to some multilib stuff,
- # but that should not matter, as this can only happen on old openrc versions
- # no longer available as ebuilds.
- if [ ! -e /lib/librc.so ]; then
-
- # Create nodes that udev can't
- [ -x /sbin/lvm ] && \
- /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null
- # Running evms_activate on a LiveCD causes lots of headaches
- [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \
- /sbin/evms_activate -q &>/dev/null
- fi
-}
-
-start_initd()
-{
- (
- . /etc/init.d/"$1"
- _start
- )
-}
-
-# set it as openrc does
-RC_BOOTLEVEL=${BOOTLEVEL:-default}
-RC_DEFAULTLEVEL=${DEFAULTLEVEL:-default}
-
-# mount tmpfs on /dev
-start_initd udev-mount || exit 1
-
-# Create a file so that our rc system knows it's still in sysinit.
-# Existance means init scripts will not directly run.
-# rc will remove the file when done with sysinit.
-# this is no longer needed as of openrc-0.4.0
-touch /dev/.rcsysinit
-
-# load device tarball
-start_initd udev-dev-tarball
-
-# run udevd
-start_initd udev || exit 1
-
-compat_volume_nodes
-
-# udev started successfully
-exit 0
diff --git a/sys-fs/udev/files/161/udev-stop.sh b/sys-fs/udev/files/161/udev-stop.sh
deleted file mode 100644
index 784e5d5..0000000
--- a/sys-fs/udev/files/161/udev-stop.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# for function yesno
-. /lib/udev/shell-compat-addon.sh
-
-# store device tarball
-(
- . /etc/init.d/udev-dev-tarball
- stop
-)
-
-exit 0
diff --git a/sys-fs/udev/files/161/udev.confd b/sys-fs/udev/files/161/udev.confd
deleted file mode 100644
index 7c3d3eb..0000000
--- a/sys-fs/udev/files/161/udev.confd
+++ /dev/null
@@ -1,64 +0,0 @@
-# /etc/conf.d/udev: config file for udev
-
-# We discourage to disable persistent-net!!
-# this may lead to random interface naming
-
-# Disable adding new rules for persistent-net
-persistent_net_disable="no"
-
-# Disable adding new rules for persistent-cd
-# Disabling this will stop new cdrom devices to appear
-# as /dev/{cdrom,cdrw,dvd,dvdrw}
-persistent_cd_disable="no"
-
-# Set to "yes" if you want to save /dev to a tarball on shutdown
-# and restore it on startup. This is useful if you have a lot of
-# custom device nodes that udev does not handle/know about.
-#
-# As this option is fragile, we recommend you
-# to create your devices in /lib/udev/devices.
-# These will be copied to /dev on boot.
-#rc_device_tarball="NO"
-
-# udev can trigger coldplug events which cause services to start and
-# kernel modules to be loaded.
-# Services are deferred to start in the boot runlevel.
-# Set rc_coldplug="NO" if you don't want this.
-# If you want module coldplugging but not coldplugging of services then you
-# can disable service coldplugging in baselayout/openrc config files.
-# The setting is named different in different versions.
-# in /etc/rc.conf: rc_hotplug="!*" or
-# in /etc/conf.d/rc: rc_plug_services="!*"
-#rc_coldplug="YES"
-
-
-
-
-# Expert options:
-
-# Disable warning about unreliable kernel/udev combination
-#unreliable_kernel_warning="no"
-
-# Timeout in seconds to wait for processing of uevents at boot.
-# There should be no need to change this.
-#udev_settle_timeout="60"
-
-# Add extra command line options to udevd, use with care
-# udevd --help for possible values
-#udev_opts=""
-
-# Run udevd --debug and write output to /dev/.udev/udev.log
-# Should not be kept on as it fills diskspace slowly
-#udev_debug="YES"
-
-# Run udevadmin monitor to get a log of all events
-# in /dev/.udev/udevmonitor.log
-#udev_monitor="YES"
-
-# Keep udevmonitor running after populating /dev.
-#udev_monitor_keep_running="no"
-
-# Set cmdline options for udevmonitor.
-# could be some of --env --kernel --udev
-#udev_monitor_opts="--env"
-
diff --git a/sys-fs/udev/files/161/udev.initd b/sys-fs/udev/files/161/udev.initd
deleted file mode 100644
index 23fc39c..0000000
--- a/sys-fs/udev/files/161/udev.initd
+++ /dev/null
@@ -1,272 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Run udevd and create the device-nodes"
-
-[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf
-
-rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}}
-
-depend()
-{
- if [ -f /etc/init.d/sysfs ]; then
- # require new enough openrc with sysinit being extra runlevel
- # on linux we just check if sysfs init-script exists
- # this is to silence out ugly warnings about not-existing sysfs script
- provide dev
- if yesno "${rc_device_tarball:-no}"; then
- need sysfs udev-mount udev-dev-tarball
- else
- need sysfs udev-mount
- fi
- before checkfs fsck
-
- # udev does not work inside vservers
- keyword novserver nolxc noopenvz
- fi
-}
-
-cleanup()
-{
- # fail more gracely and not leave udevd running
- start-stop-daemon --stop --exec /sbin/udevd
- exit 1
-}
-
-disable_hotplug_agent()
-{
- if [ -e /proc/sys/kernel/hotplug ]; then
- echo "" >/proc/sys/kernel/hotplug
- fi
-}
-
-root_link()
-{
- /lib/udev/write_root_link_rule
-}
-
-rules_disable_switch()
-{
- # this function disables rules files
- # by creating new files with the same name
- # in a temp rules directory with higher priority
- local f=/dev/.udev/rules.d/"$1" bname="$1" onoff="$2"
-
- if yesno "${onoff}"; then
- echo "# This file disables ${bname} due to /etc/conf.d/udev" \
- > "${f}"
- else
- rm -f "${f}"
- fi
-}
-
-# only called on openrc
-is_service_enabled() {
- local svc="$1"
-
- [ ! -e "/etc/init.d/${svc}" ] && return 1
-
- [ -e "/etc/runlevels/${RC_BOOTLEVEL}/${svc}" ] && return 0
- [ -e "/etc/runlevels/${RC_DEFAULTLEVEL}/${svc}" ] && return 0
- return 1
-}
-
-check_openrc_net()
-{
- local f=/dev/.udev/rules.d/90-network.rules
- is_service_enabled network || return 0
-
- # disable network hotplugging
- echo "# This file disables network hotplug events calling old-style openrc net scripts" >> "${f}"
- echo "# as we use new-style network init script /etc/init.d/network" >> "${f}"
-}
-
-start_udevd()
-{
- # load unix domain sockets if built as module, Bug #221253
- if [ -e /proc/modules ] ; then
- modprobe -q unix 2>/dev/null
- fi
- local opts="${udev_opts}"
-
- ebegin "Starting udevd"
- if yesno "${udev_debug:-no}"; then
- /sbin/udevd --daemon ${opts} --debug 2>/dev/.udev/udev.log
- else
- start-stop-daemon --start --exec /sbin/udevd -- --daemon ${opts}
- fi
-
- eend $?
-}
-
-# populate /dev with devices already found by the kernel
-populate_dev()
-{
- if get_bootparam "nocoldplug" ; then
- rc_coldplug="NO"
- ewarn "Skipping udev coldplug as requested in kernel cmdline"
- fi
-
- ebegin "Populating /dev with existing devices through uevents"
- udevadm control --property=STARTUP=1
- if yesno "${rc_coldplug}"; then
- udevadm trigger --action="add"
- else
- # Do not run any init-scripts, Bug #206518
- udevadm control --property=do_not_run_plug_service=1
-
- # only create device nodes
- udevadm trigger --action="add" --attr-match=dev
-
- # run persistent-net stuff, bug 191466
- udevadm trigger --action="add" --subsystem-match=net
- fi
- eend $?
-
- # we can speed up booting under these conditions:
- # * using devtmpfs so kernel creates device nodes for us
- # * only using kernel created device nodes at boot (in /etc/fstab and elsewhere)
- #
- ebegin "Waiting for uevents to be processed"
- udevadm settle --timeout=${udev_settle_timeout:-60}
- eend $?
-
- udevadm control --property=do_not_run_plug_service=
- udevadm control --property=STARTUP=
- return 0
-}
-
-# for debugging
-start_udevmonitor()
-{
- yesno "${udev_monitor:-no}" || return 0
-
- udevmonitor_log=/dev/.udev/udevmonitor.log
- udevmonitor_pid=/dev/.udev/udevmonitor.pid
-
- einfo "udev: Running udevadm monitor ${udev_monitor_opts} to get a log of all events"
- start-stop-daemon --start --stdout "${udevmonitor_log}" \
- --make-pidfile --pidfile "${udevmonitor_pid}" \
- --background --exec /sbin/udevadm -- monitor ${udev_monitor_opts}
-}
-
-stop_udevmonitor()
-{
- yesno "${udev_monitor:-no}" || return 0
-
- if yesno "${udev_monitor_keep_running:-no}"; then
- ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}"
- else
- einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}"
- start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm
- fi
-}
-
-display_hotplugged_services() {
- local svcfile= svc= services=
- for svcfile in "${RC_SVCDIR}"/hotplugged/*; do
- svc="${svcfile##*/}"
- [ -x "${svcfile}" ] || continue
-
- services="${services} ${svc}"
- done
- [ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}"
-}
-
-check_persistent_net()
-{
- # check if there are problems with persistent-net
- local syspath= devs= problem=false
- for syspath in /sys/class/net/*_rename*; do
- if [ -d "${syspath}" ]; then
- devs="${devs} ${syspath##*/}"
- problem=true
- fi
- done
-
- ${problem} || return 0
-
- eerror "UDEV: Your system has a problem assigning persistent names"
- eerror "to these network interfaces: ${devs}"
-
- einfo "Checking persistent-net rules:"
- # the sed-expression lists all duplicate lines
- # from the input, like "uniq -d" does, but uniq
- # is installed into /usr/bin and not available at boot.
- dups=$(
- RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
- . /lib/udev/rule_generator.functions
- find_all_rules 'NAME=' '.*' | \
- tr ' ' '\n' | \
- sort | \
- sed '$!N; s/^\(.*\)\n\1$/\1/; t; D'
- )
- if [ -n "${dups}" ]; then
- ewarn "The rules create multiple entries assigning these names:"
- eindent
- ewarn "${dups}"
- eoutdent
- else
- ewarn "Found no duplicate names in persistent-net rules,"
- ewarn "there must be some other problem!"
- fi
- return 1
-}
-
-check_udev_works()
-{
- # should exist on every system, else udev failed
- if [ ! -e /dev/zero ]; then
- eerror "Assuming udev failed somewhere, as /dev/zero does not exist."
- return 1
- fi
- return 0
-}
-
-start()
-{
- # do not run this on old baselayout where udev-addon gets loaded
- if [ ! -f /etc/init.d/sysfs ]; then
- eerror "The $SVCNAME init-script is written for baselayout-2!"
- eerror "Please do not use it with baselayout-1!".
- return 1
- fi
-
- check_openrc_net
- _start
-
- display_hotplugged_services
-
- return 0
-}
-
-_start()
-{
- if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then
- ewarn "You should add udev-postmount service to your default runlevel."
- fi
-
- root_link
- rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable:-no}"
- rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable:-no}
-
- disable_hotplug_agent
- start_udevd || cleanup
- start_udevmonitor
- populate_dev || cleanup
-
- check_persistent_net
-
- check_udev_works || cleanup
- stop_udevmonitor
-
- return 0
-}
-
-stop() {
- ebegin "Stopping udevd"
- start-stop-daemon --stop --exec /sbin/udevd
- eend $?
-}
-
diff --git a/sys-fs/udev/files/move_tmp_persistent_rules-112-r1.sh b/sys-fs/udev/files/move_tmp_persistent_rules-112-r1.sh
deleted file mode 100755
index 1a02597..0000000
--- a/sys-fs/udev/files/move_tmp_persistent_rules-112-r1.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-. /etc/init.d/functions.sh
-
-# store persistent-rules that got created while booting
-# when / was still read-only
-store_persistent_rules() {
- local file dest
-
- for file in /dev/.udev/tmp-rules--*; do
- dest=${file##*tmp-rules--}
- [ "$dest" = '*' ] && break
- type=${dest##70-persistent-}
- type=${type%%.rules}
- ebegin "Saving udev persistent ${type} rules to /etc/udev/rules.d"
- cat "$file" >> /etc/udev/rules.d/"$dest" && rm -f "$file"
- eend $? "Failed moving persistent rules!"
- done
-}
-
-store_persistent_rules
-
-# vim:ts=4
diff --git a/sys-fs/udev/files/net-130-r1.sh b/sys-fs/udev/files/net-130-r1.sh
deleted file mode 100755
index af61870..0000000
--- a/sys-fs/udev/files/net-130-r1.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# net.sh: udev external RUN script
-#
-# Copyright 2007 Roy Marples <uberlord@gentoo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-IFACE=$1
-ACTION=$2
-
-SCRIPT=/etc/init.d/net.$IFACE
-
-# ignore interfaces that are registered after being "up" (?)
-case ${IFACE} in
- ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*|ipsec*|tun*|tap*|br*)
- exit 0 ;;
-esac
-
-# stop here if coldplug is disabled, Bug #206518
-if [ "${do_not_run_plug_service}" = 1 ]; then
- exit 0
-fi
-
-if [ ! -x "${SCRIPT}" ] ; then
- #do not flood log with messages, bug #205687
- #logger -t udev-net.sh "${SCRIPT}: does not exist or is not executable"
- exit 1
-fi
-
-# If we're stopping then sleep for a bit in-case a daemon is monitoring
-# the interface. This to try and ensure we stop after they do.
-[ "${ACTION}" == "stop" ] && sleep 2
-
-IN_HOTPLUG=1 "${SCRIPT}" --quiet "${ACTION}"
diff --git a/sys-fs/udev/files/pnp-aliases b/sys-fs/udev/files/pnp-aliases
deleted file mode 100644
index 3675fbb..0000000
--- a/sys-fs/udev/files/pnp-aliases
+++ /dev/null
@@ -1,17 +0,0 @@
-# /etc/modprobe.d/pnp-aliases
-#
-# These aliases are used by this udev-rule:
-# SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'"
-#
-# They should help to autoload drivers used by various pnp-devices
-# (if not blacklisted somewhere else)
-#
-alias pnp:dPNP0510 irtty-sir
-alias pnp:dPNP0511 irtty-sir
-alias pnp:dPNP0700 floppy
-alias pnp:dPNP0800 pcspkr
-alias pnp:dPNP0b00 rtc
-alias pnp:dPNP0303 atkbd
-alias pnp:dPNP0f13 psmouse
-alias pnp:dPNPb02f analog
-
diff --git a/sys-fs/udev/files/write_root_link_rule-125 b/sys-fs/udev/files/write_root_link_rule-125
deleted file mode 100755
index 8eaea11..0000000
--- a/sys-fs/udev/files/write_root_link_rule-125
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# This script should run before doing udevtrigger at boot.
-# It will create a rule matching the device directory / is on, and
-# creating /dev/root symlink pointing on its device node.
-#
-# This is especially useful for hal looking at /proc/mounts containing
-# a line listing /dev/root as device:
-# /dev/root / reiserfs rw 0 0
-#
-# This program 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 version 2 of the License.
-#
-# (c) 2007-2008 Matthias Schwarzott <zzam@gentoo.org>
-
-eval $(udevadm info --export --export-prefix="ROOT_" --device-id-of-file=/)
-
-[ $? = 0 ] || exit 0
-[ "$ROOT_MAJOR" = 0 ] && exit 0
-
-DIR=/dev/.udev/rules.d
-[ -d "$DIR" ] || mkdir -p "$DIR"
-RULES=$DIR/10-root-link.rules
-
-echo "# Created by /lib/udev/write_root_link_rule" > "${RULES}"
-echo "# This rule should create /dev/root as link to real root device." >> "${RULES}"
-echo "SUBSYSTEM==\"block\", ENV{MAJOR}==\"$ROOT_MAJOR\", ENV{MINOR}==\"$ROOT_MINOR\", SYMLINK+=\"root\"" >> "${RULES}"
-
diff --git a/sys-fs/udev/udev-162.ebuild b/sys-fs/udev/udev-162.ebuild
deleted file mode 100644
index 8802212..0000000
--- a/sys-fs/udev/udev-162.ebuild
+++ /dev/null
@@ -1,566 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-162.ebuild,v 1.1 2010/09/12 12:05:23 zzam Exp $
-
-EAPI="1"
-
-inherit eutils flag-o-matic multilib toolchain-funcs linux-info
-
-#PATCHSET=${P}-gentoo-patchset-v1
-scriptversion=161
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
- EGIT_BRANCH="master"
- inherit git autotools
-else
- # please update testsys-tarball whenever udev-xxx/test/sys/ is changed
- SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
- test? ( mirror://gentoo/${PN}-151-testsys.tar.bz2 )"
- [[ -n "${PATCHSET}" ]] && SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
-fi
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="selinux extras test systemd"
-
-COMMON_DEPEND="selinux? ( sys-libs/libselinux )
- extras? (
- sys-apps/acl
- >=sys-apps/usbutils-0.82
- virtual/libusb:0
- sys-apps/pciutils
- dev-libs/glib:2
- )
- >=sys-apps/util-linux-2.16
- >=sys-libs/glibc-2.9"
-
-DEPEND="${COMMON_DEPEND}
- extras? (
- dev-util/gperf
- dev-util/pkgconfig
- )
- virtual/os-headers
- !<sys-kernel/linux-headers-2.6.29
- test? ( app-text/tree )"
-
-RDEPEND="${COMMON_DEPEND}
- !sys-apps/coldplug
- !<sys-fs/lvm2-2.02.45
- !sys-fs/device-mapper
- >=sys-apps/baselayout-1.12.5"
-
-if [[ ${PV} == "9999" ]]; then
- # for documentation processing with xsltproc
- DEPEND="${DEPEND}
- app-text/docbook-xsl-stylesheets
- app-text/docbook-xml-dtd
- dev-util/gtk-doc"
-fi
-
-# required kernel options
-CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
- ~!IDE"
-
-# We need the lib/rcscripts/addon support
-PROVIDE="virtual/dev-manager"
-
-udev_check_KV() {
- local ok=0
- if [[ ${KV_MAJOR} == 2 && ${KV_MINOR} == 6 ]]
- then
- if kernel_is -ge 2 6 ${KV_PATCH_reliable} ; then
- ok=2
- elif kernel_is -ge 2 6 ${KV_PATCH_min} ; then
- ok=1
- fi
- fi
- return $ok
-}
-
-pkg_setup() {
- linux-info_pkg_setup
-
- udev_libexec_dir="/$(get_libdir)/udev"
-
- # udev requires signalfd introduced in kernel 2.6.25,
- # but a glibc compiled against >=linux-headers-2.6.27 uses the
- # new signalfd syscall introduced in kernel 2.6.27 without falling back
- # to the old one. So we just depend on 2.6.27 here, see Bug #281312.
- KV_PATCH_min=25
- KV_PATCH_reliable=27
- KV_min=2.6.${KV_PATCH_min}
- KV_reliable=2.6.${KV_PATCH_reliable}
-
- # always print kernel version requirements
- ewarn
- ewarn "${P} does not support Linux kernel before version ${KV_min}!"
- if [[ ${KV_PATCH_min} != ${KV_PATCH_reliable} ]]; then
- ewarn "For a reliable udev, use at least kernel ${KV_reliable}"
- fi
-
- echo
- # We don't care about the secondary revision of the kernel.
- # 2.6.30.4 -> 2.6.30 is all we check
- udev_check_KV
- case "$?" in
- 2) einfo "Your kernel version (${KV_FULL}) is new enough to run ${P} reliably." ;;
- 1) ewarn "Your kernel version (${KV_FULL}) is new enough to run ${P},"
- ewarn "but it may be unreliable in some cases."
- ebeep ;;
- 0) eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
- ebeep ;;
- esac
- echo
-
- KV_FULL_SRC=${KV_FULL}
- get_running_version
- udev_check_KV
- if [[ "$?" = "0" ]]; then
- eerror
- eerror "udev cannot be restarted after emerging,"
- eerror "as your running kernel version (${KV_FULL}) is too old."
- eerror "You really need to use a newer kernel after a reboot!"
- NO_RESTART=1
- ebeep
- fi
-}
-
-sed_libexec_dir() {
- sed -e "s#/lib/udev#${udev_libexec_dir}#" -i "$@"
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git_src_unpack
- else
- unpack ${A}
-
- if use test; then
- mv "${WORKDIR}"/test/sys "${S}"/test/
- fi
- fi
-
- cd "${S}"
-
- # patches go here...
-
- # backport some patches
- if [[ -n "${PATCHSET}" ]]; then
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" epatch
- fi
-
- # change rules back to group uucp instead of dialout for now
- sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
- -i rules/{rules.d,arch}/*.rules \
- || die "failed to change group dialout to uucp"
-
- if [[ ${PV} != 9999 ]]; then
- # Make sure there is no sudden changes to upstream rules file
- # (more for my own needs than anything else ...)
- MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules")
- MD5=${MD5/ -/}
- if [[ ${MD5} != 4c325a57c0624e240c2180744385fa3a ]]
- then
- echo
- eerror "50-udev-default.rules has been updated, please validate!"
- eerror "md5sum: ${MD5}"
- die "50-udev-default.rules has been updated, please validate!"
- fi
- fi
-
- sed_libexec_dir \
- rules/rules.d/50-udev-default.rules \
- rules/rules.d/78-sound-card.rules \
- extras/rule_generator/write_*_rules \
- || die "sed failed"
-
- if [[ ${PV} == 9999 ]]; then
- gtkdocize --copy
- eautoreconf
- fi
-}
-
-src_compile() {
- filter-flags -fprefetch-loop-arrays
-
- systemdunits=""
- if use systemd; then
- systemdunits="--with-systemdsystemunitdir=/lib/systemd/system"
- fi
-
- econf \
- --prefix=/usr \
- --sysconfdir=/etc \
- --sbindir=/sbin \
- --libdir=/usr/$(get_libdir) \
- --with-rootlibdir=/$(get_libdir) \
- --libexecdir="${udev_libexec_dir}" \
- --enable-logging \
- --enable-static \
- $(use_with selinux) \
- $(use_enable extras) \
- ${systemdunits} \
- --disable-introspection
- # we don't have gobject-introspection in portage tree
-
- emake || die "compiling udev failed"
-}
-
-src_install() {
- local scriptdir="${FILESDIR}/${scriptversion}"
-
- into /
- emake DESTDIR="${D}" install || die "make install failed"
-
- exeinto "${udev_libexec_dir}"
- newexe "${FILESDIR}"/net-130-r1.sh net.sh || die "net.sh not installed properly"
- newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \
- || die "move_tmp_persistent_rules.sh not installed properly"
- newexe "${FILESDIR}"/write_root_link_rule-125 write_root_link_rule \
- || die "write_root_link_rule not installed properly"
-
- doexe "${scriptdir}"/shell-compat-KV.sh \
- || die "shell-compat.sh not installed properly"
- doexe "${scriptdir}"/shell-compat-addon.sh \
- || die "shell-compat.sh not installed properly"
-
- keepdir "${udev_libexec_dir}"/state
- keepdir "${udev_libexec_dir}"/devices
-
- # create symlinks for these utilities to /sbin
- # where multipath-tools expect them to be (Bug #168588)
- dosym "..${udev_libexec_dir}/scsi_id" /sbin/scsi_id
-
- # Add gentoo stuff to udev.conf
- echo "# If you need to change mount-options, do it in /etc/fstab" \
- >> "${D}"/etc/udev/udev.conf
-
- # let the dir exist at least
- keepdir /etc/udev/rules.d
-
- # Now installing rules
- cd "${S}"/rules
- insinto "${udev_libexec_dir}"/rules.d/
-
- # Our rules files
- doins "${scriptdir}"/??-*.rules
-
- # support older kernels
- doins misc/30-kernel-compat.rules
-
- # Adding arch specific rules
- if [[ -f arch/40-${ARCH}.rules ]]
- then
- doins "arch/40-${ARCH}.rules"
- fi
- cd "${S}"
-
- # our udev hooks into the rc system
- insinto /$(get_libdir)/rcscripts/addons
- doins "${scriptdir}"/udev-start.sh \
- || die "udev-start.sh not installed properly"
- doins "${scriptdir}"/udev-stop.sh \
- || die "udev-stop.sh not installed properly"
-
- local init
- # udev-postmount and init-scripts for >=openrc-0.3.1, Bug #240984
- for init in udev udev-mount udev-dev-tarball udev-postmount; do
- newinitd "${scriptdir}/${init}.initd" "${init}" \
- || die "initscript ${init} not installed properly"
- done
-
- # insert minimum kernel versions
- sed -e "s/%KV_MIN%/${KV_min}/" \
- -e "s/%KV_MIN_RELIABLE%/${KV_reliable}/" \
- -i "${D}"/etc/init.d/udev-mount
-
- # config file for init-script and start-addon
- newconfd "${scriptdir}/udev.confd" udev \
- || die "config file not installed properly"
-
- insinto /etc/modprobe.d
- newins "${FILESDIR}"/blacklist-146 blacklist.conf
- newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf
-
- # convert /lib/udev to real used dir
- sed_libexec_dir \
- "${D}/$(get_libdir)"/rcscripts/addons/*.sh \
- "${D}/${udev_libexec_dir}"/write_root_link_rule \
- "${D}"/etc/conf.d/udev \
- "${D}"/etc/init.d/udev* \
- "${D}"/etc/modprobe.d/*
-
- # documentation
- dodoc ChangeLog README TODO || die "failed installing docs"
-
- # keep doc in just one directory, Bug #281137
- rm -rf "${D}/usr/share/doc/${PN}"
- if use extras; then
- dodoc extras/keymap/README.keymap.txt || die "failed installing docs"
- fi
-}
-
-pkg_preinst() {
- # moving old files to support newer modprobe, 12 May 2009
- local f dir=${ROOT}/etc/modprobe.d/
- for f in pnp-aliases blacklist; do
- if [[ -f $dir/$f && ! -f $dir/$f.conf ]]
- then
- elog "Moving $dir/$f to $f.conf"
- mv -f "$dir/$f" "$dir/$f.conf"
- fi
- done
-
- if [[ -d ${ROOT}/lib/udev-state ]]
- then
- mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/
- rm -r "${ROOT}"/lib/udev-state
- fi
-
- if [[ -f ${ROOT}/etc/udev/udev.config &&
- ! -f ${ROOT}/etc/udev/udev.rules ]]
- then
- mv -f "${ROOT}"/etc/udev/udev.config "${ROOT}"/etc/udev/udev.rules
- fi
-
- # delete the old udev.hotplug symlink if it is present
- if [[ -h ${ROOT}/etc/hotplug.d/default/udev.hotplug ]]
- then
- rm -f "${ROOT}"/etc/hotplug.d/default/udev.hotplug
- fi
-
- # delete the old wait_for_sysfs.hotplug symlink if it is present
- if [[ -h ${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug ]]
- then
- rm -f "${ROOT}"/etc/hotplug.d/default/05-wait_for_sysfs.hotplug
- fi
-
- # delete the old wait_for_sysfs.hotplug symlink if it is present
- if [[ -h ${ROOT}/etc/hotplug.d/default/10-udev.hotplug ]]
- then
- rm -f "${ROOT}"/etc/hotplug.d/default/10-udev.hotplug
- fi
-
- has_version "=${CATEGORY}/${PN}-103-r3"
- previous_equal_to_103_r3=$?
-
- has_version "<${CATEGORY}/${PN}-104-r5"
- previous_less_than_104_r5=$?
-
- has_version "<${CATEGORY}/${PN}-106-r5"
- previous_less_than_106_r5=$?
-
- has_version "<${CATEGORY}/${PN}-113"
- previous_less_than_113=$?
-}
-
-# 19 Nov 2008
-fix_old_persistent_net_rules() {
- local rules=${ROOT}/etc/udev/rules.d/70-persistent-net.rules
- [[ -f ${rules} ]] || return
-
- elog
- elog "Updating persistent-net rules file"
-
- # Change ATTRS to ATTR matches, Bug #246927
- sed -i -e 's/ATTRS{/ATTR{/g' "${rules}"
-
- # Add KERNEL matches if missing, Bug #246849
- sed -ri \
- -e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \
- "${rules}"
-}
-
-# See Bug #129204 for a discussion about restarting udevd
-restart_udevd() {
- if [[ ${NO_RESTART} = "1" ]]; then
- ewarn "Not restarting udevd, as your kernel is too old!"
- return
- fi
-
- # need to merge to our system
- [[ ${ROOT} = / ]] || return
-
- # check if root of init-process is identical to ours (not in chroot)
- [[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] || return
-
- # abort if there is no udevd running
- [[ -n $(pidof udevd) ]] || return
-
- # abort if no /dev/.udev exists
- [[ -e /dev/.udev ]] || return
-
- elog
- elog "restarting udevd now."
-
- killall -15 udevd &>/dev/null
- sleep 1
- killall -9 udevd &>/dev/null
-
- /sbin/udevd --daemon
- sleep 3
- if [[ ! -n $(pidof udevd) ]]; then
- eerror "FATAL: udev died, please check your kernel is"
- eerror "new enough and configured correctly for ${P}."
- eerror
- eerror "Please have a look at this before rebooting."
- eerror "If in doubt, please downgrade udev back to your old version"
- ebeep
- fi
-}
-
-postinst_init_scripts() {
- # FIXME: we may need some code that detects if this is a system bootstrap
- # and auto-enables udev then
- #
- # FIXME: inconsistent handling of init-scripts here
- # * udev is added to sysinit in openrc-ebuild
- # * we add udev-postmount to default in here
- #
-
- # migration to >=openrc-0.4
- if [[ -e "${ROOT}"/etc/runlevels/sysinit && ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
- then
- ewarn
- ewarn "You need to add the udev init script to the runlevel sysinit,"
- ewarn "else your system will not be able to boot"
- ewarn "after updating to >=openrc-0.4.0"
- ewarn "Run this to enable udev for >=openrc-0.4.0:"
- ewarn "\trc-update add udev sysinit"
- ewarn
- fi
-
- # add udev-postmount to default runlevel instead of that ugly injecting
- # like a hotplug event, 2009/10/15
-
- # already enabled?
- [[ -e "${ROOT}"/etc/runlevels/default/udev-postmount ]] && return
-
- local enable_postmount=0
- [[ -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=1
- [[ "${ROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=1
-
- if [[ ${enable_postmount} = 1 ]]
- then
- local initd=udev-postmount
-
- if [[ -e ${ROOT}/etc/init.d/${initd} ]] && \
- [[ ! -e ${ROOT}/etc/runlevels/default/${initd} ]]
- then
- ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/default/${initd}
- elog "Auto-adding '${initd}' service to your default runlevel"
- fi
- else
- elog "You should add the udev-postmount service to default runlevel."
- elog "Run this to add it:"
- elog "\trc-update add udev-postmount default"
- fi
-}
-
-pkg_postinst() {
- fix_old_persistent_net_rules
-
- restart_udevd
-
- postinst_init_scripts
-
- # people want reminders, I'll give them reminders. Odds are they will
- # just ignore them anyway...
-
- # delete 40-scsi-hotplug.rules, it is integrated in 50-udev.rules, 19 Jan 2007
- if [[ $previous_equal_to_103_r3 = 0 ]] &&
- [[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
- then
- ewarn "Deleting stray 40-scsi-hotplug.rules"
- ewarn "installed by sys-fs/udev-103-r3"
- rm -f "${ROOT}"/etc/udev/rules.d/40-scsi-hotplug.rules
- fi
-
- # Removing some device-nodes we thought we need some time ago, 25 Jan 2007
- if [[ -d ${ROOT}/lib/udev/devices ]]
- then
- rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom}
- fi
-
- # Removing some old file, 29 Jan 2007
- if [[ $previous_less_than_104_r5 = 0 ]]
- then
- rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
- rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
- fi
-
- # 19 Mar 2007
- if [[ $previous_less_than_106_r5 = 0 ]] &&
- [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
- then
- rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
- fi
-
- # Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007
- if [[ -d ${ROOT}/etc/dev.d ]]
- then
- rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d 2>/dev/null
- if [[ -d ${ROOT}/etc/dev.d ]]
- then
- ewarn "You still have the directory /etc/dev.d on your system."
- ewarn "This is no longer used by udev and can be removed."
- fi
- fi
-
- # 64-device-mapper.rules now gets installed by sys-fs/device-mapper
- # remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007
- if [[ $previous_less_than_113 = 0 ]] &&
- [[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
- ! has_version sys-fs/device-mapper
- then
- rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules
- einfo "Removed unneeded file 64-device-mapper.rules"
- fi
-
- # requested in bug #275974, added 2009/09/05
- ewarn
- ewarn "If after the udev update removable devices or CD/DVD drives"
- ewarn "stop working, try re-emerging HAL before filling a bug report"
-
- # requested in Bug #225033:
- elog
- elog "persistent-net does assigning fixed names to network devices."
- elog "If you have problems with the persistent-net rules,"
- elog "just delete the rules file"
- elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
- elog "and then reboot."
- elog
- elog "This may however number your devices in a different way than they are now."
-
- ewarn
- ewarn "If you build an initramfs including udev, then please"
- ewarn "make sure that the /sbin/udevadm binary gets included,"
- ewarn "and your scripts changed to use it,as it replaces the"
- ewarn "old helper apps udevinfo, udevtrigger, ..."
-
- ewarn
- ewarn "mount options for directory /dev are no longer"
- ewarn "set in /etc/udev/udev.conf, but in /etc/fstab"
- ewarn "as for other directories."
-
- ewarn
- ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
- ewarn "then please migrate over to using the device names"
- ewarn "/dev/md*, /dev/loop* and /dev/ram*."
- ewarn "The devfs-compat rules have been removed."
- ewarn "For reference see Bug #269359."
-
- ewarn
- ewarn "Rules for /dev/hd* devices have been removed"
- ewarn "Please migrate to libata."
-
- elog
- elog "For more information on udev on Gentoo, writing udev rules, and"
- elog " fixing known issues visit:"
- elog " http://www.gentoo.org/doc/en/udev-guide.xml"
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-04-20 17:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-20 17:29 [gentoo-commits] proj/betagarden:master commit in: sys-fs/udev/files/161/, dev-lang/php/files/eblits/, sys-fs/udev/, Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox