Sync with portage [Fri Mar 15 18:35:44 MSK 2013].

mhiretskiy
root 11 years ago
parent ba7385bfdd
commit be902dcdef

@ -1,74 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/389-ds-console/389-ds-console-1.2.3-r1.ebuild,v 1.4 2010/10/17 10:07:00 lxnay Exp $
EAPI="2"
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2 eutils versionator
MY_PV=${PV/_alpha/.a}
MY_PV=${MY_PV/_rc/.rc}
MY_MV="$(get_version_component_range 1-2)"
DESCRIPTION="Java based remote management console used for Managing 389-admin 389-ds"
HOMEPAGE="http://port389.org/"
SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="1.2"
KEYWORDS="~amd64 ~x86"
IUSE=""
COMMON_DEP="dev-java/jss:3.4
dev-java/ldapsdk:4.1
>=dev-java/idm-console-framework-1.1
net-nds/389-ds-base"
RDEPEND="|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 )
${COMMON_DEP}"
DEPEND="sys-apps/sed
>=virtual/jdk-1.6
${COMMON_DEP}"
src_prepare() {
# Gentoo java rules say no jars with version number
# so sed away the version indicator '-'
sed -e "s!-\*!\*!g" -i build.xml || die "sed failed"
java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
java-pkg_jar-from jss-3.4 xpclass.jar jss4.jar
java-pkg_jar-from idm-console-framework-1.1
}
src_compile() {
eant -Dbuilt.dir="${S}"/build \
-Dldapjdk.location="${S}" \
-Djss.location="${S}" \
-Dconsole.location="${S}" ${antflags}
use doc && eant -Dbuilt.dir="${S}"/build \
-Dldapjdk.location="${S}" \
-Djss.location="${S}" \
-Dconsole.location="${S}" ${antflags} javadoc
}
src_install() {
java-pkg_jarinto /usr/share/dirsrv/html/java
java-pkg_newjar "${S}"/build/package/389-ds-${MY_PV}.jar 389-ds-${MY_PV}.jar
java-pkg_newjar "${S}"/build/package/389-ds-${MY_PV}_en.jar 389-ds-${MY_PV}_en.jar
dosym 389-ds-${MY_PV}.jar /usr/share/dirsrv/html/java/389-ds.jar
dosym 389-ds-${MY_PV}_en.jar /usr/share/dirsrv/html/java/389-ds_en.jar
dosym 389-ds-${MY_PV}.jar /usr/share/dirsrv/html/java/389-ds-${MY_MV}.jar
dosym 389-ds-${MY_PV}_en.jar /usr/share/dirsrv/html/java/389-ds-${MY_MV}_en.jar
insinto /usr/share/dirsrv/manual/en/slapd
doins "${S}"/help/en/*.html
doins "${S}"/help/en/tokens.map
insinto /usr/share/dirsrv/manual/en/slapd/help
doins "${S}"/help/en/help/*.html
use doc && java-pkg_dojavadoc build/doc
use source && java-pkg_dosrc src/com
}

@ -1,2 +1 @@
DIST 389-ds-console-1.2.3.tar.bz2 786681 SHA256 a866e4cbef6445d8540b250c0f4ea9617501f6ea1b9c183b4745455bb59eefed SHA512 a8a3318d8f89e6af6a22e1e4052d3ade55ad5661f05fb80812c65d48d7dce031118257550a2612e923ad549ab372ed888b937ffe877aaac8f3592f70689f0768 WHIRLPOOL aeef0781c33100185ebe06ec1bb7b95ca6be8b53323aaa495665867fcdf9762df98b1e1ddfbaffd639db96a5e80635ee7ffff92a800712f51cbcca83051dd639
DIST 389-ds-console-1.2.6.tar.bz2 791388 SHA256 142a8e1e22bb4c617d2bcdb3d2257e92f2b34d2cd839ed1325f59fc52b70f410 SHA512 ae62afec7860365156f991a420c701e7057190793f577823e5f8b0e1e3d9c9fb240f8d2f30d9a9160baa86aa968e242ef6a9d9faf6608e1218da8f071a620e02 WHIRLPOOL def2e14fb8c7771711efde18cb53f6d6c36de077221c27e219cf97797a5d5c6fb126bf9485a2133676be2f239c065970fb8731c9ddccf3088bcc18ab485169f5

@ -1,2 +1,3 @@
DIST entropy-136.tar.bz2 1612759 SHA256 4384b251f259c868f8ee3480701beecb466ca8c5727915e6b437291d03f4c63b SHA512 3b2725de557efa76ee65f368f486ab952f49a63474b5226e7b9ce137bee1c9c1ef73074c4d255e3d8695666556923d827c9cb1e232b307c4893d76e6cc6fb948 WHIRLPOOL 222d2c292c4a7c0d465be31898c4b2bf1469b7c769b4099106ded24334f4d16dde1f95ea532cbb2a167e2b7fcc30e6f59974839c3a8019c02c962fc634556e1b
DIST entropy-144.tar.bz2 1616075 SHA256 173825d13f4b5c5aecf4d82b4e593921baf2209496be56190babbb142ad9b75d SHA512 30ca32fdf0747530c656ec9c96aed5dad00e8fb4181bd4c2e4a4aed3c5b06427e5b07baa41db13ff03d6730f13607e86f557aad84cb6e85af5d9c49029a911c7 WHIRLPOOL a14b76a2c247e2d4db12e2c78735c64ca183a474758f8b8ab9748cd93378300cd737377888beb03cc64e0ddeff0cb201fd790489ddfee48b8cf82032429509ac
DIST entropy-183.tar.bz2 1685003 SHA256 5b2d99ef61a68497c228c392d607faa7fef9b5debe7628f381e4facbef290f38 SHA512 95b83797fc519c5cfd12a985ee3221ffe83fe19289681ca1b0f022a7b9491bdf9b74a06fe4f010536a22db78bac4f3325fc5eab0c11243240fdee5789690e2aa WHIRLPOOL bbd6c44e5bce24e602f89075e126b5e914900aad8bd3b1ff301c733d8838f4cd1aac279a707f81c0873c24259078e5fdc9dacbf1f30d0fd5eef3aa9f9376f7c5

@ -0,0 +1,45 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/equo/equo-183.ebuild,v 1.1 2013/03/14 18:09:19 lxnay Exp $
EAPI=3
PYTHON_DEPEND="2"
inherit eutils python bash-completion-r1
DESCRIPTION="Entropy Package Manager text-based client"
HOMEPAGE="http://www.sabayon.org"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
S="${WORKDIR}/entropy-${PV}"
DEPEND="~sys-apps/entropy-${PV}"
RDEPEND="${DEPEND} sys-apps/file[python]"
src_compile() {
cd "${S}"/client || die
emake || die "make failed"
}
src_install() {
cd "${S}"/client || die
emake DESTDIR="${D}" LIBDIR="usr/lib" install || die "make install failed"
newbashcomp "${S}/misc/equo-completion.bash" equo
}
pkg_postinst() {
python_mod_optimize "/usr/lib/entropy/client"
echo
elog "If you would like to allow users in the 'entropy' group"
elog "to update available package repositories, please consider"
elog "to install sys-apps/rigo-daemon"
echo
}
pkg_postrm() {
python_mod_cleanup "/usr/lib/entropy/client"
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.4.ebuild,v 1.9 2013/03/14 07:49:52 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.4.ebuild,v 1.11 2013/03/14 16:20:41 ago Exp $
EAPI=4
@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
RDEPEND="sys-apps/sed

@ -0,0 +1,32 @@
From dd849a9be540bedd4fd904cc0b86ccd9c3e34af2 Mon Sep 17 00:00:00 2001
From: Stuart McLaren <stuart.mclaren@hp.com>
Date: Thu, 14 Mar 2013 13:43:36 +0000
Subject: [PATCH] Do not return location in headers
In some cases credentials were being leaked when downloading a cached
v1 image.
Fixes bug 1135541, CVE-2013-1840
Change-Id: I3ec0a8f484fe1bdc32c3c56fce810fcef347a7f6
---
glance/api/middleware/cache.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/glance/api/middleware/cache.py b/glance/api/middleware/cache.py
index 8e24ef0..dcd59b6 100644
--- a/glance/api/middleware/cache.py
+++ b/glance/api/middleware/cache.py
@@ -111,6 +111,9 @@ class CacheFilter(wsgi.Middleware):
def _process_v1_request(self, request, image_id, image_iterator):
image_meta = registry.get_image_metadata(request.context, image_id)
+ # Don't display location
+ if 'location' in image_meta:
+ del image_meta['location']
if not image_meta['size']:
# override image size metadata with the actual cached
--
1.8.1.5

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2012.2.3.ebuild,v 1.1 2013/02/07 18:02:58 prometheanfire Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2012.2.3-r1.ebuild,v 1.1 2013/03/14 21:07:12 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@ -47,6 +47,10 @@ RDEPEND="${DEPEND}
postgres? ( dev-python/sqlalchemy[postgres] )
ldap? ( dev-python/python-ldap )"
PATCHES=(
"${FILESDIR}/glance-folsom-3-CVE-2013-1840.patch"
)
python_install() {
distutils-r1_python_install
newconfd "${FILESDIR}/glance.confd" glance

@ -0,0 +1 @@
DIST entropy-183.tar.bz2 1685003 SHA256 5b2d99ef61a68497c228c392d607faa7fef9b5debe7628f381e4facbef290f38 SHA512 95b83797fc519c5cfd12a985ee3221ffe83fe19289681ca1b0f022a7b9491bdf9b74a06fe4f010536a22db78bac4f3325fc5eab0c11243240fdee5789690e2aa WHIRLPOOL bbd6c44e5bce24e602f89075e126b5e914900aad8bd3b1ff301c733d8838f4cd1aac279a707f81c0873c24259078e5fdc9dacbf1f30d0fd5eef3aa9f9376f7c5

@ -0,0 +1,38 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/matter/matter-183.ebuild,v 1.1 2013/03/14 18:21:19 lxnay Exp $
EAPI=3
PYTHON_DEPEND="2"
inherit eutils python bash-completion-r1
DESCRIPTION="Automated Packages Builder for Portage and Entropy"
HOMEPAGE="http://www.sabayon.org"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="+entropy"
SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
S="${WORKDIR}/entropy-${PV}/${PN}"
DEPEND=""
RDEPEND="entropy? ( ~sys-apps/entropy-${PV} )
sys-apps/file[python]"
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
emake DESTDIR="${D}" base-install || die "make base-install failed"
if use entropy; then
emake DESTDIR="${D}" entropysrv-install || die "make base-install failed"
fi
}
pkg_postinst() {
python_mod_optimize "/usr/lib/matter"
}
pkg_postrm() {
python_mod_cleanup "/usr/lib/matter"
}

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
<use>
<flag name='entropy'>Add Entropy support</flag>
</use>
</pkgmetadata>

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.21.ebuild,v 1.2 2013/03/13 18:55:57 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.21.ebuild,v 1.5 2013/03/14 15:09:59 ago Exp $
EAPI="4"
USE_RUBY="ruby18 ruby19"
@ -17,7 +17,7 @@ HOMEPAGE="http://puppetlabs.com/"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
KEYWORDS="~amd64 hppa ~ppc ~sparc ~x86"
KEYWORDS="amd64 hppa ppc ~sparc x86"
ruby_add_rdepend "
>=dev-ruby/facter-1.5.6

@ -1,2 +1,3 @@
DIST entropy-136.tar.bz2 1612759 SHA256 4384b251f259c868f8ee3480701beecb466ca8c5727915e6b437291d03f4c63b SHA512 3b2725de557efa76ee65f368f486ab952f49a63474b5226e7b9ce137bee1c9c1ef73074c4d255e3d8695666556923d827c9cb1e232b307c4893d76e6cc6fb948 WHIRLPOOL 222d2c292c4a7c0d465be31898c4b2bf1469b7c769b4099106ded24334f4d16dde1f95ea532cbb2a167e2b7fcc30e6f59974839c3a8019c02c962fc634556e1b
DIST entropy-144.tar.bz2 1616075 SHA256 173825d13f4b5c5aecf4d82b4e593921baf2209496be56190babbb142ad9b75d SHA512 30ca32fdf0747530c656ec9c96aed5dad00e8fb4181bd4c2e4a4aed3c5b06427e5b07baa41db13ff03d6730f13607e86f557aad84cb6e85af5d9c49029a911c7 WHIRLPOOL a14b76a2c247e2d4db12e2c78735c64ca183a474758f8b8ab9748cd93378300cd737377888beb03cc64e0ddeff0cb201fd790489ddfee48b8cf82032429509ac
DIST entropy-183.tar.bz2 1685003 SHA256 5b2d99ef61a68497c228c392d607faa7fef9b5debe7628f381e4facbef290f38 SHA512 95b83797fc519c5cfd12a985ee3221ffe83fe19289681ca1b0f022a7b9491bdf9b74a06fe4f010536a22db78bac4f3325fc5eab0c11243240fdee5789690e2aa WHIRLPOOL bbd6c44e5bce24e602f89075e126b5e914900aad8bd3b1ff301c733d8838f4cd1aac279a707f81c0873c24259078e5fdc9dacbf1f30d0fd5eef3aa9f9376f7c5

@ -0,0 +1,48 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/rigo/rigo-183.ebuild,v 1.1 2013/03/14 18:25:14 lxnay Exp $
EAPI="3"
PYTHON_DEPEND="2"
inherit eutils gnome2-utils fdo-mime python
DESCRIPTION="Rigo, the Sabayon Application Browser"
HOMEPAGE="http://www.sabayon.org"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
S="${WORKDIR}/entropy-${PV}/rigo"
RDEPEND="
|| ( dev-python/pygobject-cairo:3 dev-python/pygobject:3[cairo] )
~sys-apps/entropy-${PV}
~sys-apps/rigo-daemon-${PV}
sys-devel/gettext
x11-libs/gtk+:3
x11-libs/vte:2.90
>=x11-misc/xdg-utils-1.1.0_rc1_p20120319"
DEPEND=""
src_compile() {
emake || die "make failed"
}
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
}
pkg_postinst() {
fdo-mime_mime_database_update
fdo-mime_desktop_database_update
python_mod_optimize "/usr/lib/rigo/${PN}"
}
pkg_postrm() {
fdo-mime_mime_database_update
fdo-mime_desktop_database_update
python_mod_cleanup "/usr/lib/rigo/${PN}"
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.2.4.ebuild,v 1.9 2013/03/14 07:48:02 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.2.4.ebuild,v 1.11 2013/03/14 16:18:34 ago Exp $
EAPI=4
inherit flag-o-matic multilib toolchain-funcs
@ -13,7 +13,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
LICENSE="unRAR"
SLOT="0"
KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
IUSE=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"

@ -9,3 +9,4 @@ DIST elisp-manual-21.2.8-patches.tar.gz 1736 SHA256 e9d78d341c365e6ee8b2e716415c
DIST elisp-manual-22-2.9.tar.bz2 669809 SHA256 2e2b830af263c7313072d181af47aef2ee4d5cddb98d49793e0aa498c23e77a6 SHA512 386020d0ba1f26985c5a31597a96c64eef358a35f409ec7ec6616ac70b661220c692e2b7c2dae47525e7389d058659c6a4fb0a6d44fea12cb5dd5c877049d56e WHIRLPOOL 237513530156bf43821ce6394fed10cba95cf30614c9fd755bbc5a2af657d615fbfca0a096655a9558a982264a97ce2480f0794259f372b9286af8350b34046b
DIST elisp-manual-23.4.tar.xz 686868 SHA256 cb129eb4e026147d5a19d071dd0960467874a0e97ecfae2a3988421c37ea5c70 SHA512 bf71dd18cdce1dce8880b9e67276d9cb71ef54023b5ef2f6555c85c1ffe9b9b8f0d7434227643564c9403fe484bfaeac10ea8911f9c53a9acb3d502eddc1d62d WHIRLPOOL 276b7249e3535af4208d8671e81e5ceb522d1b0c66a261c315ea0c8024c80d58f1c2677b54d8a9c29807273812c841fcc9f70085af9c9e53b0998854dbbbc3f7
DIST elisp-manual-24.2.tar.xz 726116 SHA256 e6688d44388fad2df5b15dee8c5971611e9ecc2373370fb41df58095674d87ad SHA512 204527671c2bc9108e8ea7692479db8d128612f09d5450402bc1ac1ea6e41e28bc395a46971ebcef639b7dd8651ad10a0ab78adbc6e50e0329160f1f38dbaec6 WHIRLPOOL a10722d6142f65e82b42817746c3e27cdfed04a75a72517539e157fcd5b7ed4590409a06219acfad8d88a982eea3f36c03f2ac031337387a2aa752241aff122d
DIST elisp-manual-24.3.tar.xz 739784 SHA256 7d58eecad819cf11f6cdc7763e680b526d02d6e17ba4b21a5d405dc8d581a9cc SHA512 432245cfc93d9c82e728d8ed62e288bd135b1da1c65b1fa0ab5b265b2dbd4b644c54cb2f63af53db983025da2838b4d40bb418e80d33eb524a7d6ccdaf48e217 WHIRLPOOL 2298179901069a219bad536827c9ef024741c38aa3a6cbc2172715807056757022a8cbe570712da269d370f544314c73cd42f35011e41b29e0eb5538b684b812

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild,v 1.11 2012/07/29 17:34:55 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild,v 1.12 2013/03/15 08:41:27 ulm Exp $
inherit eutils
@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
SRC_URI="mirror://gnu/emacs/${MY_P}.tar.gz
mirror://gentoo/${P}-patches.tar.gz"
LICENSE="FDL-1.1"
LICENSE="FDL-1.1+"
SLOT="21"
KEYWORDS="amd64 ppc x86"
IUSE=""

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild,v 1.7 2012/07/29 17:34:55 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild,v 1.8 2013/03/15 08:41:27 ulm Exp $
inherit eutils
@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
# Taken from lispref/ of emacs-22.3
SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
LICENSE="FDL-1.2"
LICENSE="FDL-1.2+"
SLOT="22"
KEYWORDS="amd64 ppc x86"
IUSE=""

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-23.4.ebuild,v 1.6 2012/07/29 17:34:55 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-23.4.ebuild,v 1.7 2013/03/15 08:41:27 ulm Exp $
EAPI=4
@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
# taken from doc/lispref/ of emacs-${PV}
SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="FDL-1.3"
LICENSE="FDL-1.3+"
SLOT="23"
KEYWORDS="amd64 ppc x86 ~x86-fbsd"
IUSE=""

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-24.2.ebuild,v 1.4 2013/01/13 11:35:47 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-24.2.ebuild,v 1.5 2013/03/15 08:41:27 ulm Exp $
EAPI=4
@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
# taken from doc/lispref/ of emacs-${PV}
SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="FDL-1.3"
LICENSE="FDL-1.3+"
SLOT="24"
KEYWORDS="amd64 ppc x86 ~x86-fbsd"

@ -0,0 +1,34 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-24.3.ebuild,v 1.1 2013/03/15 08:41:27 ulm Exp $
EAPI=5
inherit eutils
DESCRIPTION="The GNU Emacs Lisp Reference Manual"
HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
# taken from doc/lispref/ of emacs-${PV}
SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="FDL-1.3+"
SLOT="24"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
DEPEND="app-arch/xz-utils"
S="${WORKDIR}/lispref"
src_prepare() {
epatch "${FILESDIR}/${P}-direntry.patch"
echo "@set EMACSVER ${PV}" >emacsver.texi || die
}
src_compile() {
makeinfo elisp.texi || die "makeinfo failed"
}
src_install() {
doinfo elisp${SLOT}.info*
dodoc ChangeLog README
}

@ -0,0 +1,22 @@
--- lispref-orig/elisp.texi
+++ lispref/elisp.texi
@@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
-@setfilename elisp
+@setfilename elisp24.info
@ifset VOL1
@set volflag
@@ -117,9 +117,9 @@
@documentencoding ISO-8859-1
-@dircategory GNU Emacs Lisp
+@dircategory Emacs
@direntry
-* Elisp: (elisp). The Emacs Lisp Reference Manual.
+* Elisp 24: (elisp24). The Emacs Lisp Reference Manual for Emacs 24.
@end direntry
@titlepage

@ -1,2 +1 @@
DIST mp-5.2.1.tar.gz 566513 SHA256 e91ff7b94427a5c49815f091c67c20f47f63fd473318dbd9dce52a68a6a6f9d4 SHA512 9b7a6b87a7bb853bc91beae156280676046281c5d5582ede6cdcf902d289d1572cfcbf53067da3a55f013536891195f8e17bd97b8f83b08c7ad89479902c66e9 WHIRLPOOL 6cd9a8a3d6d150ecedd43b9825ea3d3574b7eda7af383502a03bcc7685faea28a011f931f1d636fed99d940d6a4fe6bb05a298796fd744b179b2cc39fdb54779
DIST mp-5.2.2.tar.gz 583918 SHA256 f4c04315e6a0a3b831f218f73904afd3c227aa18b67ab21b39dffbb54edfea1f SHA512 44c9b7ded38c294ffc90240ac73848a799294584f20bb981d95f8dde4f281ea9242b6ff8aefdb490e9e02effaab6cbc5bdf94ea489af838a89038113c43da131 WHIRLPOOL 0feba9d14b0f0a5addf153e0ce4d4186b90392c78d2154200cea665880861cef07fdcbfc7d841ef736a3852d8523290d2f5fdbad87f1ab20894e2a32e9df78d7

@ -1,69 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.1.ebuild,v 1.8 2012/07/20 08:24:58 jlec Exp $
EAPI=4
inherit eutils toolchain-funcs
DESCRIPTION="Minimum Profit: A text editor for programmers"
HOMEPAGE="http://www.triptico.com/software/mp.html"
SRC_URI="http://www.triptico.com/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-interix ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="gtk iconv kde ncurses nls pcre qt4"
RDEPEND="
ncurses? ( sys-libs/ncurses )
gtk? ( x11-libs/gtk+:2 >=x11-libs/pango-1.8.0 )
!gtk? ( sys-libs/ncurses )
nls? ( sys-devel/gettext )
pcre? ( dev-libs/libpcre )
iconv? ( virtual/libiconv )
app-text/grutatxt"
DEPEND="${RDEPEND}
app-text/grutatxt
virtual/pkgconfig
dev-lang/perl"
src_prepare() {
epatch "${FILESDIR}"/${PN}-5.2.1-prll.patch
}
src_configure() {
local myconf="--prefix=${EPREFIX}/usr --without-win32"
if use gtk; then
! use ncurses && myconf="${myconf} --without-curses"
else
myconf="${myconf} --without-gtk2"
fi
use iconv || myconf="${myconf} --without-iconv"
use kde || myconf="${myconf} --without-kde4"
use nls || myconfig="${myconf} --without-gettext"
myconf="${myconf} $(use_with pcre)"
use pcre || myconf="${myconf} --with-included-regex"
use qt4 || myconf="${myconf} --without-qt4"
tc-export CC
sh config.sh ${myconf} || die "Configure failed"
for i in "${S}" "${S}"/mpsl "${S}"/mpdm;do
echo ${CFLAGS} >> $i/config.cflags
echo ${CFLAGS} >> $i/config.ldflags
echo ${LDFLAGS} >> $i/config.ldflags
done
}
src_install() {
dodir /usr/bin
sh config.sh --prefix="${EPREFIX}/usr"
emake DESTDIR="${D}" install
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.2.ebuild,v 1.10 2013/02/15 23:01:58 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.2.ebuild,v 1.12 2013/03/15 12:46:35 pinkbyte Exp $
EAPI=4
@ -81,7 +81,7 @@ src_configure() {
use qt4 || myconf="${myconf} --without-qt4"
tc-export CC
tc-export AR CC
sh config.sh ${myconf} || die "Configure failed"
for i in "${S}" "${S}"/mpsl "${S}"/mpdm;do
@ -91,6 +91,10 @@ src_configure() {
done
}
src_compile() {
emake CPP="$(tc-getCXX)" CCLINK="$(tc-getCXX)"
}
src_install() {
dodir /usr/bin
sh config.sh --prefix="${EPREFIX}/usr"

@ -1,2 +1 @@
DIST ted-2.21.src.tar.gz 3956815 SHA256 6c4bdebb8980fac00cf71ebc6c5f9bddee8ae13ab2327125dda95aa6948b363a SHA512 f926d49c1c68ae54b7b4871cccc48e1ff1ad217baa915735be6f12944b710050fe358b1e85b75a3d8ffc236563dc81364be1f64079805993978dccfdb819f735 WHIRLPOOL a55f61613af80477b9399b43e0ada313e78be5f867acfafb6ee80a530f8939780b3eff63fd8a701e4e83613bc7a1b53bf699c70605ff22bc974cfd6a742bfa71
DIST ted-2.22.src.tar.gz 4267772 SHA256 93040d5ff259dbf7707a97f8c1ab4a7c1ec8adae63d35760e20dd6f60520fa4a SHA512 52099f1ddc93c1fda4849e62cd610d6b6701e152589124ba90bcd678c09ec7be82273f0f54d96fb8fa8718dab64f99e5576d0c467e035f8c0baffd91b84faa4f WHIRLPOOL fd584a285198731cbe7b53de0ddae465b0f7efe472984ad99835d19bccadb20ec076cf2fb4e22992ee4419093c1b7b0c8cea2fd7cbd07cc9f7f8fc745157d896

@ -1,423 +0,0 @@
This patch is from netbsd pkgsrc
ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/editors/ted/patches/
--- bitmap/bmpng.c
+++ bitmap/bmpng.c
@@ -20,23 +20,32 @@
/* */
/************************************************************************/
-static int bpPngiToBitmap( const png_info * pngi,
+static int bpPngiToBitmap( const png_structp pngp,
+ png_info * pngi,
BitmapDescription * bd )
{
unsigned int col;
+ png_uint_32 res_x, res_y;
+ int unit_type= 0;
- bd->bdPixelsWide= pngi->width;
- bd->bdPixelsHigh= pngi->height;
+ bd->bdPixelsWide= png_get_image_width( pngp, pngi );
+ bd->bdPixelsHigh= png_get_image_height( pngp, pngi );
bd->bdHasAlpha= 0;
- switch( pngi->color_type )
+ switch( png_get_color_type( pngp, pngi ) )
{
case PNG_COLOR_TYPE_PALETTE:
+ {
+ int num_palette;
+ png_colorp palette;
+
+ png_get_PLTE( pngp, pngi, &palette, &num_palette );
+
bd->bdColorEncoding= BMcoRGB8PALETTE;
- bd->bdColorCount= pngi->num_palette;
+ bd->bdColorCount= num_palette;
bd->bdBitsPerSample= 8;
bd->bdSamplesPerPixel= 3;
- bd->bdBitsPerPixel= pngi->bit_depth;
+ bd->bdBitsPerPixel= png_get_bit_depth( pngp, pngi );
bd->bdRGB8Palette= (RGB8Color *)
malloc( bd->bdColorCount* sizeof(RGB8Color) );
@@ -46,47 +55,51 @@ static int bpPngiToBitmap( const png_inf
for ( col= 0; col < bd->bdColorCount; col++ )
{
- bd->bdRGB8Palette[col].rgb8Red= pngi->palette[col].red;
- bd->bdRGB8Palette[col].rgb8Green= pngi->palette[col].green;
- bd->bdRGB8Palette[col].rgb8Blue= pngi->palette[col].blue;
+ bd->bdRGB8Palette[col].rgb8Red= palette[col].red;
+ bd->bdRGB8Palette[col].rgb8Green= palette[col].green;
+ bd->bdRGB8Palette[col].rgb8Blue= palette[col].blue;
bd->bdRGB8Palette[col].rgb8Alpha= 0;
}
+ }
break;
case PNG_COLOR_TYPE_RGB:
bd->bdColorEncoding= BMcoRGB;
- bd->bdBitsPerSample= pngi->bit_depth;
- bd->bdSamplesPerPixel= pngi->channels;
- bd->bdBitsPerPixel= pngi->pixel_depth;
+ bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
+ bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
+ bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
break;
case PNG_COLOR_TYPE_GRAY:
bd->bdColorEncoding= BMcoWHITEBLACK;
- bd->bdBitsPerSample= pngi->bit_depth;
- bd->bdSamplesPerPixel= pngi->channels;
- bd->bdBitsPerPixel= pngi->pixel_depth;
+ bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
+ bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
+ bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
break;
case PNG_COLOR_TYPE_RGB_ALPHA:
bd->bdHasAlpha= 1;
bd->bdColorEncoding= BMcoRGB;
- bd->bdBitsPerSample= pngi->bit_depth;
- bd->bdSamplesPerPixel= pngi->channels;
- bd->bdBitsPerPixel= pngi->pixel_depth;
+ bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
+ bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
+ bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
break;
case PNG_COLOR_TYPE_GRAY_ALPHA:
bd->bdHasAlpha= 1;
- LDEB(pngi->color_type); return -1;
+ LDEB(png_get_color_type( pngp, pngi )); return -1;
default:
- LDEB(pngi->color_type); return -1;
+ LDEB(png_get_color_type( pngp, pngi )); return -1;
}
- bd->bdBytesPerRow= pngi->rowbytes;
+ bd->bdBytesPerRow= png_get_rowbytes( pngp, pngi );
bd->bdBufferLength= bd->bdBytesPerRow* bd->bdPixelsHigh;
- switch( pngi->phys_unit_type )
+ if ( ! png_get_pHYs( pngp, pngi, &res_x, &res_y, &unit_type ) )
+ { unit_type= PNG_RESOLUTION_UNKNOWN; }
+
+ switch( unit_type )
{
case PNG_RESOLUTION_UNKNOWN:
bd->bdUnit= BMunPIXEL;
@@ -96,12 +109,12 @@ static int bpPngiToBitmap( const png_inf
case PNG_RESOLUTION_METER:
bd->bdUnit= BMunM;
- bd->bdXResolution= pngi->x_pixels_per_unit;
- bd->bdYResolution= pngi->y_pixels_per_unit;
+ bd->bdXResolution= res_x;
+ bd->bdYResolution= res_y;
break;
default:
- LDEB(pngi->phys_unit_type);
+ LDEB(unit_type);
return -1;
}
@@ -119,11 +132,11 @@ static int bmPngReadContents( png_info *
unsigned char * buffer;
numberOfPasses= 1;
- if ( pngi->interlace_type )
+ if ( png_get_interlace_type( png, pngi ) )
{ numberOfPasses= png_set_interlace_handling( png ); }
- if ( pngi->color_type == PNG_COLOR_TYPE_RGB &&
- pngi->bit_depth == 16 )
+ if ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB &&
+ png_get_bit_depth( png, pngi ) == 16 )
{
const unsigned short one= 1;
const unsigned char * testEndian= (const unsigned char *)&one;
@@ -133,9 +146,6 @@ static int bmPngReadContents( png_info *
}
png_start_read_image( png );
- /*
- png_read_update_info( png, pngi );
- */
buffer= (unsigned char *)malloc( bd->bdBufferLength );
if ( ! buffer )
@@ -236,9 +246,9 @@ int bmPngReadPng( BitmapDescription * bd
png_read_info( pngp, pngip );
- if ( bpPngiToBitmap( pngip, bd ) )
+ if ( bpPngiToBitmap( pngp, pngip, bd ) )
{
- LLLDEB(pngip->color_type,bd->bdColorCount,bd->bdRGB8Palette);
+ LLDEB(bd->bdColorCount,bd->bdRGB8Palette);
png_destroy_read_struct( &pngp, &pngip, (png_infop *)0 );
return -1;
}
@@ -282,44 +292,43 @@ int bmCanWritePngFile( const BitmapDescr
static int bpPngiFromBitmap( png_structp png,
png_info * pngi,
+ png_colorp * pPalette,
const BitmapDescription * bd )
{
- png_info_init( pngi );
- pngi->width= bd->bdPixelsWide;
- pngi->height= bd->bdPixelsHigh;
+ int bit_depth;
+ int color_type;
+ png_color_8 sig_bit;
switch( bd->bdUnit )
{
case BMunM:
- pngi->phys_unit_type= PNG_RESOLUTION_METER;
- pngi->x_pixels_per_unit= bd->bdXResolution;
- pngi->y_pixels_per_unit= bd->bdYResolution;
- pngi->valid |= PNG_INFO_pHYs;
+ png_set_pHYs( png, pngi,
+ bd->bdXResolution,
+ bd->bdYResolution,
+ PNG_RESOLUTION_METER);
break;
case BMunINCH:
- pngi->phys_unit_type= PNG_RESOLUTION_METER;
- pngi->x_pixels_per_unit= (int)( 39.37* bd->bdXResolution );
- pngi->y_pixels_per_unit= (int)( 39.37* bd->bdYResolution );
- pngi->valid |= PNG_INFO_pHYs;
+ png_set_pHYs( png, pngi,
+ (int)( 39.37* bd->bdXResolution ),
+ (int)( 39.37* bd->bdYResolution ),
+ PNG_RESOLUTION_METER);
break;
case BMunPOINT:
- pngi->phys_unit_type= PNG_RESOLUTION_METER;
- pngi->x_pixels_per_unit= POINTS_PER_M* bd->bdXResolution;
- pngi->y_pixels_per_unit= POINTS_PER_M* bd->bdYResolution;
- pngi->valid |= PNG_INFO_pHYs;
+ png_set_pHYs( png, pngi,
+ POINTS_PER_M* bd->bdXResolution,
+ POINTS_PER_M* bd->bdYResolution,
+ PNG_RESOLUTION_METER);
break;
case BMunPIXEL:
- pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN;
- pngi->x_pixels_per_unit= 1;
- pngi->y_pixels_per_unit= 1;
+ png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN);
break;
default:
LDEB(bd->bdUnit);
- pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN;
+ png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN);
break;
}
@@ -329,41 +338,48 @@ static int bpPngiFromBitmap( png_structp
case BMcoBLACKWHITE:
case BMcoWHITEBLACK:
- pngi->bit_depth= bd->bdBitsPerPixel;
+ bit_depth= bd->bdBitsPerPixel;
if ( bd->bdHasAlpha )
- { pngi->color_type= PNG_COLOR_TYPE_GRAY_ALPHA; }
- else{ pngi->color_type= PNG_COLOR_TYPE_GRAY; }
- pngi->sig_bit.gray= bd->bdBitsPerSample;
+ { color_type= PNG_COLOR_TYPE_GRAY_ALPHA; }
+ else{ color_type= PNG_COLOR_TYPE_GRAY; }
+ sig_bit.gray= bd->bdBitsPerSample;
break;
case BMcoRGB:
- pngi->bit_depth= bd->bdBitsPerSample;
+ bit_depth= bd->bdBitsPerSample;
if ( bd->bdHasAlpha )
- { pngi->color_type= PNG_COLOR_TYPE_RGB_ALPHA; }
- else{ pngi->color_type= PNG_COLOR_TYPE_RGB; }
- pngi->sig_bit.red= bd->bdBitsPerSample;
- pngi->sig_bit.green= bd->bdBitsPerSample;
- pngi->sig_bit.blue= bd->bdBitsPerSample;
+ { color_type= PNG_COLOR_TYPE_RGB_ALPHA; }
+ else{ color_type= PNG_COLOR_TYPE_RGB; }
+ sig_bit.red= bd->bdBitsPerSample;
+ sig_bit.green= bd->bdBitsPerSample;
+ sig_bit.blue= bd->bdBitsPerSample;
break;
case BMcoRGB8PALETTE:
- pngi->bit_depth= bd->bdBitsPerPixel;
- pngi->color_type= PNG_COLOR_TYPE_PALETTE;
+ bit_depth= bd->bdBitsPerPixel;
+ color_type= PNG_COLOR_TYPE_PALETTE;
- pngi->valid |= PNG_INFO_PLTE;
- pngi->palette= (png_color *)malloc( 256* sizeof( png_color ) );
- if ( ! pngi->palette )
- { XDEB(pngi->palette); return -1; }
- pngi->num_palette= bd->bdColorCount;
- pngi->sig_bit.red= bd->bdBitsPerSample;
- pngi->sig_bit.green= bd->bdBitsPerSample;
- pngi->sig_bit.blue= bd->bdBitsPerSample;
- for ( i= 0; i < pngi->num_palette; i++ )
+ if ( bd->bdColorCount > PNG_MAX_PALETTE_LENGTH )
{
- pngi->palette[i].red= bd->bdRGB8Palette[i].rgb8Red;
- pngi->palette[i].green= bd->bdRGB8Palette[i].rgb8Green;
- pngi->palette[i].blue= bd->bdRGB8Palette[i].rgb8Blue;
+ LLDEB(bd->bdColorCount,PNG_MAX_PALETTE_LENGTH);
+ return -1;
}
+
+ *pPalette= (png_color *)malloc( PNG_MAX_PALETTE_LENGTH*
+ sizeof( png_color ) );
+ if ( ! *pPalette )
+ { XDEB(*pPalette); return -1; }
+ sig_bit.red= bd->bdBitsPerSample;
+ sig_bit.green= bd->bdBitsPerSample;
+ sig_bit.blue= bd->bdBitsPerSample;
+ for ( i= 0; i < bd->bdColorCount; i++ )
+ {
+ (*pPalette)[i].red= bd->bdRGB8Palette[i].rgb8Red;
+ (*pPalette)[i].green= bd->bdRGB8Palette[i].rgb8Green;
+ (*pPalette)[i].blue= bd->bdRGB8Palette[i].rgb8Blue;
+ }
+
+ png_set_PLTE( png, pngi, (*pPalette), bd->bdColorCount );
break;
default:
@@ -371,7 +387,13 @@ static int bpPngiFromBitmap( png_structp
return -1;
}
- pngi->interlace_type= 0;
+ png_set_sBIT( png, pngi, &sig_bit );
+ png_set_IHDR( png, pngi,
+ bd->bdPixelsWide, bd->bdPixelsHigh,
+ bit_depth, color_type,
+ PNG_INTERLACE_NONE,
+ PNG_COMPRESSION_TYPE_BASE,
+ PNG_FILTER_TYPE_BASE );
return 0;
}
@@ -395,8 +417,8 @@ static void bmPngWriteContents( png_stru
}
}
- if ( pngi->color_type == PNG_COLOR_TYPE_RGB &&
- bd->bdBitsPerSample == 16 )
+ if ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB &&
+ bd->bdBitsPerSample == 16 )
{
const unsigned short one= 1;
const unsigned char * testEndian= (const unsigned char *)&one;
@@ -431,9 +453,9 @@ static void bmPngWriteContents( png_stru
from= scratch;
}
- if ( pngi->color_type == PNG_COLOR_TYPE_RGB &&
- bd->bdBitsPerSample == 16 &&
- scratch )
+ if ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB &&
+ bd->bdBitsPerSample == 16 &&
+ scratch )
{
int col;
const BmUint16 * fr= (const BmUint16 *)from;
@@ -453,10 +475,6 @@ static void bmPngWriteContents( png_stru
png_write_end( png, pngi );
- if ( bd->bdColorEncoding == BMcoRGB8PALETTE &&
- pngi->palette )
- { free( pngi->palette ); }
-
if ( scratch )
{ free( scratch ); }
@@ -510,50 +528,43 @@ int bmPngWritePng( const BitmapDescript
const unsigned char * buffer,
SimpleOutputStream * sos )
{
+ int rval= 0;
png_structp pngp= (png_structp)0;
png_infop pngip= (png_infop)0;
+ png_colorp palette= (png_colorp)0;
pngp = png_create_write_struct( PNG_LIBPNG_VER_STRING, (void *)0,
(png_error_ptr)0, (png_error_ptr)0 );
if ( ! pngp )
- { LDEB(1); return -1; }
+ { XDEB(pngp); rval= -1; goto ready; }
pngip = png_create_info_struct( pngp );
if ( ! pngip )
- {
- LDEB(1);
- png_destroy_write_struct( &pngp, (png_infop *)0 );
- return -1;
- }
+ { XDEB(pngip); rval= -1; goto ready; }
+
+ /*
+ As the info struct is built by libpng this is not needed:
+ (The call will disappear from libpng in version 1.4)
+ png_info_init( pngi );
+ */
if ( setjmp( png_jmpbuf( pngp ) ) )
- {
- LDEB(1);
- png_destroy_write_struct( &pngp, &pngip );
- /* Crashes:
- if ( bd->bdColorEncoding == BMcoRGB8PALETTE &&
- pngip->palette )
- { free( pngip->palette ); }
- */
- return -1;
- }
+ { LDEB(1); rval= -1; goto ready; }
png_init_io( pngp, (FILE *)0 );
png_set_write_fn( pngp, (void *)sos, bmPngWriteBytes, bmPngFlushBytes );
- if ( bpPngiFromBitmap( pngp, pngip, bd ) )
- {
- LDEB(bd->bdColorEncoding);
- png_destroy_write_struct( &pngp, &pngip );
- return -1;
- }
-
- /*
- png_write_info( pngp, pngip );
- */
+ if ( bpPngiFromBitmap( pngp, pngip, &palette, bd ) )
+ { LDEB(bd->bdColorEncoding); rval= -1; goto ready; }
bmPngWriteContents( pngp, pngip, buffer, bd );
+ ready:
+
+ if ( palette )
+ { free( palette ); }
+
png_destroy_write_struct( &pngp, &pngip );
- return 0;
+
+ return rval;
}

@ -1,59 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ted-2.21.ebuild,v 1.11 2012/05/03 18:33:03 jdhore Exp $
EAPI=4
inherit eutils toolchain-funcs
DESCRIPTION="X-based rich text editor"
HOMEPAGE="http://www.nllgg.nl/Ted"
SRC_URI="ftp://ftp.nluug.nl/pub/editors/ted/${P}.src.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc sparc x86"
IUSE=""
RDEPEND="x11-libs/gtk+:2
media-libs/tiff
virtual/jpeg
media-libs/libpng
x11-libs/libXpm"
DEPEND="${RDEPEND}
virtual/pkgconfig"
S=${WORKDIR}/Ted-${PV}
src_prepare() {
epatch "${FILESDIR}"/${P}-libpng15.patch
epatch "${FILESDIR}"/${P}-make.patch
sed -i -e 's|/Ted/|/share/Ted/|' \
"${S}"/appFrame/appFrameConfig.h.in \
"${S}"/Ted/tedConfig.h.in || die
mkdir lib || die
}
src_configure() {
tc-export CC
local dir
for dir in appFrame appUtil bitmap docBuf ind Ted tedPackage; do
cd "${S}"/${dir}
econf --cache-file=../config.cache || die "configure in ${dir} failed"
done
}
src_compile() {
emake package.shared
}
src_install() {
cd tedPackage
RPM_BUILD_ROOT=${D} ./installTed.sh COMMON || die
dodir /usr/share
mv "${ED}"usr/Ted "${ED}"usr/share/Ted
dosym /usr/share/Ted/rtf2pdf.sh /usr/bin/rtf2pdf.sh
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ted-2.22.ebuild,v 1.4 2013/03/12 18:23:29 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ted-2.22.ebuild,v 1.6 2013/03/15 10:38:47 pinkbyte Exp $
EAPI=4
inherit eutils toolchain-funcs
@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.nluug.nl/pub/editors/ted/${P}.src.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ~sparc x86"
KEYWORDS="amd64 ppc sparc x86"
IUSE=""
RDEPEND="x11-libs/gtk+:2
@ -31,11 +31,14 @@ src_prepare() {
"${S}"/appFrame/appFrameConfig.h.in \
"${S}"/Ted/tedConfig.h.in || die
# bug #461256
find . -name makefile.in -exec sed -i -e '/ar r/s/ar/$(AR)/' {} \; || die
mkdir lib || die
}
src_configure() {
tc-export CC
tc-export AR CC RANLIB
local dir
for dir in appFrame appUtil bitmap docBuf ind Ted tedPackage; do

@ -0,0 +1,49 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/actkbd/actkbd-0.2.8-r1.ebuild,v 1.1 2013/03/14 19:50:09 scarabeus Exp $
EAPI=5
inherit linux-info eutils toolchain-funcs
DESCRIPTION="A keyboard shortcut daemon"
HOMEPAGE="http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/"
SRC_URI="http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND=""
RDEPEND=""
CONFIG_CHECK="~INPUT_EVDEV"
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.2.7-amd64.patch
}
src_compile() {
emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
}
src_install() {
dobin actkbd
dodoc AUTHORS ChangeLog FAQ README TODO
docinto samples
dodoc samples/actkbd.conf
newconfd "${FILESDIR}/${PN}.confd" ${PN}
newinitd "${FILESDIR}/${PN}.initd" ${PN}
}
pkg_postinst() {
elog
elog "System-wide configuration file is /etc/actkbd.conf."
elog "Use actkbd.conf from usr/share/doc/${PF}/samples as a template."
elog "You need to create the config and set right input device from"
elog "/dev/input/event* in /etc/conf.d/actkbd"
elog
elog "To obtain keycodes for pressed combinations/keys just run:"
elog " # actkbd -s -d /dev/input/event<MYDEVICENUMBER>"
}

@ -0,0 +1,13 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/actkbd/files/actkbd.confd,v 1.1 2013/03/14 19:50:09 scarabeus Exp $
# Configuration file
CONFIG="/etc/actkbd.conf"
# Event provider providing the keypress events
EVENT_DEVICE="/dev/input/<DEVICE>"
# PID
PIDFILE="/var/run/actkbd.pid"

@ -0,0 +1,32 @@
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/actkbd/files/actkbd.initd,v 1.1 2013/03/14 19:50:09 scarabeus Exp $
checkconfig() {
if [ ! -f ${CONFIG} ] ; then
eerror "Config file \"${CONFIG}\" does not exist. Create it prior launching the daemon."
return 1
fi
if [ ! -c ${EVENT_DEVICE} ] ; then
eerror "Device \"${EVENT_DEVICE}\" is not valid pointer to input provider."
return 1
fi
}
depend() {
before acpid
}
start() {
checkconfig || return 1
ebegin "Starting actkbd"
start-stop-daemon --start --quiet --pidfile ${PIDFILE} --exec /usr/bin/actkbd -- -c "${CONFIG}" -D -q -x -l -p "${PIDFILE}" -d "${EVENT_DEVICE}"
eend $?
}
stop() {
ebegin "Stopping actkbd"
start-stop-daemon --stop --quiet --pidfile ${PIDFILE} --exec /usr/bin/actkbd
eend $?
}

@ -1,2 +1,3 @@
DIST byobu_5.29.orig.tar.gz 328310 SHA256 12e418f9dd979bb3be045170ee851ab780fd7f3bd15625c9deeb9e157f8322df SHA512 2b45fa5a8c680137b3aa210924bbc3c2b29b4c54003f154e3a72332146a69a41c21d5121843e090bfab0ebf73677e662fd678ee801ff3d89af447244f24477a1 WHIRLPOOL d23cb861c8fb26536c95bf24886689af91011f4baae88f510e248a00133d8f9fedaa37dc4995e1580b5e391337e6d646675fddc589d58153da0fb9d20e5dbffe
DIST byobu_5.33.orig.tar.gz 600437 SHA256 14beba36f99b96a804be2e2d8a065290266d943a0a075282ef88a1c36d64b9e5 SHA512 c508ed2edc3a8158fbd7989bade907f24a0a6e30efa92acd9d5789681bf090f4b975f9644a4cedaab6e2234847d1f94a237963cfb00ca571b1ee8d1726c55809 WHIRLPOOL c8068d893b7bc22247f30b31e7294c0264d03b2f65e41a3cff406040da4dc93159594a6838da98c498d40494f1f2123b231524df1f4e503c6ca258983027e558
DIST byobu_5.34.orig.tar.gz 600838 SHA256 016cee28814c7d15168db6196c2d04dfacad70c390403918fa1873b7787cede9 SHA512 2bf7a16f93e0987ef75b482ac3a816503bebfbc5d19e472b696873c6186daa3ba47b59b91cfca6de9b3924937ffd897dead51ee68ed9b4edc19e00b6b9c1cd1a WHIRLPOOL 12def39bdd9116e9b7e20efb98817f70f8d8a2af77d920e00c6b70e7da33e9fd004dcb1928859ad1a0c49a0fae3a87953173c89923fd1fbf4c0e8bec5a77cbed

@ -0,0 +1,39 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-5.34.ebuild,v 1.1 2013/03/15 08:12:58 radhermit Exp $
EAPI=5
PYTHON_COMPAT=( python{2_5,2_6,2_7} )
inherit python-single-r1
DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
HOMEPAGE="http://byobu.co"
SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="screen"
RDEPEND="
dev-libs/newt
screen? ( app-misc/screen )
!screen? ( app-misc/tmux )"
src_prepare() {
python_fix_shebang .
# Set default system backend to screen
if use screen ; then
sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
fi
}
src_install() {
default
# Create symlinks for backends
dosym ${PN} /usr/bin/${PN}-screen
dosym ${PN} /usr/bin/${PN}-tmux
}

@ -1,2 +1,3 @@
DIST entropy-136.tar.bz2 1612759 SHA256 4384b251f259c868f8ee3480701beecb466ca8c5727915e6b437291d03f4c63b SHA512 3b2725de557efa76ee65f368f486ab952f49a63474b5226e7b9ce137bee1c9c1ef73074c4d255e3d8695666556923d827c9cb1e232b307c4893d76e6cc6fb948 WHIRLPOOL 222d2c292c4a7c0d465be31898c4b2bf1469b7c769b4099106ded24334f4d16dde1f95ea532cbb2a167e2b7fcc30e6f59974839c3a8019c02c962fc634556e1b
DIST entropy-144.tar.bz2 1616075 SHA256 173825d13f4b5c5aecf4d82b4e593921baf2209496be56190babbb142ad9b75d SHA512 30ca32fdf0747530c656ec9c96aed5dad00e8fb4181bd4c2e4a4aed3c5b06427e5b07baa41db13ff03d6730f13607e86f557aad84cb6e85af5d9c49029a911c7 WHIRLPOOL a14b76a2c247e2d4db12e2c78735c64ca183a474758f8b8ab9748cd93378300cd737377888beb03cc64e0ddeff0cb201fd790489ddfee48b8cf82032429509ac
DIST entropy-183.tar.bz2 1685003 SHA256 5b2d99ef61a68497c228c392d607faa7fef9b5debe7628f381e4facbef290f38 SHA512 95b83797fc519c5cfd12a985ee3221ffe83fe19289681ca1b0f022a7b9491bdf9b74a06fe4f010536a22db78bac4f3325fc5eab0c11243240fdee5789690e2aa WHIRLPOOL bbd6c44e5bce24e602f89075e126b5e914900aad8bd3b1ff301c733d8838f4cd1aac279a707f81c0873c24259078e5fdc9dacbf1f30d0fd5eef3aa9f9376f7c5

@ -0,0 +1,29 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/magneto-loader/magneto-loader-183.ebuild,v 1.1 2013/03/14 18:26:18 lxnay Exp $
EAPI="2"
inherit eutils
DESCRIPTION="Official Sabayon Linux Entropy Notification Applet Loader"
HOMEPAGE="http://www.sabayon.org"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
S="${WORKDIR}/entropy-${PV}/magneto"
DEPEND="~sys-apps/magneto-core-${PV}
~app-admin/rigo-${PV}"
RDEPEND="${DEPEND}"
src_compile() {
einfo "nothing to compile"
}
src_install() {
emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-loader-install || die "make install failed"
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-5.0.2.ebuild,v 1.9 2013/03/14 07:51:09 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-5.0.2.ebuild,v 1.11 2013/03/14 16:22:00 ago Exp $
EAPI=5
@ -34,7 +34,7 @@ SRC_URI="${ZSH_URI}
LICENSE="ZSH gdbm? ( GPL-2 )"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps debug doc examples gdbm maildir pcre static unicode"
RDEPEND="

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0.ebuild,v 1.9 2013/03/14 07:50:17 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0.ebuild,v 1.11 2013/03/14 16:21:09 ago Exp $
EAPI=5
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ruby"
RDEPEND=">=app-text/build-docbook-catalog-1.1

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.3.ebuild,v 1.9 2013/03/14 07:50:42 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.3.ebuild,v 1.11 2013/03/14 16:21:33 ago Exp $
EAPI=4
@ -14,7 +14,7 @@ SRC_URI="
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug nls"
RDEPEND="

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/gigabase-3.83-r1.ebuild,v 1.3 2012/03/08 09:21:08 phajdan.jr Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/gigabase-3.83-r1.ebuild,v 1.5 2013/03/15 12:17:31 pinkbyte Exp $
EAPI="4"
inherit eutils multilib
@ -12,12 +12,12 @@ SRC_URI="mirror://sourceforge/gigabase/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="doc"
IUSE="doc static-libs"
DEPEND="doc? ( app-doc/doxygen )"
RDEPEND=""
S=${WORKDIR}/gigabase
S="${WORKDIR}/${PN}"
src_prepare() {
epatch "${FILESDIR}/${P}-fix-dereferencing.patch"
@ -26,7 +26,7 @@ src_prepare() {
src_configure() {
mf="${S}/Makefile"
econf
econf $(use_enable static-libs static)
sed -r -i -e 's/subsql([^\.]|$)/subsql-gdb\1/' ${mf} || die
}
@ -37,7 +37,7 @@ src_compile() {
src_test() {
pwd
cd ${S}
cd "${S}"
local TESTS
local -i failcnt=0
TESTS="testddl testidx testidx2 testiref testleak testperf testperf2 testspat testtl testsync testtimeseries"
@ -50,6 +50,7 @@ src_test() {
src_install() {
einstall
prune_libtool_files
dodoc CHANGES
use doc && dohtml GigaBASE.htm

@ -1,15 +1,14 @@
DIST 1fbe99283d97.tar.gz 3865243 SHA256 ed3a963c4309316fba654f0a60ba4bec21b2d170e64423eddfa2ba635ac76572 SHA512 bc54794d8d0424a1902d523b2e90914c06d0c83921b8a0c4eacba76eb8225a53b40a98682ac392f4c232d6e4256917b74ce7b5e5a2e7899561fa3d421b40bf79 WHIRLPOOL 032da1c1d2b6e69ba42f0572e629cb725bbcacbb44b1be01a5938c2a6a4e4aadbf2fefa619d9c1d4f8df997eba87434a61cc339f54f48becb81a55aeb3c7d3a1
DIST 3c7be82314bf.tar.gz 2755386 SHA256 4abe7366900327a0de21caee8a7b0ea5494821507a02bfb07cffc980cebe90ad SHA512 dfb93956d6525d8baf48e4494f086ba748ee3d90167d047cc739527f5d06a4cff98de0311017004028101b713c95a452a26527fdc63ff260dbbd6ed3527d4342 WHIRLPOOL 8746ff40e9aeae8497e30c5c795fb36e012550cc2b8ccbfc7580c9be8dc189750c69267fc0fdedd7c821ca98715d7d5803a6745295e03848b76d30c227e6e074
DIST 41426c72b802.tar.gz 2312391 SHA256 cbef395a2af27673a3611ed50d84a76ae9f9539a7c42ed8e06e171bfc1ac030c SHA512 99f5269712da36798390f7c74a3d6565872d45758edbc70821d876596a0536df76c17207518d21850c8fbf7a37801b945cc66ece2db26a27a1b5e7cfeb499226 WHIRLPOOL 29ba042bfb026914998f0044032749616b8d417f7e0ff6146b8debbc222dad684fa56dc783723cf314cc812f10e6cd821757bad2aff81f98eb397175332d1043
DIST 516aae5f27cf.tar.gz 1435560 SHA256 181ceb85a4dade1a8d8465e2d69255ee3612dbc5a50699a59a4f21e69be7a1c6 SHA512 db1fdb6bd0ff701aa5f747adca27d53876fea86533a01737f047b2ffe2aa42935b903157efca4c236dd91e47f13703c3aeb2d8aab781116016a3a723f170197d WHIRLPOOL 1f59a2c2dd6c04584d2ae9b0eb4151ca75471634e1b41701768bade830b1967d5791d46c23f4069f83ee9f4ad7af2f69ad20d7d3619bea9f76330f340ad24c54
DIST 68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
DIST 6bb01322bb5a.tar.gz 44982865 SHA256 a2d4557222eb72b9f1ecf6cfd19c73eb0a02e2f9755eacacabb4c43c682095e2 SHA512 2d52d37393921c297c8856b0b3e234f132f670e72da8d627cce19d87ddcec68f7bb402af3537f90e0ce044240948d4b9442ab7524c87f99652aeeaa5a757d43c WHIRLPOOL 8fbf8aca4b0612b691655ad63198f3d2af78fe19b9c3e5eaf2b61e472ac4d7d14add5643ffd710377d7a1c5c82aee9d1a6aa94a7fafc6381415d9ead79be5e7d
DIST 97a8b625f6e9.tar.gz 1435633 SHA256 511f9517374babed86f9d3d60d06f0fb7614cff14431a4eb678967b6f1358b1d SHA512 1bc57dcd36e9ebdff4be685936bb3c20d277358f112b7258ced6bcb57826b81df7bda5e7c6383831d26f496801daf6ef58bcb948e5debea76713ae1e43a599b3 WHIRLPOOL afd01b7cf293106dcead6768d1c67731927af2e37cf466925f0f7ac65ccded36b7c03c73949fd6ecdf10119f5052c1f3d34819ccd4570f2b80cc094d545d2e62
DIST a152dced63a1.tar.gz 9393091 SHA256 eac2313e3012653afa7549257765d56e4348c775363eee0733968d32a7c1eeae SHA512 22381dee16582c2d056418dfbe12a57ecc5ca37148a50f4c057a00ceec21a65d94987a75788a225d716f60fd90fdeed8de1dcce5bcd88ae315fd304446d7d6fc WHIRLPOOL 4c623c676220c6f7f0ac66678de63c10a81a44521d4d95c3ef129d8a5b3e807105408a0336f41456400555bc9eec20d96c6cb4fdc47705c4f035348dae10433c
DIST a567bcb7f589.tar.gz 4263355 SHA256 d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 SHA512 2abbd6ad72a5811963610b81ad3f59882fa0109bbffb69316f7bcadd218982abbb7b94ea41ddd379a0dad8586301e1d317226153d2f592876c56e7d338afadf5 WHIRLPOOL e712ee17b9e4e23a1fe54823218a79a45ab1ca11e23de2896b576a2034650bf8b151f01022e0d3f12421008fc1e8d8f9aa0bfc4cc6bce812dcfbbbab1c66af7c
DIST b900024eb4ba.tar.gz 2755366 SHA256 276fcc2f7609dd5a9346f9faa317331e722c9c015fa19c61a1228d86cf231bc2 SHA512 b13b14420780e475f483ef0811b7903d73b8667c3d7ca881e89a386d485094172d269ce755df47caccf2527cc2928695b69884c674d1a9460070703d917b05fe WHIRLPOOL 6a17403196720a402eab9cd18aca5f5714710095a107e1617961efffecbb2b5345c104fa0fd3306cf702266e4eca4555c0a8773b725559c92c645e92ad7fb20a
DIST bc0de5a0ece2.tar.gz 9393915 SHA256 4b571c99b9dfdca6e8456a7d0d47eedb1a8e3c4863322cc853f959b1cb4bc068 SHA512 52a105b11916150f4c38158e53e5649a0185fa0e63ce055f1dc1dc961fec2921460216085971eefadc2a5f3aa468e78be7590a59f3c3ccdd9c91d23803f1d0ca WHIRLPOOL 8cc98d7b5ae839e75eb9ce0c88c99a71f867c1786a6d8698d4d14a5a0230b16cb26d17898e75355c91d240749c062223b3277a43f7ad2563da5c4faf4a79f9fe
DIST d7feafb8427b.tar.gz 3864991 SHA256 81f30228dfab5669b114841a0b797c6529a5e37ca52eb97c7f9bbfd29aae9941 SHA512 69a29126487707c9a84ffc8989915fc9d620d265683e264a490d89ebac5d27c2c2c3d044b821a476b8f76f2035fb41855022435cc90b66286451c65ad696bc03 WHIRLPOOL e8895f91e0845bdbb256c99f82eff8f830bb3774cecd8ad7540695740964e3ae32b6286891b2986a982c87fcc7d686cff5482734541020c866bfc8e73a8382be
DIST dd8d1a8f222f.tar.gz 131459 SHA256 a360299dd869d612b77a016967678716cb03dfddd0f484944a1619fda5fb6092 SHA512 ab827f6afc708b8a51ed523b2ea9ab42d57c926c9ffdfd22d4011c8209a89234855f861c72db04fdf3cbce71a6c175441fbba46e533e956bbc2e26521983d81d WHIRLPOOL 701ad8b553961f77ae4ed1725958572a0f8a2a94b92eade18dfad58848535a0f89ef2d0cf5b8b4bcc2f259fab02905750fc6789f1ef61d8c6a17a5c5ee9e6658
DIST e0739a8783d1.tar.gz 2312385 SHA256 85170ef7a68ef8e2895edffd9a4209f78b43887e8c782bebfe14997d06619bdb SHA512 4d177b493b87cc5b2c92c85a4f035d7227743af2249c549f2dee2137b93a2f599d62e616e3a0a4f24f84abf26895e33fdbf6d3994118194f4a5f3cb1a002e157 WHIRLPOOL 72c61404b7d85142078020b42d20d4c5b0e0a77eb2fd8dcb49056f002706aba78e0da698db500eb88fa7a5ad5c57a223b2ea8422f5a04bd289e1a250503d2354
DIST icedtea-2.3.6.tar.gz 5048411 SHA256 f55f2f2e5cdfa8b0429eaa56b4ecba7d63c701e867dbb636883c03cd8e64f4f9 SHA512 5484a79c80c3901f783a3a129e7a098d21ffed5a73bf8d3e300a7002d6a5c67e1d1b9ae1adc52de052dbde0757d7edbf9ebf101ac6f9dfcdb37378ceb5b23522 WHIRLPOOL 9c18db778810960fc5ed107e42f7d1236391e518a2ecfc6390693220c54950a04cf64f3faa41dfc28ab708cb87921cee7e873c71ffa2835b6c1476b34c2efd4a
DIST icedtea6-1.12.2.tar.gz 6632211 SHA256 897a8834b8ddd6891f0eef46c0f799d11cbecf168c4383cfb26d0dad80328794 SHA512 9e219e3b9a87c9073a4759edcd1f416246085f755c7c9a3faf17cfcfed8a55b39e25511a2cd7d4526791bdd4d88063343b15391a6ee85a2b715c0cf0415e6ef8 WHIRLPOOL b97ee2c5a1168cc76299be468a3d11bba0ae31f69e0ea55745e60c0abcd195893e99ffa3408ea89385959d5d4f939a1fa77b1b73e8a1046effa607d512460c0f
DIST icedtea6-1.12.3.tar.gz 6652921 SHA256 db9dc14fa537fb22616fcd9e5b80758aa7baa66e0b6f8adfe3d5e80414574b4c SHA512 ff6079e7ba925e93a1ba53e8474bd0a7f07f9aee1a1ff87dfcce5493a66c40afe6bf0d5c91bf7cba5a6c606496acdc2cc958d3b86929640b61da5d04ae33c92b WHIRLPOOL 853c18465b527da53abbdb6a1d38e767efa16fef5b19ba4573d2f5584a3dca050f01406dd94222423201af21cc9062d6c80831f96934bfe91d0872991de701c5
DIST deac45dc94f0.tar.gz 44996399 SHA256 00e3e4cb436f4153434faa2d1063114a9028e9c8a7eacf558873053c47365215 SHA512 f9a4a0d910285667e84f48562f44f9c27c006d41c0e97d376b1d39258cedf38108eba07c99260f18be7ec6f07cfc8f40ada4b9f8f1452ccd92b67e49f06c2e3d WHIRLPOOL 63a9548e3eba0b1733f6b5cb6a91d9b259d94034ffc1a4700035d976e601bb43640056980fecb01cf5e138b736ec8507281747b8c5cd68c82f5b4e3a1079c58d
DIST ed02a059ea15.tar.gz 131499 SHA256 865030303330856c988e353bf1bc86fc95669179b0958a4072538fc59d9a073b SHA512 4a9fa5c9318a67255ad39377fb3ce861b6f6eaa6427edf06c7a4f19d11e46dc30b2f1e847d3ea1def41304c59dddd2eeaf97d33659d276d7c33b5b9ac390e6d3 WHIRLPOOL 35b55ed80c567d5d347417564a7d340ee62711f411146644da979f69ce7ace1b8b7a68950d932e8f59856d7816fcba8b38d5e893c4cd1915099bdf50f4116e3e
DIST icedtea-2.3.8.tar.gz 5053426 SHA256 750a4c6e3e22369aa7dcfb0751fe85d5ea7a36b32871861c5063dbcadddc7153 SHA512 2ecc4b71b167a71789dfc099225df848c6a8763ae15d1b9396ce4c6068b7d7d6e9a428b09d1e2c99e013650a7136a9d1457979b8d1a38d74ca22817e31716b7e WHIRLPOOL d79e964e83537ddcaa2161614f6b78564f36fc28db751dc599b031ef35d85b9f4a3b801c8e288248a8759645745f3a408652abcf19668a33f9a4a92ac9058b59
DIST icedtea6-1.12.4.tar.gz 6689142 SHA256 eb326c6ae0147ca4abe4bd79e52c1edc2ef08e5e008230e24bee3abb39e14dda SHA512 f7d2834edd051b2080acd596d230f16604eb616eb1a6a0813dd274a92c7ad9711a25b65dacea06a12591c6121beedac44f9bdeb2e6cb60fb612bdeea63957a55 WHIRLPOOL 6109ed8cc94ee4e14882f0b787ac1a8a4859c542b7f92b896e46a33bbef5ef1cac532bb54616dcee66deff4d6fc50296f533f0979d7efe31f98ddd42a3d8c60c
DIST jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz 298435 SHA256 bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03 SHA512 fa3428d8997f9696cce4fa32c9de677ef193bc12236ef8b431af647b57d26725f4a3019abc87ade0cf10c7d6a745c18eb78e8e126d6842e788c8cefcbd2b006d WHIRLPOOL d1ca7dc677b7abbd600262f30c2c3774f502ef661f3dca60d4664c87b50b9a90c808e106f607a1dde7b3f4cf44a7a4a9e647877a2cc3332866b6b2bd34eb2a2a
DIST jaxp144_04.zip 5976385 SHA256 490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c SHA512 9090d37f62f57d3dd8fb5981e3ce4a1ae87f1ef19abdb9df4775df1a48419cd16016c025a65516cfe3329885ac164cc45e4204dbc8d03239d368ebc962c824a4 WHIRLPOOL 6646fc6cfc83fbc26aef79cc219e008ee28fe4cf649ec4fc0e5bff045dd76b737c1036631acc9439137a50c2ee33dc7534b2de914877d1b695a3741ca3e6b1c8
DIST jdk6-jaf-b20.zip 71243 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 SHA512 22fef9e0fdde82f141151d426d26316d7c23fd4cc2132ef191f38ea9420ebb3126670b0456ab4de83896307eab48bab0c46aaf0485f39e89cb57dac3215d499a WHIRLPOOL 2b02e883c7a2341ce927f402a9abc5a632a6718f713fbaa5c65133a0ac81a1a58a317b7e2028c309196805dc43146c591852c05144c64f2428938cb3ec4972d2

@ -1,317 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.3.ebuild,v 1.1 2013/02/20 09:07:52 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
# *********************************************************
EAPI="4"
inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
OPENJDK_BUILD="27"
OPENJDK_DATE="26_oct_2012"
OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
JAXP_TARBALL="jaxp144_04.zip"
JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip"
JAF_TARBALL="jdk6-jaf-b20.zip"
# Download cacao and jamvm regardless for use with EXTRA_ECONF
CACAO_TARBALL="68fe50ac34ec.tar.gz"
JAMVM_TARBALL="jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz"
DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
HOMEPAGE="http://icedtea.classpath.org"
SRC_URI="
http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}"
LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
SLOT="6"
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap +nsplugin
+nss pax_kernel pulseaudio +source systemtap test +webstart"
# Ideally the following were optional at build time.
ALSA_COMMON_DEP="
>=media-libs/alsa-lib-1.0"
CUPS_COMMON_DEP="
>=net-print/cups-1.2.12"
X_COMMON_DEP="
dev-libs/glib
>=media-libs/freetype-2.3.5
>=x11-libs/gtk+-2.8:2
>=x11-libs/libX11-1.1.3
>=x11-libs/libXext-1.1.1
>=x11-libs/libXi-1.1.3
>=x11-libs/libXrender-0.9.4
>=x11-libs/libXtst-1.0.3"
X_DEPEND="
>=x11-libs/libXau-1.0.3
>=x11-libs/libXdmcp-1.0.2
>=x11-libs/libXinerama-1.0.2
>=x11-libs/libXp-1.0.0
x11-proto/inputproto
>=x11-proto/xextproto-7.1.1
x11-proto/xineramaproto
x11-proto/xproto"
COMMON_DEP="
>=media-libs/giflib-4.1.6
>=media-libs/libpng-1.2
>=sys-libs/zlib-1.2.3
virtual/jpeg
javascript? ( dev-java/rhino:1.6 )
nss? ( >=dev-libs/nss-3.12.5-r1 )
pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
systemtap? ( >=dev-util/systemtap-1 )"
# media-fonts/lklug needs ppc ppc64 keywords
RDEPEND="${COMMON_DEP}
!dev-java/icedtea6
X? (
${X_COMMON_DEP}
media-fonts/dejavu
cjk? (
media-fonts/arphicfonts
media-fonts/baekmuk-fonts
!ppc? ( !ppc64? ( media-fonts/lklug ) )
media-fonts/lohit-fonts
media-fonts/sazanami
)
)
alsa? ( ${ALSA_COMMON_DEP} )
cups? ( ${CUPS_COMMON_DEP} )"
# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
# ca-certificates, perl and openssl are used for the cacerts keystore generation
# xext headers have two variants depending on version - bug #288855
# !eclipse-ecj-3.7 - bug #392587
# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
|| (
>=dev-java/gcj-jdk-4.3
dev-java/icedtea-bin:6
dev-java/icedtea:6
)
app-arch/cpio
app-arch/unzip
app-arch/zip
app-misc/ca-certificates
>=dev-java/ant-core-1.8.1
dev-java/ant-nodeps
dev-lang/perl
>=dev-libs/libxslt-1.1.26
dev-libs/openssl
virtual/pkgconfig
sys-apps/lsb-release
${X_DEPEND}
pax_kernel? ( sys-apps/paxctl )"
PDEPEND="webstart? ( dev-java/icedtea-web:6 )
nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
S="${WORKDIR}"/${ICEDTEA_PKG}
pkg_setup() {
JAVA_PKG_WANT_BUILD_VM="
icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
java-vm-2_pkg_setup
java-pkg-2_pkg_setup
}
src_unpack() {
unpack ${ICEDTEA_PKG}.tar.gz
}
java_prepare() {
# icedtea doesn't like some locales. #330433 #389717
export LANG="C" LC_ALL="C"
}
bootstrap_impossible() {
# Fill this according to testing what works and what not
has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
}
src_configure() {
local config bootstrap enable_cacao
local vm=$(java-pkg_get-current-vm)
# IcedTea6 can't be built using IcedTea7; its class files are too new
# Whether to bootstrap
bootstrap="disable"
if use jbootstrap; then
if bootstrap_impossible "${vm}"; then
einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
else
bootstrap="enable"
fi
fi
if has "${vm}" gcj-jdk; then
# gcj-jdk ensures ecj is present.
use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
bootstrap="enable"
fi
config="${config} --${bootstrap}-bootstrap"
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
# Otherwise use CACAO
if ! has "${ARCH}" amd64 sparc x86; then
enable_cacao=yes
elif use cacao; then
ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
ewarn 'If so, please rebuild with USE="-cacao"'
enable_cacao=yes
fi
if [[ ${enable_cacao} ]]; then
config="${config} --enable-cacao"
fi
# OpenJDK-specific parallelism support. Bug #389791, #337827
# Implementation modified from waf-utils.eclass
# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
config="${config} --with-parallel-jobs=${procs}";
einfo "Configuring using --with-parallel-jobs=${procs}"
if use javascript ; then
config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
else
config="${config} --without-rhino"
fi
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
econf ${config} \
--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
--with-jdk-home="$(java-config -O)" \
--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
--disable-downloading \
$(use_enable !debug optimizations) \
$(use_enable doc docs) \
$(use_enable nss) \
$(use_enable pulseaudio pulse-java) \
$(use_enable systemtap) \
$(use_with pax_kernel pax paxctl)
}
src_compile() {
# Would use GENTOO_VM otherwise.
export ANT_RESPECT_JAVA_HOME=TRUE
# Load the least that's needed to avoid possible classpath collisions.
export ANT_TASKS="ant-nodeps"
emake
}
src_test() {
# Use Xvfb for tests
unset DISPLAY
Xemake check
}
src_install() {
local dest="/usr/$(get_libdir)/icedtea${SLOT}"
local ddest="${ED}/${dest}"
dodir "${dest}"
dodoc README NEWS AUTHORS THANKYOU
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
cd openjdk.build/j2sdk-image || die
# Ensures HeadlessGraphicsEnvironment is used.
if ! use X; then
rm -r jre/lib/$(get_system_arch)/xawt || die
fi
# Don't hide classes
rm lib/ct.sym || die
#402507
mkdir jre/.systemPrefs || die
touch jre/.systemPrefs/.system.lock || die
touch jre/.systemPrefs/.systemRootModFile || die
# doins can't handle symlinks.
cp -vRP bin include jre lib man "${ddest}" || die
dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
if use doc; then
# java-pkg_dohtml needed for package-list #302654
java-pkg_dohtml -r ../docs/* || die
fi
if use examples; then
dodir "${dest}/share";
cp -vRP demo sample "${ddest}/share/" || die
fi
if use source; then
cp src.zip "${ddest}" || die
fi
# Fix the permissions.
find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
# Needs to be done before generating cacerts
java-vm_set-pax-markings "${ddest}"
# We need to generate keystore - bug #273306
einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
mkdir "${T}/certgen" && cd "${T}/certgen" || die
cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
openssl x509 -text -in "${c}" >> all.crt || die
done
./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
# Bug 390663
cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
eprefixify "${T}"/fontconfig.Gentoo.properties
insinto "${dest}"/jre/lib
doins "${T}"/fontconfig.Gentoo.properties
set_java_env "${FILESDIR}/icedtea.env"
if ! use X || ! use alsa || ! use cups; then
java-vm_revdep-mask "${dest}"
fi
}
pkg_preinst() {
if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
# portage would preserve the symlink otherwise, related to bug #384397
rm -f "${EROOT}/usr/lib/jvm/icedtea6"
elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
elog "If you had icedtea6 as system VM, the change should be automatic, however"
elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
elog "and the same holds for any user VM settings. Sorry for the inconvenience."
fi
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.2.ebuild,v 1.1 2013/02/13 18:56:54 sera Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.4.ebuild,v 1.1 2013/03/14 11:05:20 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.6.ebuild,v 1.1 2013/02/13 18:56:54 sera Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.8.ebuild,v 1.1 2013/03/14 11:05:20 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@ -14,13 +14,13 @@ inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx flag-o-matic
ICEDTEA_VER=$(get_version_component_range 2-)
ICEDTEA_BRANCH=$(get_version_component_range 2-3)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
CORBA_TARBALL="97a8b625f6e9.tar.gz"
JAXP_TARBALL="d7feafb8427b.tar.gz"
JAXWS_TARBALL="b900024eb4ba.tar.gz"
JDK_TARBALL="6bb01322bb5a.tar.gz"
LANGTOOLS_TARBALL="e0739a8783d1.tar.gz"
OPENJDK_TARBALL="dd8d1a8f222f.tar.gz"
HOTSPOT_TARBALL="bc0de5a0ece2.tar.gz"
CORBA_TARBALL="516aae5f27cf.tar.gz"
JAXP_TARBALL="1fbe99283d97.tar.gz"
JAXWS_TARBALL="3c7be82314bf.tar.gz"
JDK_TARBALL="deac45dc94f0.tar.gz"
LANGTOOLS_TARBALL="41426c72b802.tar.gz"
OPENJDK_TARBALL="ed02a059ea15.tar.gz"
HOTSPOT_TARBALL="a152dced63a1.tar.gz"
CACAO_TARBALL="a567bcb7f589.tar.gz"
JAMVM_TARBALL="jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz"

@ -1,3 +1,4 @@
DIST clojure-1.2.0.zip 3586231 SHA256 1334773cb13793bdc0588de0fe5b5aec602bb98ca84858d7374b4e063864d207 SHA512 8c10533eef046d3dba1eb335d0febcdd22664cd428b24c35f860784efd7a699eba1b37808b99c0b8a584266e6c282f7c490cd49bcb7d7363c958f2499cfc41e2 WHIRLPOOL 6a325eceadd752d42b37a6e6adca7cceb4c49058c3af1e9a78e609b111e8e1cc34b53c356f04bf506b388415108209ec78934057b1de98c1d156a41f2021c09f
DIST clojure-1.3.0.tar.gz 489200 SHA256 da719ca8600f75001362fefa6427ef14d0a64c3ddc220c79695c44abecdc4a18 SHA512 1078a94afe096bf5862ddda6bd1fccb14d2383151f575b32829e60f2252d94dda972f9e9ca76bf91bc215f51e6529bd895c3653df5d9fa65dbe69e4be519ecdd WHIRLPOOL f3182a533c8081acbafceb5cd41c8f55c053dae673cab8f52274ab357fdf2b8059a512205501f7221d540d60913e115193eeb4c5dd1b46e05ceb56223b465770
DIST clojure-1.4.0.tar.gz 501302 SHA256 72e9b69367e5f825fe501629a7bf25d70632a6007751d2a9520be133879f42cd SHA512 618c0de641f2e718e8a0b1ce62a695e61d60a2fc52804018b4fc20caf6e7a99d88ed5af43f2e1f735fc8c19629382f0e53d010b1fca41ca1d4856cd59fadf329 WHIRLPOOL f77b0365e2f1180e0c43412dd0684e33699d7ec517b18af4694e3778cac74593a18de3843f214db5656d39c947a24839942472b5439b90c0c4391c275dd8e927
DIST clojure-1.5.1.tar.gz 540021 SHA256 ee6cc9360e3545a35cdd6a9ae48b5f4034ef2eb2aaa19721df976078952a805b SHA512 8bc4b7098ec11a3cd4d077f32607c5d23118d5f84b88af69b2051c4dd5b17f28f092b77206fba87e23f1163d2d0f7a2c37b1b1ffa1bcfef3ad4c8f74695d71cd WHIRLPOOL e77d13a771903100a3fe6b0ade84375217c5b150498e727a7cef2d856a4004e640e0c95717fb67be6cae1fbab7611189a1f3999726f7bbec43968eef646dcb32

@ -0,0 +1,33 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/clojure/clojure-1.5.1.ebuild,v 1.1 2013/03/14 16:42:57 mr_bones_ Exp $
EAPI=2
JAVA_PKG_IUSE="source test"
inherit java-pkg-2 java-ant-2
DESCRIPTION="Clojure is a dynamic programming language that targets the Java Virtual Machine"
HOMEPAGE="http://clojure.org/"
SRC_URI="https://github.com/clojure/clojure/tarball/${P} -> ${P}.tar.gz"
LICENSE="EPL-1.0"
SLOT="1.5"
KEYWORDS="~amd64 ~x86 ~x86-linux"
IUSE=""
RESTRICT="test" # patches welcome to fix the test
RDEPEND=">=virtual/jre-1.5"
DEPEND=">=virtual/jdk-1.5"
S=${WORKDIR}/clojure-clojure-22c7e75
src_test() {
java-pkg-2_src_test
}
src_install() {
java-pkg_newjar ${P/_/-}.jar
java-pkg_dolauncher ${PN}-${SLOT} --main clojure.main
dodoc changes.md readme.txt || die
}

@ -1,2 +1 @@
DIST ferite-1.0.2.tar.gz 2039452 SHA256 c67fc25451070214334ba2b1ca3a9ea78f5ed79f322e62ebf8fc9462bfe0fb8e SHA512 34654ad9e54929e74167c87a79351ce7fee00d7d9f4f6084730c121570f5508b0bd0c1a0e7d5d8c58d558ad9ce8680ea6c1e90c676202eeb3e44d7cdb9fc6da3 WHIRLPOOL c45e8e68824024a38504bdd1b84fba0c5e3c922481be7090020c608bd9d736a1a34667a4de030816fcedf75c24599cff4edd3baae810c236b19d049596856c56
DIST ferite-1.1.17.tar.gz 2174774 SHA256 d407f3db45482e17f41820fb029cf8b06e6104699b8d7340f3946f57d3f4e690 SHA512 475983b865fba492661e59b7470b7e46889f29ed8ba829b112354963fafcbed6ab4d4677579337c1c4ed730c6fe02897743f56edae335ceda6277da975d1098f WHIRLPOOL d563849e7b1ebe19657f319ecf970ad4987d10c28c29729da2868b10b7466159f5210e8bb7c065b8fccb7314ebc764dc8dbe97484c138c70ec066ecd12ebb005

@ -1,77 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ferite-1.0.2.ebuild,v 1.15 2012/11/26 22:11:54 ulm Exp $
EAPI=4
inherit autotools eutils multilib
DESCRIPTION="A clean, lightweight, object oriented scripting language"
HOMEPAGE="http://www.ferite.org/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="1"
KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
DEPEND="
>=dev-libs/libpcre-5
dev-libs/libxml2"
RDEPEND="${DEPEND}"
src_prepare() {
# use docsdir variable, install to DESTDIR
sed \
-e '/docsdir =/!s:$(prefix)/share/doc/ferite:$(DESTDIR)$(docsdir):' \
-i docs/Makefile.am || die
# Install docs to /usr/share/doc/${PF}, not .../${PN}
sed \
-e "s:doc/ferite:doc/${PF}:" \
-i Makefile.am \
docs/Makefile.am \
scripts/test/Makefile.am \
scripts/test/rmi/Makefile.am || die
# Don't override the user's LDFLAGS
sed \
-e 's:_LDFLAGS = :&$(AM_LDFLAGS) :' \
-e '/^LDFLAGS/s:^:AM_:' \
-i modules/*/Makefile.am \
libs/{aphex,triton}/src/Makefile.am \
src/Makefile.am || die
# Only build/install shared libs for modules (can't use static anyway)
sed -i -e '/_LDFLAGS/s:-module:& -shared:' modules/*/Makefile.am || die
# use LIBADD to ensure proper deps (fix parallel build)
sed \
-e '/^stream_la_LDFLAGS/s:-L\. -lferitestream::' \
-e '/^stream_la_LIBADD/s:$:libferitestream.la:' \
-i modules/stream/Makefile.am || die
# Make sure we install in $(get_libdir), not lib
sed -i -e "s|\$prefix/lib|\$prefix/$(get_libdir)|g" configure.ac || die
# We copy feritedoc to ${T} in src_install, then patch it in-situ
# note that this doesn't actually work right, currently - it still tries
# to pull from / instead of ${D}, and I can't figure out how to fix that
sed -i -e 's:$(prefix)/bin/:${T}/:' docs/Makefile.am || die
eautoreconf
}
src_configure() {
econf --libdir="${EPREFIX}/usr/$(get_libdir)"
}
src_install() {
cp tools/doc/feritedoc "${T}" || die
sed -i -e '/^prefix/s:prefix:${T}:g' "${T}"/feritedoc || die
sed -i -e '/^$prefix/s:$prefix/bin/ferite:'"${ED}"'usr/bin/ferite:' "${T}"/feritedoc || die
sed -i -e 's:$library_path $library_path:${S}/tools/doc ${S}/tools/doc:' "${T}"/feritedoc || die
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${ED}usr/lib"
emake DESTDIR="${D}" LIBDIR="${EPREFIX}"/usr/$(get_libdir) install
prune_libtool_files
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ferite-1.1.17-r1.ebuild,v 1.4 2013/03/12 18:25:17 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ferite-1.1.17-r1.ebuild,v 1.5 2013/03/14 13:37:26 ago Exp $
EAPI=4
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="1"
KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
KEYWORDS="~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
DEPEND="

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_install-v50160001.eblit,v 1.2 2013/01/20 20:22:11 tove Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_install-v50160001.eblit,v 1.3 2013/03/14 12:46:31 tove Exp $
eblit-perl-src_install() {
local i
@ -55,7 +55,7 @@ eblit-perl-src_install() {
--htmldir="${ED}/usr/share/doc/${PF}/html"
fi
[[ -d ${D}/usr/local ]] && rm -r "${D}"/usr/local
[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
dual_scripts
}

@ -2,12 +2,15 @@ DIST php-5.3.18.tar.bz2 11335289 SHA256 f065deecb78abb8ef101e1098866024af4ca10cb
DIST php-5.3.20.tar.bz2 11358034 SHA256 578c26e6932dd7a37ff14e4e2237bc3235386fe897ba2e456e937e647727cd07 SHA512 1f3282cef5d553f28324b8f011acef59319441a8a258355b908fb6f69eaad8f1d736dc03259ddc168c20332510b7c73b5afb21934d3d14cb4f893f5cee59bd9b WHIRLPOOL 7e41bea91aec20a371b1e5a0de7e76f3e34d2b51c0378e76155c101297ac3811c9f0ced43abe911e64f812ca8130dd9cfc27090f29beb5cfaec1957de0f3d38e
DIST php-5.3.21.tar.bz2 11362683 SHA256 9bd914cb01fc78c06ec5fe7e31100f000cc03325e042fd5a829d8ce80e4478c3 SHA512 e6896a1646d9c6cd40446ec4c374c948120ed38e9bfc067354f342888b29cfe794e689ef56aaa714ea469061915bf78507c3adb6d69057132b9baaf44443a09f WHIRLPOOL c9e7bdf3744d22498e8deb014bd51ea76c897d7acf3735fc8fc7f8c0ef64994f66459461650562b2b15c7fc8534f70c6805b5e5226a9c3da359b0b7418623350
DIST php-5.3.22.tar.bz2 11366482 SHA256 2da5fefdd24dafd8a94b6e41ba2c308ee216f97b3d605abde513d0cdc680d588 SHA512 ab6fbb7cd2c9c0bff2dcc4198622f63c88c5047f7931b367ceb99e030204128fb2f7b3d2eb3578d2f4b6d5b11167976a66fc4d73db442e0e64a2a6376586f9d7 WHIRLPOOL 2d0300c47e920db5227f225ffd266fbf4ca8303feb60b397ab95e0c8ed5e70c2c7d5868cf3fb9cbb201e894552b868a6d82147d0f11817403329d64f0d1c757a
DIST php-5.3.23.tar.bz2 11410987 SHA256 69473eae7c752987a8fc7619bae9f7121cfe7c6603a2ebf13c8e036dff6a4944 SHA512 6d6579c0c67d75cd3cbc182609fb231cbda486722f47e01b78d50d93072720f37ee74eba8d8cc42308c297009fb3af31f9d2092869a4e78bbd957504cbb4858b WHIRLPOOL f3de62fb73af532811fbe2491442182297d8213ca621a9c0e3e6fdb3d8878982e81d18554457d5fb1726fe477c16077d1d4fb720a8195a02186cc9bf9e5e019b
DIST php-5.4.10.tar.bz2 11145757 SHA256 c5bffda2154aedd9851c1e9b7da66f6c44c199716bd202054dd5d4a4f5f997e4 SHA512 2d8074dba24776113be208fa354c839168ce138b407ca45ed2334f91a54aff041f34280a87fb9e64ce29638047a48d481c384ffbf19cc0b5eb88aa39aba5beb4 WHIRLPOOL 2f39f62f618d4752031ddba98b95c7d00e7ac71318dd87ed0a1bc162a9b0d8383d376a8038598a0c2c291bb4f8421c84aa74c2eca6e8c173e60a8a51950b7c8c
DIST php-5.4.11.tar.bz2 11147685 SHA256 d4d095a965f015896d25321842da586076aca5fed4c52939866548ebad5b0fdb SHA512 fa50acb9498c9d33993d5f0722f2f2b32aa4e04a40e8adab47b4aa31943fc6df9c1edbcccffcd897b4c7635dcdf37d417f9b6c05fc3b2962e495b6f0f5776867 WHIRLPOOL fe4bf5f602e38581bb5201a9f50cc7686e5a0154809ececebe7317474ecadd879a8d7f7641ec80649b9970955208539a2f9b98d4bf66446ae333c499ec2df850
DIST php-5.4.12.tar.bz2 11501953 SHA256 413e5036b2784918922c14e094cbbc6f28289a3e8e559479c688ab07027ef719 SHA512 c4e87ff0d9457114f8428479e41cb69ffc4f4cc98a92fb0359e6130edb09b0af17ff344b3409f2f7850177591f288658f9a2797eac9962c9fb4f9eb58be64c21 WHIRLPOOL 1cf1153f006e1db472d435d344286cc702ab5fab6b3564d981be3406acfb7bdcd7b43ed3536581c2c1f7ea1389b04bb3c5c00814a082cc4c616fbe7b0b13eb77
DIST php-5.4.13.tar.bz2 11545777 SHA256 f80c9452f63a6d259d4edd5228be2136da98122ffb79cb1d9d6b7f9026e84f00 SHA512 477adf82fcd0ef8c4911e811da25e7d091753289f7887ee76c7f790394497bb71d5e84172d4711888f0194960b3bafc2bcbfb252842cfc4059eb0692e382d6b1 WHIRLPOOL a3a489261f343dd71b6de37c7e3aaa92f5344ca2fc34fdff1f5b08499fa719af7321f5ae6b583aab2be38d9f6c605bc54c435ca341742f1be7ea7f36bee0b6cd
DIST php-5.4.8.tar.bz2 11056057 SHA256 d02810b7949938ee7190116e7483e1a06b3fa8373d3bbc0ea65a41265afce79f SHA512 e04ee08e7d1b6f80183846206d02576ad22ea3f41e956bab970344b195f1d2267f1ff69439988cea7084c18576d7855383e48094bdb7684d43cb0f78e4a5e7b8 WHIRLPOOL 963153d85236bd105cbf11a89dd0db11e590cc292bb499abaa9271dbb47eeb124ef011af9561cb5569840d32130934c70cd8ebb4d619147892044ab8c3be09bd
DIST php-5.5.0alpha2.tar.bz2 11572909 SHA256 d618f8f570e3d29fff8f581a1e4228e9c0e3e51ecc6a295621863181822d913c SHA512 24dc24998aa8ecd29075f0c7b8f67b732e9b1aa7a36576a0b1536ff479679e8fb8c78681644be42d5ca948b20ec0a58a14c57f30c888a432daf7a0f5ab582e78 WHIRLPOOL e962d168091c65c957fb1df75cd64349a74e9cab7fc66efa2ab514d44b49bd5a7e28152c9c4e189390dfaff0925ab75583cf0c0286aa14397b8dabc1ced75848
DIST php-5.5.0alpha4.tar.bz2 11998221 SHA256 6e6000343338bda5f759c4745e0326d2495164779d13c86e7eaa43e4e0503837 SHA512 6fe1acdd5e01fb7c1c411a3abc6b2ea2fbaf894c41e3e457aebd2b0047ee9240194fa125f85bb977ddc773fd5c518216f3d40531d5ac05fadea0d0dc2be45288 WHIRLPOOL b5c5931a4cfc10d4be1be70b5042ef860262e1f40d725ceb4ba54613d8a699507cee7768f850cb78eb8ecf055d9a2f7970b30fcf9e12c5781cc89ee5c06cd93a
DIST php-5.5.0alpha6.tar.bz2 12026187 SHA256 46d233aed0d45d683a7b7f968ba0453de3756040a2594e261301ef6d731ffbb4 SHA512 5e9d871d1b2ae1399ba7f7d62f6815a36631ec56877af697e9d4b393a96f9f8305f4b7070d206917e4b4260d976f21aba24009b6ddc56aef0b343f101e1958be WHIRLPOOL abfe091020c6309decb9df45642adbebfb26cc310ed2098f5811df9d9012cb7c74c5a38d64d9c37c6d5ca27cb5dcd908e8d54df6685da890dfa37eca341f9771
DIST php-patchset-5.3-r0.tar.bz2 7368 SHA256 1a67b34a681dea33ea38f0ffc32b70a78b4c5dc1c3603d1bba31bb130d803ef7 SHA512 765b0cf56a3e63ded4ad1d1ba67567881ad06bdc2814cc07004fa338f38fd69078819c7463d2c55e00805c8f33fa925b94228bf7bc3d223acc33c6cff540024c WHIRLPOOL 59e18b33e11d968fac2a4571173121bf8141bb2f1eab62192e15bc59e351d3ab973f04343b447681d8a2adddf0844edb8a481d027bfc14c7e1fd8222169094ec
DIST php-patchset-5.3.18-r0.tar.bz2 7360 SHA256 8e7d449a4ab50dd8da241f2992fdaee012eafe4da6c66609231cff68d84c5c9f SHA512 625f456649964a959c7aa399c6c4fbeff8dd0b45372153819d42b447069e78cce99b4b6c30d89a64b211d230e17ef28e99d5e3b9055dd59e19b8103337de8d09 WHIRLPOOL cb1ae11173fa6d0a0f26a313d036f6f2109bc704531c5db76a584cc243b5f16ccff3c5e0c943196b5f13a7603e222c2f2c0eb393d754faf66fa5d54e5f627fde
DIST php-patchset-5.4-2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea

@ -0,0 +1,903 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.23.ebuild,v 1.1 2013/03/15 08:55:15 olemarkus Exp $
EAPI=5
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
SUHOSIN_VERSION=""
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-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}"
;;
"olemarkus")
echo "http://dev.gentoo.org/~olemarkus/php/${2}"
;;
"gentoo")
echo "mirror://gentoo/${2}"
;;
*)
die "unhandled case in php_get_uri"
;;
esac
}
PHP_MV="$(get_major_version)"
SLOT="$(get_version_component_range 1-2)"
# 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_PV="${PHP_PV/_alpha/alpha}"
PHP_PV="${PHP_PV/_beta/beta}"
PHP_RELEASE="php"
[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
PHP_P="${PN}-${PHP_PV}"
PHP_PATCHSET_LOC="olemarkus"
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
PHP_PATCHSET="0"
PHP_PATCHSET_URI="
$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
PHP_FPM_INIT_VER="4"
PHP_FPM_CONF_VER="1"
if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
# in some cases we use our own suhosin patch (very recent version,
# patch conflicts, etc.)
SUHOSIN_TYPE="olemarkus"
else
SUHOSIN_TYPE="suhosin"
fi
if [[ -n ${SUHOSIN_VERSION} ]]; then
SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
fi
SRC_URI="
${PHP_SRC_URI}
${PHP_PATCHSET_URI}"
if [[ -n ${SUHOSIN_VERSION} ]]; then
SRC_URI="${SRC_URI}
suhosin? ( ${SUHOSIN_URI} )"
fi
DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
HOMEPAGE="http://php.net/"
LICENSE="PHP-3"
S="${WORKDIR}/${PHP_P}"
# We can build the following SAPIs in the given order
SAPIS="embed cli cgi fpm apache2"
# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
IUSE="${IUSE}
${SAPIS/cli/+cli}
threads"
IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
crypt +ctype curl curlwrappers debug doc
enchant exif frontbase +fileinfo +filter firebird
flatfile ftp gd gdbm gmp +hash +iconv imap inifile
intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
mssql mysql mysqlnd mysqli nls
oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
readline recode selinux +session sharedmem
+simplexml snmp soap sockets spell sqlite2 sqlite ssl
sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
# Enable suhosin if available
[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
DEPEND="!dev-lang/php:5
>=app-admin/eselect-php-0.6.2
>=dev-libs/libpcre-8.12[unicode]
apache2? ( www-servers/apache[threads=] )
berkdb? ( =sys-libs/db-4* )
bzip2? ( app-arch/bzip2 )
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
cjk? ( !gd? (
virtual/jpeg
media-libs/libpng
sys-libs/zlib
) )
crypt? ( >=dev-libs/libmcrypt-2.4 )
curl? ( >=net-misc/curl-7.10.5 )
enchant? ( app-text/enchant )
exif? ( !gd? (
virtual/jpeg
media-libs/libpng
sys-libs/zlib
) )
firebird? ( dev-db/firebird )
gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
gdbm? ( >=sys-libs/gdbm-1.8.0 )
gmp? ( >=dev-libs/gmp-4.1.2 )
iconv? ( virtual/libiconv )
imap? ( virtual/imap-c-client[ssl=] )
intl? ( dev-libs/icu:= )
iodbc? ( dev-db/libiodbc )
kerberos? ( virtual/krb5 )
ldap? ( >=net-nds/openldap-1.2.11 )
ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
mssql? ( dev-db/freetds[mssql] )
!mysqlnd? (
mysql? ( virtual/mysql )
mysqli? ( >=virtual/mysql-4.1 )
)
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 )
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 )
spell? ( >=app-text/aspell-0.50 )
sqlite2? ( =dev-db/sqlite-2* )
sqlite? ( >=dev-db/sqlite-3.7.7.1 )
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? (
virtual/jpeg media-libs/libpng sys-libs/zlib )
)
unicode? ( dev-libs/oniguruma )
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
virtual/jpeg
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}"
REQUIRED_USE="
truetype? ( gd )
cjk? ( gd )
exif? ( gd )
xpm? ( gd )
gd? ( zlib )
simplexml? ( xml )
soap? ( xml )
wddx? ( xml )
xmlrpc? ( || ( xml iconv ) )
xmlreader? ( xml )
xsl? ( xml )
ldap-sasl? ( ldap )
mhash? ( hash )
phar? ( hash )
mysqlnd? ( || (
mysql
mysqli
pdo
) )
qdbm? ( !gdbm )
readline? ( !libedit )
recode? ( !imap !mysql !mysqli )
sharedmem? ( !threads )
!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
RDEPEND="${DEPEND}"
[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( =${CATEGORY}/${PN}-${SLOT}*[unicode] )"
RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
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 )"
# No longer depend on the extension. The suhosin USE flag only installs the
# patch
#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
# Allow users to install production version if they want to
case "${PHP_INI_VERSION}" in
production|development)
;;
*)
PHP_INI_VERSION="development"
;;
esac
PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
PHP_INI_FILE="php.ini"
want_apache
pkg_setup() {
depend.apache_pkg_setup
}
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 /tmp for save_path, bug #282768
sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/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 = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
dodir "${PHP_INI_DIR#${EPREFIX}}"
insinto "${PHP_INI_DIR#${EPREFIX}}"
newins "${phpinisrc}" "${PHP_INI_FILE}"
elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
elog
dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
# SAPI-specific handling
if [[ "${sapi}" == "apache2" ]] ; then
insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
"70_mod_php${PHP_MV}.conf"
fi
if [[ "${sapi}" == "fpm" ]] ; then
[[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3
[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
einfo "Installing FPM CGI config file php-fpm.conf"
insinto "${PHP_INI_DIR#${EPREFIX}}"
newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
dodir "/etc/init.d"
insinto "/etc/init.d"
newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm"
# dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm"
# Remove bogus /etc/php-fpm.conf.default (bug 359906)
[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
fi
# Install PHP ini files into /usr/share/php
dodoc php.ini-development
dodoc php.ini-production
}
php_set_ini_dir() {
PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
}
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
# 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}/patches/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 [[ -n $SUHOSIN_VERSION ]] ; then
if use suhosin ; then
epatch "${WORKDIR}/${SUHOSIN_PATCH}"
fi
else
ewarn "Please note that this version of PHP does not yet come with a suhosin patch"
fi
#Add user patches #357637
epatch_user
# 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
}
src_configure() {
addpredict /usr/share/snmp/mibs/.index
addpredict /var/lib/net-snmp/mib_indexes
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...
# for --with-libdir see bug #327025
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)"
# extension USE flag shared
my_conf+="
$(use_enable bcmath bcmath )
$(use_with bzip2 bz2 )
$(use_enable calendar calendar )
$(use_enable ctype ctype )
$(use_with curl curl )
$(use_with curlwrappers curlwrappers )
$(use_enable xml dom )
$(use_with enchant enchant /usr)
$(use_enable exif exif )
$(use_enable fileinfo fileinfo )
$(use_enable filter filter )
$(use_enable ftp ftp )
$(use_with nls gettext )
$(use_with gmp gmp )
$(use_enable hash hash )
$(use_with mhash mhash )
$(use_with iconv iconv )
$(use_enable intl intl )
$(use_enable ipv6 ipv6 )
$(use_enable json json )
$(use_with kerberos kerberos /usr)
$(use_enable xml libxml )
$(use_enable unicode mbstring )
$(use_with crypt mcrypt )
$(use_with mssql mssql )
$(use_with unicode onig /usr)
$(use_with ssl openssl )
$(use_with ssl openssl-dir /usr)
$(use_enable pcntl pcntl )
$(use_enable phar phar )
$(use_enable pdo pdo )
$(use_with postgres pgsql )
$(use_enable posix posix )
$(use_with spell pspell )
$(use_with recode recode )
$(use_enable simplexml simplexml )
$(use_enable sharedmem shmop )
$(use_with snmp snmp )
$(use_enable soap soap )
$(use_enable sockets sockets )"
if version_is_at_least 5.3.16-r2; then
my_conf+=" $(use_with sqlite2 sqlite /usr) "
use sqlite2 && my_conf+=" $(use_enable unicode sqlite-utf8)"
else
my_conf+=" $(use_with sqlite sqlite /usr) "
use sqlite && my_conf+=" $(use_enable unicode sqlite-utf8)"
fi
my_conf+="
$(use_with sqlite sqlite3 /usr)
$(use_with sybase-ct sybase-ct /usr)
$(use_enable sysvipc sysvmsg )
$(use_enable sysvipc sysvsem )
$(use_enable sysvipc sysvshm )
$(use_with tidy tidy )
$(use_enable tokenizer tokenizer )
$(use_enable wddx wddx )
$(use_enable xml xml )
$(use_enable xmlreader xmlreader )
$(use_enable xmlwriter xmlwriter )
$(use_with xmlrpc xmlrpc )
$(use_with xsl xsl )
$(use_enable zip zip )
$(use_with zlib zlib )
$(use_enable debug debug )"
# 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
my_conf+="
$(use_with cdb cdb )
$(use_with berkdb db4 )
$(use_enable flatfile flatfile )
$(use_with gdbm gdbm )
$(use_enable inifile inifile )
$(use_with qdbm qdbm )"
# Support for the GD graphics library
my_conf+="
$(use_with truetype freetype-dir /usr)
$(use_with truetype t1lib /usr)
$(use_enable cjk gd-jis-conv )
$(use_with gd jpeg-dir /usr)
$(use_with gd png-dir /usr)
$(use_with xpm xpm-dir /usr)"
# enable gd last, so configure can pick up the previous settings
my_conf+="
$(use_with gd gd )"
# IMAP support
if use imap ; then
my_conf+="
$(use_with imap imap )
$(use_with ssl imap-ssl )"
fi
# Interbase/firebird support
if use firebird ; then
my_conf+="
$(use_with firebird interbase /usr)"
fi
# LDAP support
if use ldap ; then
my_conf+="
$(use_with ldap ldap )
$(use_with ldap-sasl ldap-sasl )"
fi
# MySQL support
if use mysql ; then
if use mysqlnd ; then
my_conf+="
$(use_with mysqlnd mysql mysqlnd)"
else
my_conf+="
$(use_with mysql mysql /usr)"
fi
my_conf+="
$(use_with mysql mysql-sock /var/run/mysqld/mysqld.sock)"
fi
# MySQLi support
if use mysqlnd ; then
my_conf+="
$(use_with mysqli mysqli mysqlnd)"
else
my_conf+="
$(use_with mysqli mysqli /usr/bin/mysql_config)"
fi
# ODBC support
if use odbc ; then
my_conf+="
$(use_with odbc unixODBC /usr)"
fi
if use iodbc ; then
my_conf+="
$(use_with iodbc iodbc /usr)"
fi
# Oracle support
if use oci8-instant-client ; then
my_conf+="
$(use_with oci8-instant-client oci8)"
fi
# PDO support
if use pdo ; then
my_conf+="
$(use_with mssql pdo-dblib )"
if use mysqlnd ; then
my_conf+="
$(use_with mysql pdo-mysql mysqlnd)"
else
my_conf+="
$(use_with mysql pdo-mysql /usr)"
fi
my_conf+="
$(use_with postgres pdo-pgsql )
$(use_with sqlite pdo-sqlite /usr)
$(use_with odbc pdo-odbc unixODBC,/usr)"
if use oci8-instant-client ; then
my_conf+="
$(use_with oci8-instant-client pdo-oci)"
fi
fi
# readline/libedit support
my_conf+="
$(use_with readline readline )
$(use_with libedit libedit )"
# Session support
if use session ; then
my_conf+="
$(use_with sharedmem mm )"
else
my_conf+="
$(use_enable session session )"
fi
# Use pic for shared modules such as apache2's mod_php
my_conf="${my_conf} --with-pic"
# we use the system copy of pcre
# --with-pcre-regex affects ext/pcre
# --with-pcre-dir affects ext/filter and ext/zip
my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr"
# Catch CFLAGS problems
# Fixes bug #14067.
# Changed order to run it in reverse for bug #32022 and #12021.
replace-cpu-flags "k6*" "i586"
# 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
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|cgi|embed|fpm)
if [[ "${one_sapi}" == "${sapi}" ]] ; then
sapi_conf="${sapi_conf} --enable-${sapi}"
else
sapi_conf="${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
}
src_compile() {
# snmp seems to run during src_compile, too (bug #324739)
addpredict /usr/share/snmp/mibs/.index
addpredict /var/lib/net-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
}
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#${EPREFIX}}/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="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
# 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}"
if [[ "${sapi}" == "apache2" ]] ; then
# We're specifically not using emake install-sapi as libtool
# may cause unnecessary relink failures (see bug #351266)
insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
keepdir "/usr/$(get_libdir)/apache2/modules"
else
# needed each time, php_install_ini would reset it
into "${PHP_DESTDIR#${EPREFIX}}"
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}$(get_libname)"
;;
*)
die "unhandled sapi in src_install"
;;
esac
if [[ "${source}" == *"$(get_libname)" ]]; then
dolib.so "${source}" || die "Unable to install ${sapi} sapi"
else
dobin "${source}" || die "Unable to install ${sapi} sapi"
fi
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}/20php5-envd" \
"20php${SLOT}"
sed -e "s|/lib/|/$(get_libdir)/|g" -i \
"${ED}/etc/env.d/20php${SLOT}"
sed -e "s|php5|php${SLOT}|g" -i \
"${ED}/etc/env.d/20php${SLOT}"
# set php-config variable correctly (bug #278439)
sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
}
src_test() {
echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
if [[ ! -x "${PHP_BIN}" ]] ; then
ewarn "Test phase requires USE=cli, skipping"
return
else
export TEST_PHP_EXECUTABLE="${PHP_BIN}"
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
}
#Do not use eblit for this because it will not get sourced when installing from
#binary package (bug #380845)
pkg_postinst() {
# Output some general info to the user
if use apache2 ; then
APACHE2_MOD_DEFINE="PHP5"
APACHE2_MOD_CONF="70_mod_php5"
apache-module_pkg_postinst
fi
# Create the symlinks for php
for m in ${SAPIS}; do
[[ ${m} == 'embed' ]] && continue;
if use $m ; then
local ci=$(eselect php show $m)
if [[ -z $ci ]]; then
eselect php set $m php${SLOT}
einfo "Switched ${m} to use php:${SLOT}"
einfo
elif [[ $ci != "php${SLOT}" ]] ; then
elog "To switch $m to use php:${SLOT}, run"
elog " eselect php set $m php${SLOT}"
elog
fi
fi
done
elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order"
elog "to compile extensions for the ${SLOT} ABI"
elog
if ! use readline && use cli ; then
ewarn "Note that in order to use php interactivly, you need to enable"
ewarn "the readline USE flag or php -a will hang"
fi
elog
elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
elog "'production' or 'development' in /etc/make.conf"
ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}"
# check for not yet migrated old style config dirs
ls "${ROOT}"/etc/php/*-php5 &>/dev/null
if [[ $? -eq 0 ]]; then
ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config"
ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x"
fi
elog
elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
elog
if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
ewarn "The suhosin USE flag now only installs the suhosin patch!"
ewarn "If you want the suhosin extension, make sure you install"
ewarn " dev-php5/suhosin"
ewarn
fi
}

@ -0,0 +1,854 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.13.ebuild,v 1.1 2013/03/15 08:55:15 olemarkus Exp $
EAPI=5
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
SUHOSIN_VERSION=""
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
function php_get_uri ()
{
case "${1}" in
"php-pre")
echo "http://downloads.php.net/stas/${2}"
;;
"php")
echo "http://www.php.net/distributions/${2}"
;;
"suhosin")
echo "http://download.suhosin.org/${2}"
;;
"olemarkus")
echo "http://dev.gentoo.org/~olemarkus/php/${2}"
;;
"gentoo")
echo "mirror://gentoo/${2}"
;;
*)
die "unhandled case in php_get_uri"
;;
esac
}
PHP_MV="$(get_major_version)"
SLOT="$(get_version_component_range 1-2)"
# 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_PV="${PHP_PV/_alpha/alpha}"
PHP_PV="${PHP_PV/_beta/beta}"
PHP_RELEASE="php"
[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
PHP_P="${PN}-${PHP_PV}"
PHP_PATCHSET_LOC="olemarkus"
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
PHP_PATCHSET="2"
PHP_PATCHSET_URI="
$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
PHP_FPM_INIT_VER="4"
PHP_FPM_CONF_VER="1"
if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
# in some cases we use our own suhosin patch (very recent version,
# patch conflicts, etc.)
SUHOSIN_TYPE="olemarkus"
else
SUHOSIN_TYPE="suhosin"
fi
if [[ -n ${SUHOSIN_VERSION} ]]; then
SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
fi
SRC_URI="
${PHP_SRC_URI}
${PHP_PATCHSET_URI}"
if [[ -n ${SUHOSIN_VERSION} ]]; then
SRC_URI="${SRC_URI}
suhosin? ( ${SUHOSIN_URI} )"
fi
DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
HOMEPAGE="http://php.net/"
LICENSE="PHP-3"
S="${WORKDIR}/${PHP_P}"
# We can build the following SAPIs in the given order
SAPIS="embed cli cgi fpm apache2"
# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
IUSE="${IUSE}
${SAPIS/cli/+cli}
threads"
IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
crypt +ctype curl curlwrappers debug doc
enchant exif frontbase +fileinfo +filter firebird
flatfile ftp gd gdbm gmp +hash +iconv imap inifile
intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
mssql mysql mysqlnd mysqli nls
oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
readline recode selinux +session sharedmem
+simplexml snmp soap sockets spell sqlite ssl
sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
# Enable suhosin if available
[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
DEPEND="
>=app-admin/eselect-php-0.6.2
>=dev-libs/libpcre-8.12[unicode]
apache2? ( www-servers/apache[threads=] )
berkdb? ( =sys-libs/db-4* )
bzip2? ( app-arch/bzip2 )
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
cjk? ( !gd? (
virtual/jpeg
media-libs/libpng
sys-libs/zlib
) )
crypt? ( >=dev-libs/libmcrypt-2.4 )
curl? ( >=net-misc/curl-7.10.5 )
enchant? ( app-text/enchant )
exif? ( !gd? (
virtual/jpeg
media-libs/libpng
sys-libs/zlib
) )
firebird? ( dev-db/firebird )
gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
gdbm? ( >=sys-libs/gdbm-1.8.0 )
gmp? ( >=dev-libs/gmp-4.1.2 )
iconv? ( virtual/libiconv )
imap? ( virtual/imap-c-client[ssl=] )
intl? ( dev-libs/icu:= )
iodbc? ( dev-db/libiodbc )
kerberos? ( virtual/krb5 )
ldap? ( >=net-nds/openldap-1.2.11 )
ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
mssql? ( dev-db/freetds[mssql] )
!mysqlnd? (
mysql? ( virtual/mysql )
mysqli? ( >=virtual/mysql-4.1 )
)
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 )
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 )
spell? ( >=app-text/aspell-0.50 )
sqlite? ( >=dev-db/sqlite-3.7.6.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? (
virtual/jpeg media-libs/libpng sys-libs/zlib )
)
unicode? ( dev-libs/oniguruma )
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
virtual/jpeg
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}"
REQUIRED_USE="
truetype? ( gd )
cjk? ( gd )
exif? ( gd )
xpm? ( gd )
gd? ( zlib )
simplexml? ( xml )
soap? ( xml )
wddx? ( xml )
xmlrpc? ( || ( xml iconv ) )
xmlreader? ( xml )
xsl? ( xml )
ldap-sasl? ( ldap )
mhash? ( hash )
phar? ( hash )
mysqlnd? ( || (
mysql
mysqli
pdo
) )
qdbm? ( !gdbm )
readline? ( !libedit )
recode? ( !imap !mysql !mysqli )
sharedmem? ( !threads )
!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
RDEPEND="${DEPEND}"
[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
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 )"
# No longer depend on the extension. The suhosin USE flag only installs the
# patch
#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
# Allow users to install production version if they want to
case "${PHP_INI_VERSION}" in
production|development)
;;
*)
PHP_INI_VERSION="development"
;;
esac
PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
PHP_INI_FILE="php.ini"
want_apache
pkg_setup() {
depend.apache_pkg_setup
}
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 /tmp for save_path, bug #282768
sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/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 = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
dodir "${PHP_INI_DIR#${EPREFIX}}"
insinto "${PHP_INI_DIR#${EPREFIX}}"
newins "${phpinisrc}" "${PHP_INI_FILE}"
elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
elog
dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
# SAPI-specific handling
if [[ "${sapi}" == "apache2" ]] ; then
insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
"70_mod_php${PHP_MV}.conf"
fi
if [[ "${sapi}" == "fpm" ]] ; then
[[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3
[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
einfo "Installing FPM CGI config file php-fpm.conf"
insinto "${PHP_INI_DIR#${EPREFIX}}"
newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
dodir "/etc/init.d"
insinto "/etc/init.d"
newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm"
# dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm"
# Remove bogus /etc/php-fpm.conf.default (bug 359906)
[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
fi
# Install PHP ini files into /usr/share/php
dodoc php.ini-development
dodoc php.ini-production
}
php_set_ini_dir() {
PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
}
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
# Change PHP branding
# Get the alpha/beta/rc version
local ver=$(get_version_component_range 4)
sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1${PHP_EXTRA_BRANDING}-${ver}-pl${PR/r/}-gentoo\2|g" \
-i configure.in || die "Unable to change PHP branding"
# Apply generic PHP patches
EPATCH_SOURCE="${WORKDIR}/patches/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 [[ -n $SUHOSIN_VERSION ]] ; then
if use suhosin ; then
epatch "${WORKDIR}/${SUHOSIN_PATCH}"
fi
else
ewarn "Please note that this version of PHP does not yet come with a suhosin patch"
fi
#Add user patches #357637
epatch_user
#force rebuilding aclocal.m4
rm aclocal.m4
eautoreconf
if [[ ${CHOST} == *-darwin* ]] ; then
# http://bugs.php.net/bug.php?id=48795, bug #343481
sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
fi
}
src_configure() {
addpredict /usr/share/snmp/mibs/.index
addpredict /var/lib/net-snmp/mib_indexes
PHP_DESTDIR="${EPREFIX}/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...
# for --with-libdir see bug #327025
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)"
# extension USE flag shared
my_conf+="
$(use_enable bcmath bcmath )
$(use_with bzip2 bz2 "${EPREFIX}"/usr)
$(use_enable calendar calendar )
$(use_enable ctype ctype )
$(use_with curl curl "${EPREFIX}"/usr)
$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
$(use_enable xml dom )
$(use_with enchant enchant "${EPREFIX}"/usr)
$(use_enable exif exif )
$(use_enable fileinfo fileinfo )
$(use_enable filter filter )
$(use_enable ftp ftp )
$(use_with nls gettext "${EPREFIX}"/usr)
$(use_with gmp gmp "${EPREFIX}"/usr)
$(use_enable hash hash )
$(use_with mhash mhash "${EPREFIX}"/usr)
$(use_with iconv iconv )
$(use_enable intl intl )
$(use_enable ipv6 ipv6 )
$(use_enable json json )
$(use_with kerberos kerberos "${EPREFIX}"/usr)
$(use_enable xml libxml )
$(use_with xml libxml-dir "${EPREFIX}"/usr)
$(use_enable unicode mbstring )
$(use_with crypt mcrypt "${EPREFIX}"/usr)
$(use_with mssql mssql "${EPREFIX}"/usr)
$(use_with unicode onig "${EPREFIX}"/usr)
$(use_with ssl openssl "${EPREFIX}"/usr)
$(use_with ssl openssl-dir "${EPREFIX}"/usr)
$(use_enable pcntl pcntl )
$(use_enable phar phar )
$(use_enable pdo pdo )
$(use_with postgres pgsql "${EPREFIX}"/usr)
$(use_enable posix posix )
$(use_with spell pspell "${EPREFIX}"/usr)
$(use_with recode recode "${EPREFIX}"/usr)
$(use_enable simplexml simplexml )
$(use_enable sharedmem shmop )
$(use_with snmp snmp "${EPREFIX}"/usr)
$(use_enable soap soap )
$(use_enable sockets sockets )
$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
$(use_enable sysvipc sysvmsg )
$(use_enable sysvipc sysvsem )
$(use_enable sysvipc sysvshm )
$(use_with tidy tidy "${EPREFIX}"/usr)
$(use_enable tokenizer tokenizer )
$(use_enable wddx wddx )
$(use_enable xml xml )
$(use_enable xmlreader xmlreader )
$(use_enable xmlwriter xmlwriter )
$(use_with xmlrpc xmlrpc)
$(use_with xsl xsl "${EPREFIX}"/usr)
$(use_enable zip zip )
$(use_with zlib zlib "${EPREFIX}"/usr)
$(use_enable debug debug )"
# 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
my_conf+="
$(use_with cdb cdb)
$(use_with berkdb db4 ${EPREFIX}/usr)
$(use_enable flatfile flatfile )
$(use_with gdbm gdbm ${EPREFIX}/usr)
$(use_enable inifile inifile )
$(use_with qdbm qdbm ${EPREFIX}/usr)"
# Support for the GD graphics library
my_conf+="
$(use_with truetype freetype-dir ${EPREFIX}/usr)
$(use_with truetype t1lib ${EPREFIX}/usr)
$(use_enable cjk gd-jis-conv )
$(use_with gd jpeg-dir ${EPREFIX}/usr)
$(use_with gd png-dir ${EPREFIX}/usr)
$(use_with xpm xpm-dir ${EPREFIX}/usr)"
# enable gd last, so configure can pick up the previous settings
my_conf+="
$(use_with gd gd)"
# IMAP support
if use imap ; then
my_conf+="
$(use_with imap imap ${EPREFIX}/usr)
$(use_with ssl imap-ssl ${EPREFIX}/usr)"
fi
# Interbase/firebird support
if use firebird ; then
my_conf+="
$(use_with firebird interbase ${EPREFIX}/usr)"
fi
# LDAP support
if use ldap ; then
my_conf+="
$(use_with ldap ldap ${EPREFIX}/usr)
$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
fi
# MySQL support
if use mysql ; then
if use mysqlnd ; then
my_conf+="
$(use_with mysql mysql mysqlnd)"
else
my_conf+="
$(use_with mysql mysql ${EPREFIX}/usr)"
fi
my_conf+="
$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
fi
# MySQLi support
if use mysqlnd ; then
my_conf+="
$(use_with mysqli mysqli mysqlnd)"
else
my_conf+="
$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
fi
# ODBC support
if use odbc ; then
my_conf+="
$(use_with odbc unixODBC ${EPREFIX}/usr)"
fi
if use iodbc ; then
my_conf+="
$(use_with iodbc iodbc ${EPREFIX}/usr)"
fi
# Oracle support
if use oci8-instant-client ; then
my_conf+="
$(use_with oci8-instant-client oci8)"
fi
# PDO support
if use pdo ; then
my_conf+="
$(use_with mssql pdo-dblib )"
if use mysqlnd ; then
my_conf+="
$(use_with mysqlnd pdo-mysql mysqlnd)"
else
my_conf+="
$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
fi
my_conf+="
$(use_with postgres pdo-pgsql )
$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
if use oci8-instant-client ; then
my_conf+="
$(use_with oci8-instant-client pdo-oci)"
fi
fi
# readline/libedit support
my_conf+="
$(use_with readline readline ${EPREFIX}/usr)
$(use_with libedit libedit ${EPREFIX}/usr)"
# Session support
if use session ; then
my_conf+="
$(use_with sharedmem mm ${EPREFIX}/usr)"
else
my_conf+="
$(use_enable session session )"
fi
# Use pic for shared modules such as apache2's mod_php
my_conf="${my_conf} --with-pic"
# we use the system copy of pcre
# --with-pcre-regex affects ext/pcre
# --with-pcre-dir affects ext/filter and ext/zip
my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
# Catch CFLAGS problems
# Fixes bug #14067.
# Changed order to run it in reverse for bug #32022 and #12021.
replace-cpu-flags "k6*" "i586"
# 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
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|cgi|embed|fpm)
if [[ "${one_sapi}" == "${sapi}" ]] ; then
sapi_conf="${sapi_conf} --enable-${sapi}"
else
sapi_conf="${sapi_conf} --disable-${sapi}"
fi
;;
apache2)
if [[ "${one_sapi}" == "${sapi}" ]] ; then
sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
else
sapi_conf="${sapi_conf} --without-apxs2"
fi
;;
esac
done
econf ${sapi_conf}
done
}
src_compile() {
# snmp seems to run during src_compile, too (bug #324739)
addpredict /usr/share/snmp/mibs/.index
addpredict /var/lib/net-snmp/mib_indexes
for sapi in ${SAPIS} ; do
if use "${sapi}"; then
cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
emake || die "emake failed"
fi
done
}
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#${EPREFIX}}/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="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
# 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}"
if [[ "${sapi}" == "apache2" ]] ; then
# We're specifically not using emake install-sapi as libtool
# may cause unnecessary relink failures (see bug #351266)
insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
keepdir "/usr/$(get_libdir)/apache2/modules"
else
# needed each time, php_install_ini would reset it
into "${PHP_DESTDIR#${EPREFIX}}"
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}$(get_libname)"
;;
*)
die "unhandled sapi in src_install"
;;
esac
if [[ "${source}" == *"$(get_libname)" ]]; then
dolib.so "${source}" || die "Unable to install ${sapi} sapi"
else
dobin "${source}" || die "Unable to install ${sapi} sapi"
fi
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}/20php5-envd" \
"20php${SLOT}"
sed -e "s|/lib/|/$(get_libdir)/|g" -i \
"${ED}/etc/env.d/20php${SLOT}"
sed -e "s|php5|php${SLOT}|g" -i \
"${ED}/etc/env.d/20php${SLOT}"
# set php-config variable correctly (bug #278439)
sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
}
src_test() {
echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
if [[ ! -x "${PHP_BIN}" ]] ; then
ewarn "Test phase requires USE=cli, skipping"
return
else
export TEST_PHP_EXECUTABLE="${PHP_BIN}"
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
}
pkg_postinst() {
# Output some general info to the user
if use apache2 ; then
APACHE2_MOD_DEFINE="PHP5"
APACHE2_MOD_CONF="70_mod_php5"
apache-module_pkg_postinst
fi
# Create the symlinks for php
for m in ${SAPIS}; do
[[ ${m} == 'embed' ]] && continue;
if use $m ; then
local ci=$(eselect php show $m)
if [[ -z $ci ]]; then
eselect php set $m php${SLOT}
einfo "Switched ${m} to use php:${SLOT}"
einfo
elif [[ $ci != "php${SLOT}" ]] ; then
elog "To switch $m to use php:${SLOT}, run"
elog " eselect php set $m php${SLOT}"
elog
fi
fi
done
elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
elog "to compile extensions for the ${SLOT} ABI"
elog
if ! use readline && use cli ; then
ewarn "Note that in order to use php interactivly, you need to enable"
ewarn "the readline USE flag or php -a will hang"
fi
elog
elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
elog
elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
elog
if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
ewarn
ewarn "The suhosin USE flag now only installs the suhosin patch!"
ewarn "If you want the suhosin extension, make sure you install"
ewarn " dev-php/suhosin"
ewarn
fi
}
pkg_prerm() {
local sapi
local slot
for sapi in ${SAPIS}; do
slot=$(eselect php show $sapi 2> /dev/null)
slot=${slot/php/}
if [[ $slot == $SLOT ]]; then
ewarn "You have removed the active version of the $sapi SAPI"
ewarn "Fix the issue using \`eselect php\`"
fi
done
}

@ -0,0 +1,866 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.0_alpha6.ebuild,v 1.1 2013/03/15 08:55:15 olemarkus Exp $
EAPI=5
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
SUHOSIN_VERSION=""
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
function php_get_uri ()
{
case "${1}" in
"php-pre")
echo "http://downloads.php.net/dsp/${2}"
;;
"php")
echo "http://www.php.net/distributions/${2}"
;;
"suhosin")
echo "http://download.suhosin.org/${2}"
;;
"olemarkus")
echo "http://dev.gentoo.org/~olemarkus/php/${2}"
;;
"gentoo")
echo "mirror://gentoo/${2}"
;;
*)
die "unhandled case in php_get_uri"
;;
esac
}
PHP_MV="$(get_major_version)"
SLOT="$(get_version_component_range 1-2)"
# 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_PV="${PHP_PV/_alpha/alpha}"
PHP_PV="${PHP_PV/_beta/beta}"
PHP_RELEASE="php"
[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
PHP_P="${PN}-${PHP_PV}"
PHP_PATCHSET_LOC="olemarkus"
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
PHP_PATCHSET="0"
PHP_PATCHSET_URI="
$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
PHP_FPM_INIT_VER="4"
PHP_FPM_CONF_VER="1"
if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
# in some cases we use our own suhosin patch (very recent version,
# patch conflicts, etc.)
SUHOSIN_TYPE="olemarkus"
else
SUHOSIN_TYPE="suhosin"
fi
if [[ -n ${SUHOSIN_VERSION} ]]; then
SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
fi
SRC_URI="
${PHP_SRC_URI}
${PHP_PATCHSET_URI}"
if [[ -n ${SUHOSIN_VERSION} ]]; then
SRC_URI="${SRC_URI}
suhosin? ( ${SUHOSIN_URI} )"
fi
DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
HOMEPAGE="http://php.net/"
LICENSE="PHP-3"
S="${WORKDIR}/${PHP_P}"
# We can build the following SAPIs in the given order
SAPIS="embed cli cgi fpm apache2"
# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
IUSE="${IUSE}
${SAPIS/cli/+cli}
threads"
IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
crypt +ctype curl curlwrappers debug doc
enchant exif frontbase +fileinfo +filter firebird
flatfile ftp gd gdbm gmp +hash +iconv imap inifile
intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
mssql mysql mysqlnd mysqli nls
oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
readline recode selinux +session sharedmem
+simplexml snmp soap sockets spell sqlite ssl
sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
# Enable suhosin if available
[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
DEPEND="
>=app-admin/eselect-php-0.6.2
>=dev-libs/libpcre-8.32[unicode]
apache2? ( www-servers/apache[threads=] )
berkdb? ( =sys-libs/db-4* )
bzip2? ( app-arch/bzip2 )
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
cjk? ( !gd? (
virtual/jpeg
media-libs/libpng
sys-libs/zlib
) )
crypt? ( >=dev-libs/libmcrypt-2.4 )
curl? ( >=net-misc/curl-7.10.5 )
enchant? ( app-text/enchant )
exif? ( !gd? (
virtual/jpeg
media-libs/libpng
sys-libs/zlib
) )
firebird? ( dev-db/firebird )
gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
gdbm? ( >=sys-libs/gdbm-1.8.0 )
gmp? ( >=dev-libs/gmp-4.1.2 )
iconv? ( virtual/libiconv )
imap? ( virtual/imap-c-client[ssl=] )
intl? ( dev-libs/icu:= )
iodbc? ( dev-db/libiodbc )
kerberos? ( virtual/krb5 )
ldap? ( >=net-nds/openldap-1.2.11 )
ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
mssql? ( dev-db/freetds[mssql] )
!mysqlnd? (
mysql? ( virtual/mysql )
mysqli? ( >=virtual/mysql-4.1 )
)
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 )
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 )
spell? ( >=app-text/aspell-0.50 )
sqlite? ( >=dev-db/sqlite-3.7.6.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? (
virtual/jpeg media-libs/libpng sys-libs/zlib )
)
unicode? ( dev-libs/oniguruma )
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
virtual/jpeg
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}"
REQUIRED_USE="
truetype? ( gd )
cjk? ( gd )
exif? ( gd )
xpm? ( gd )
gd? ( zlib )
simplexml? ( xml )
soap? ( xml )
wddx? ( xml )
xmlrpc? ( || ( xml iconv ) )
xmlreader? ( xml )
xsl? ( xml )
ldap-sasl? ( ldap )
mhash? ( hash )
phar? ( hash )
mysqlnd? ( || (
mysql
mysqli
pdo
) )
qdbm? ( !gdbm )
readline? ( !libedit )
recode? ( !imap !mysql !mysqli )
sharedmem? ( !threads )
!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
RDEPEND="${DEPEND}"
[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
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 )"
# No longer depend on the extension. The suhosin USE flag only installs the
# patch
#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
# Allow users to install production version if they want to
case "${PHP_INI_VERSION}" in
production|development)
;;
*)
PHP_INI_VERSION="development"
;;
esac
PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
PHP_INI_FILE="php.ini"
want_apache
pkg_setup() {
depend.apache_pkg_setup
}
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 /tmp for save_path, bug #282768
sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/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 = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
dodir "${PHP_INI_DIR#${EPREFIX}}"
insinto "${PHP_INI_DIR#${EPREFIX}}"
newins "${phpinisrc}" "${PHP_INI_FILE}"
elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
elog
dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
# SAPI-specific handling
if [[ "${sapi}" == "apache2" ]] ; then
insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
"70_mod_php${PHP_MV}.conf"
fi
if [[ "${sapi}" == "fpm" ]] ; then
[[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3
[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
einfo "Installing FPM CGI config file php-fpm.conf"
insinto "${PHP_INI_DIR#${EPREFIX}}"
newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
dodir "/etc/init.d"
insinto "/etc/init.d"
newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm"
# dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm"
# Remove bogus /etc/php-fpm.conf.default (bug 359906)
[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
fi
# Install PHP ini files into /usr/share/php
if [[ ${SLOT} == '5.2' ]]; then
newdoc php.ini-dist php.ini-development
newdoc php.ini-recommended php.ini-production
fi
if [[ ${SLOT} == '5.3' ]]; then
dodoc php.ini-development
dodoc php.ini-production
fi
if [[ ${SLOT} == '5.4' ]]; then
dodoc php.ini-development
dodoc php.ini-production
fi
}
php_set_ini_dir() {
PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
}
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
# Change PHP branding
# Get the alpha/beta/rc version
local ver=$(get_version_component_range 3)
sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-i configure.in || die "Unable to change PHP branding"
# Apply generic PHP patches
EPATCH_SOURCE="${WORKDIR}/patches/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 [[ -n $SUHOSIN_VERSION ]] ; then
if use suhosin ; then
epatch "${WORKDIR}/${SUHOSIN_PATCH}"
fi
else
ewarn "Please note that this version of PHP does not yet come with a suhosin patch"
fi
#Add user patches #357637
epatch_user
#force rebuilding aclocal.m4
rm aclocal.m4
eautoreconf
if [[ ${CHOST} == *-darwin* ]] ; then
# http://bugs.php.net/bug.php?id=48795, bug #343481
sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
fi
}
src_configure() {
addpredict /usr/share/snmp/mibs/.index
addpredict /var/lib/net-snmp/mib_indexes
PHP_DESTDIR="${EPREFIX}/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...
# for --with-libdir see bug #327025
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)"
# extension USE flag shared
my_conf+="
$(use_enable bcmath bcmath )
$(use_with bzip2 bz2 "${EPREFIX}"/usr)
$(use_enable calendar calendar )
$(use_enable ctype ctype )
$(use_with curl curl "${EPREFIX}"/usr)
$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
$(use_enable xml dom )
$(use_with enchant enchant "${EPREFIX}"/usr)
$(use_enable exif exif )
$(use_enable fileinfo fileinfo )
$(use_enable filter filter )
$(use_enable ftp ftp )
$(use_with nls gettext "${EPREFIX}"/usr)
$(use_with gmp gmp "${EPREFIX}"/usr)
$(use_enable hash hash )
$(use_with mhash mhash "${EPREFIX}"/usr)
$(use_with iconv iconv )
$(use_enable intl intl )
$(use_enable ipv6 ipv6 )
$(use_enable json json )
$(use_with kerberos kerberos "${EPREFIX}"/usr)
$(use_enable xml libxml )
$(use_with xml libxml-dir "${EPREFIX}"/usr)
$(use_enable unicode mbstring )
$(use_with crypt mcrypt "${EPREFIX}"/usr)
$(use_with mssql mssql "${EPREFIX}"/usr)
$(use_with unicode onig "${EPREFIX}"/usr)
$(use_with ssl openssl "${EPREFIX}"/usr)
$(use_with ssl openssl-dir "${EPREFIX}"/usr)
$(use_enable pcntl pcntl )
$(use_enable phar phar )
$(use_enable pdo pdo )
$(use_with postgres pgsql "${EPREFIX}"/usr)
$(use_enable posix posix )
$(use_with spell pspell "${EPREFIX}"/usr)
$(use_with recode recode "${EPREFIX}"/usr)
$(use_enable simplexml simplexml )
$(use_enable sharedmem shmop )
$(use_with snmp snmp "${EPREFIX}"/usr)
$(use_enable soap soap )
$(use_enable sockets sockets )
$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
$(use_enable sysvipc sysvmsg )
$(use_enable sysvipc sysvsem )
$(use_enable sysvipc sysvshm )
$(use_with tidy tidy "${EPREFIX}"/usr)
$(use_enable tokenizer tokenizer )
$(use_enable wddx wddx )
$(use_enable xml xml )
$(use_enable xmlreader xmlreader )
$(use_enable xmlwriter xmlwriter )
$(use_with xmlrpc xmlrpc)
$(use_with xsl xsl "${EPREFIX}"/usr)
$(use_enable zip zip )
$(use_with zlib zlib "${EPREFIX}"/usr)
$(use_enable debug debug )"
# 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
my_conf+="
$(use_with cdb cdb)
$(use_with berkdb db4 ${EPREFIX}/usr)
$(use_enable flatfile flatfile )
$(use_with gdbm gdbm ${EPREFIX}/usr)
$(use_enable inifile inifile )
$(use_with qdbm qdbm ${EPREFIX}/usr)"
# Support for the GD graphics library
my_conf+="
$(use_with truetype freetype-dir ${EPREFIX}/usr)
$(use_with truetype t1lib ${EPREFIX}/usr)
$(use_enable cjk gd-jis-conv )
$(use_with gd jpeg-dir ${EPREFIX}/usr)
$(use_with gd png-dir ${EPREFIX}/usr)
$(use_with xpm xpm-dir ${EPREFIX}/usr)"
# enable gd last, so configure can pick up the previous settings
my_conf+="
$(use_with gd gd)"
# IMAP support
if use imap ; then
my_conf+="
$(use_with imap imap ${EPREFIX}/usr)
$(use_with ssl imap-ssl ${EPREFIX}/usr)"
fi
# Interbase/firebird support
if use firebird ; then
my_conf+="
$(use_with firebird interbase ${EPREFIX}/usr)"
fi
# LDAP support
if use ldap ; then
my_conf+="
$(use_with ldap ldap ${EPREFIX}/usr)
$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
fi
# MySQL support
if use mysql ; then
if use mysqlnd ; then
my_conf+="
$(use_with mysql mysql mysqlnd)"
else
my_conf+="
$(use_with mysql mysql ${EPREFIX}/usr)"
fi
my_conf+="
$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
fi
# MySQLi support
if use mysqlnd ; then
my_conf+="
$(use_with mysqli mysqli mysqlnd)"
else
my_conf+="
$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
fi
# ODBC support
if use odbc ; then
my_conf+="
$(use_with odbc unixODBC ${EPREFIX}/usr)"
fi
if use iodbc ; then
my_conf+="
$(use_with iodbc iodbc ${EPREFIX}/usr)"
fi
# Oracle support
if use oci8-instant-client ; then
my_conf+="
$(use_with oci8-instant-client oci8)"
fi
# PDO support
if use pdo ; then
my_conf+="
$(use_with mssql pdo-dblib )"
if use mysqlnd ; then
my_conf+="
$(use_with mysql pdo-mysql mysqlnd)"
else
my_conf+="
$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
fi
my_conf+="
$(use_with postgres pdo-pgsql )
$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
if use oci8-instant-client ; then
my_conf+="
$(use_with oci8-instant-client pdo-oci)"
fi
fi
# readline/libedit support
my_conf+="
$(use_with readline readline ${EPREFIX}/usr)
$(use_with libedit libedit ${EPREFIX}/usr)"
# Session support
if use session ; then
my_conf+="
$(use_with sharedmem mm ${EPREFIX}/usr)"
else
my_conf+="
$(use_enable session session )"
fi
#Build shared modules such as libphp5.so with pic support
my_conf="${my_conf} --with-pic"
# we use the system copy of pcre
# --with-pcre-regex affects ext/pcre
# --with-pcre-dir affects ext/filter and ext/zip
my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
# Catch CFLAGS problems
# Fixes bug #14067.
# Changed order to run it in reverse for bug #32022 and #12021.
replace-cpu-flags "k6*" "i586"
# 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
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|cgi|embed|fpm)
if [[ "${one_sapi}" == "${sapi}" ]] ; then
sapi_conf="${sapi_conf} --enable-${sapi}"
else
sapi_conf="${sapi_conf} --disable-${sapi}"
fi
;;
apache2)
if [[ "${one_sapi}" == "${sapi}" ]] ; then
sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
else
sapi_conf="${sapi_conf} --without-apxs2"
fi
;;
esac
done
econf ${sapi_conf}
done
}
src_compile() {
# snmp seems to run during src_compile, too (bug #324739)
addpredict /usr/share/snmp/mibs/.index
addpredict /var/lib/net-snmp/mib_indexes
for sapi in ${SAPIS} ; do
if use "${sapi}"; then
cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
emake || die "emake failed"
fi
done
}
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#${EPREFIX}}/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="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
# 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}"
if [[ "${sapi}" == "apache2" ]] ; then
# We're specifically not using emake install-sapi as libtool
# may cause unnecessary relink failures (see bug #351266)
insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
keepdir "/usr/$(get_libdir)/apache2/modules"
else
# needed each time, php_install_ini would reset it
into "${PHP_DESTDIR#${EPREFIX}}"
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}$(get_libname)"
;;
*)
die "unhandled sapi in src_install"
;;
esac
if [[ "${source}" == *"$(get_libname)" ]]; then
dolib.so "${source}" || die "Unable to install ${sapi} sapi"
else
dobin "${source}" || die "Unable to install ${sapi} sapi"
fi
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}/20php5-envd" \
"20php${SLOT}"
sed -e "s|/lib/|/$(get_libdir)/|g" -i \
"${ED}/etc/env.d/20php${SLOT}"
sed -e "s|php5|php${SLOT}|g" -i \
"${ED}/etc/env.d/20php${SLOT}"
# set php-config variable correctly (bug #278439)
sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
}
src_test() {
echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
if [[ ! -x "${PHP_BIN}" ]] ; then
ewarn "Test phase requires USE=cli, skipping"
return
else
export TEST_PHP_EXECUTABLE="${PHP_BIN}"
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
}
pkg_postinst() {
# Output some general info to the user
if use apache2 ; then
APACHE2_MOD_DEFINE="PHP5"
APACHE2_MOD_CONF="70_mod_php5"
apache-module_pkg_postinst
fi
# Create the symlinks for php
for m in ${SAPIS}; do
[[ ${m} == 'embed' ]] && continue;
if use $m ; then
local ci=$(eselect php show $m)
if [[ -z $ci ]]; then
eselect php set $m php${SLOT}
einfo "Switched ${m} to use php:${SLOT}"
einfo
elif [[ $ci != "php${SLOT}" ]] ; then
elog "To switch $m to use php:${SLOT}, run"
elog " eselect php set $m php${SLOT}"
elog
fi
fi
done
elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
elog "to compile extensions for the ${SLOT} ABI"
elog
if ! use readline && use cli ; then
ewarn "Note that in order to use php interactivly, you need to enable"
ewarn "the readline USE flag or php -a will hang"
fi
elog
elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
elog
elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
elog
if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
ewarn
ewarn "The suhosin USE flag now only installs the suhosin patch!"
ewarn "If you want the suhosin extension, make sure you install"
ewarn " dev-php/suhosin"
ewarn
fi
}
pkg_prerm() {
local sapi
local slot
for sapi in ${SAPIS}; do
slot=$(eselect php show $sapi 2> /dev/null)
slot=${slot/php/}
if [[ $slot == $SLOT ]]; then
ewarn "You have removed the active version of the $sapi SAPI"
ewarn "Fix the issue using \`eselect php\`"
fi
done
}

@ -1,46 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/389-adminutil/389-adminutil-1.1.10.ebuild,v 1.2 2012/05/04 18:35:54 jdhore Exp $
EAPI="2"
inherit libtool eutils
MY_PV=${PV/_rc/.rc}
MY_PV=${MY_PV/_a/.a}
MY_P=${P/_rc/.rc}
MY_P=${MY_P/_a/.a}
DESCRIPTION="389 adminutil"
HOMEPAGE="http://port389.org/"
SRC_URI="http://port389.org/sources/${MY_P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug"
COMMON_DEPEND=">=dev-libs/nss-3.11.4
>=dev-libs/nspr-4.6.4
>=dev-libs/svrcore-4.0.3
>=dev-libs/mozldap-6.0.2
>=dev-libs/cyrus-sasl-2.1.19
>=dev-libs/icu-3.4"
DEPEND="virtual/pkgconfig ${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
src_prepare() {
elibtoolize
}
src_configure() {
econf $(use_enable debug) \
--with-fhs \
--disable-rpath \
--disable-tests ||die "econf failed"
}
src_install () {
emake DESTDIR="${D}" install || die "emake failed"
dodoc README NEWS
}

@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/389-adminutil/389-adminutil-1.1.13.ebuild,v 1.2 2012/05/04 18:35:54 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild,v 1.1 2013/03/14 17:44:12 lxnay Exp $
EAPI="2"
EAPI=5
inherit libtool eutils
@ -23,9 +23,9 @@ IUSE="debug"
COMMON_DEPEND=">=dev-libs/nss-3.11.4
>=dev-libs/nspr-4.6.4
>=dev-libs/svrcore-4.0.3
>=dev-libs/mozldap-6.0.2
>=dev-libs/cyrus-sasl-2.1.19
>=dev-libs/icu-3.4"
>=dev-libs/icu-3.4
net-nds/openldap"
DEPEND="virtual/pkgconfig ${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
@ -36,6 +36,7 @@ src_prepare() {
src_configure() {
econf $(use_enable debug) \
--with-fhs \
--with-openldap \
--disable-rpath \
--disable-tests ||die "econf failed"
}

@ -1,3 +1,2 @@
DIST 389-adminutil-1.1.10.tar.bz2 307582 SHA256 d1cccc6439439716a48ec13b676122457de10c29556640eac0ed096302229428 SHA512 3e2b38451ac32c8fd141d5e21094863bbfa5fa0c5f3897448b03d1bf5503c3b5e5fd7c270c1b578a591783eeb13f274abdafd5caa68595475acc7014bbf0f628 WHIRLPOOL f2c5e7fe753a96078896d4c305db0970cc2857f6993c6608d6c9a251b94eef8b51ca2555ef8e2bc6d058a0bce076ad57e1f7939d51b67d63a91de565824d4a9f
DIST 389-adminutil-1.1.13.tar.bz2 309981 SHA256 942f3c01a225dbb5c5b5039df58e224e5eead5df8f9be1cf0807d319d196bbae SHA512 37c374562891f4158b1eeb1c10c7eb0873e666d5b7a54500ce25522c055b570f8bdc4f29a2f6268ca304c99af0555f31745f8bdcff5be964a6828c32a23e138b WHIRLPOOL 9ff76178e3764924858e7bb842003cfc21cba371a789938a251a733128641b17d86095c7944d3f15f128fda4000b62d83087eedaa9c47e4ccfd3bfb39897c5fb
DIST 389-adminutil-1.1.14.tar.bz2 284042 SHA256 d900e28b409cf3f8e5514a86cfad953f7bb53bf474300f006b4bbb021973d890 SHA512 09190bc6a15ace8252ebff117f4ebb0c2f447d021059770479965cce121afce7113e25a29c538107cb45b39de76dffdf37b009c5c79890cbe11c070d95dcb29c WHIRLPOOL b0427b24e5a862883946c22c95e998a9fde646e6f8a30ecca3376a6b376f278af16eb980c773e9bdb766f0692d67034c73cbafd5756743f8511e8d64586b0f46
DIST 389-adminutil-1.1.15.tar.bz2 283825 SHA256 8ca29db779c87f3c8c41ba793864454b094f41b5cdbf74b9b45967a81eb17958 SHA512 5ed8d758ee47a2e276bab73696067dd2acd36f15ea5b93b32e3e244530920d74d95a4a4ff96cd325f22ae4ce2cc764fef03c90497c0181cbc1f0291f260d8ddf WHIRLPOOL e68fd5975a2d871e0e2c79580ecc24f48091fc1418ec04816e39799ac17b2495fd3b25c26e7e55626da46210909a8e9ffc1c8d6ad140e3fce0f3665dff0de903

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.8-r3.ebuild,v 1.11 2013/03/14 07:47:08 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.8-r3.ebuild,v 1.13 2013/03/14 16:18:09 ago Exp $
EAPI=4
inherit autotools
@ -23,7 +23,7 @@ SRC_URI="
# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
LICENSE="LGPL-2.1 GPL-2 MaxMind2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
IUSE="city ipv6 perl-geoipupdate static-libs"
DEPEND="sys-libs/zlib"

@ -0,0 +1,11 @@
--- scripts/Kbuild.install.orig 2013-03-14 09:33:32.429919267 -0400
+++ scripts/Kbuild.install 2013-03-14 09:33:55.443820061 -0400
@@ -95,7 +95,7 @@ header:
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
- $(Q)make -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
+ $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
$(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.20.ebuild,v 1.7 2011/06/23 20:19:08 ranger Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.20.ebuild,v 1.8 2013/03/14 14:31:04 mpagano Exp $
# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
# This still needs major work.
@ -91,6 +91,9 @@ src_unpack() {
# Fix usage of -s, bug #201006
epatch "${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
# Fix parallel make install
epatch "${FILESDIR}"/${P}-parallel-make.patch
# Fix infinite loop during build with make 3.82
# http://www.zytor.com/pipermail/klibc/2010-November/002786.html
epatch "${FILESDIR}"/${PN}-1.5.20-kbuild.patch

@ -1 +1,2 @@
DIST mozldap-6.0.6.tar.gz 708821 SHA256 3a7b94c6698e2acb91a577decee5eb6103f183d6b9833abb169124818ba80d06 SHA512 a3f63b248201c521d962fb48a5374732de23c04920009bf108aabbc71efb83995da04401f095dff58196b5749f8e4cafb2e2b915f1927f7695cb9446e45033df WHIRLPOOL 57991fe8c406a0f5c4d6dc1856ef8f485f8831f5ac3a81c2366a8e03fb9e62a7697f4aed95e62e7fcf308707f2363400dfcc961cff640ef530dbb53f8edd982c
DIST mozldap-6.0.7.tar.gz 674789 SHA256 ec9884b56b31961d287190323764af7f3b00ad2658d5f3005fa8dc71c637e54c SHA512 bad8005941acaf98f53a60c6c8b697a680e8efe736817b063853ff1f07f052d3257ba7c28f502e37e0c2544fe00d24d31787ccbf892deb43c5481d49ed434b71 WHIRLPOOL 30dc35de03fb99d5f2ae65b10922ee3ec05246ee77f35a37cb80811ae29552d7a347fa13c5ce0a8cb3613fd30584f3fdd6a2cadcfc7cc974a56986bf633767be

@ -1,5 +1,5 @@
--- configure.in.orig 2009-10-06 11:46:10.378924265 +0300
+++ configure.in 2009-10-06 11:47:36.154924127 +0300
--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@
AC_PREREQ(2.12)
AC_INIT(ldap/include/ldap.h)

@ -1,6 +1,5 @@
diff -uNr mozldap.pc.in mozldap.pc.in
--- mozldap.pc.in 2006-10-06 01:01:43.000000000 +0200
+++ mozldap.pc.in 2007-08-06 21:27:09.000000000 +0200
--- a/mozldap.pc.in
+++ b/mozldap.pc.in
@@ -11,6 +11,6 @@
Name: mozldap
Description: Mozilla LDAP C SDK

@ -0,0 +1,137 @@
diff -Nurp c-sdk.orig/configure.in c-sdk/configure.in
--- c-sdk.orig/configure.in 2011-01-06 12:05:39.000000000 +0000
+++ c-sdk/configure.in 2013-03-14 18:01:19.647224070 +0000
@@ -42,7 +42,7 @@ dnl ***** END LICENSE BLOCK *****
AC_PREREQ(2.12)
AC_INIT(ldap/include/ldap.h)
-AC_CONFIG_AUX_DIR(${srcdir}/config/autoconf)
+AC_CONFIG_AUX_DIR(./config/autoconf)
AC_CANONICAL_SYSTEM
dnl ========================================================
@@ -86,24 +86,6 @@ DLLFLAGS="${DLLFLAGS=}"
HOST_CFLAGS="${HOST_CFLAGS=}"
HOST_LDFLAGS="${HOST_LDFLAGS=}"
-case "$target" in
-*-cygwin*|*-mingw*|*-msvc*|*-mks*)
- # Check to see if we are really running in a msvc environemnt
- _WIN32_MSVC=
- AC_CHECK_PROGS(CC, cl)
- if test "$CC" = "cl"; then
- echo 'main() { return 0; }' > dummy.c
- ${CC} -o dummy dummy.c >/dev/null 2>&1
- if test $? = 0; then
- _WIN32_MSVC=1
- CXX=$CC
- else
- AC_MSG_WARN([$(CC) test failed. Using normal feature tests])
- fi
- rm -f dummy dummy.o dummy.obj dummy.exe dummy.c
- fi
- ;;
-esac
if test -n "$_WIN32_MSVC"; then
SKIP_PATH_CHECKS=1
@@ -152,18 +134,6 @@ AC_ARG_WITH(mozilla,
AC_DEFINE(MOZILLA_CLIENT)
fi])
-AC_ARG_ENABLE(optimize,
- [ --enable-optimize(=val) Enable code optimizations (val, ie. -O2) ],
- [ if test "$enableval" != "no"; then
- MOZ_OPTIMIZE=1
- if test -n "$enableval" && test "$enableval" != "yes"; then
- _OPTIMIZE_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
- _SAVE_OPTIMIZE_FLAGS=$_OPTIMIZE_FLAGS
- fi
- else
- MOZ_OPTIMIZE=
- fi ])
-
AC_ARG_ENABLE(debug,
[ --enable-debug(=val) Enable debugging (debug flags val)],
[ if test "$enableval" != "no"; then
@@ -176,26 +146,6 @@ AC_ARG_ENABLE(debug,
MOZ_DEBUG=
fi])
-AC_ARG_ENABLE(win32-target,
- [ --enable-win32-target=\$t
- Specify win32 flavor. (WIN95 or WINNT)],
- OS_TARGET=`echo $enableval | tr a-z A-Z`,
- OS_TARGET=)
-
-AC_ARG_ENABLE(debug-rtl,
- [ --enable-debug-rtl Use the MSVC debug runtime library],
- [ if test "$enableval" = "yes"; then
- USE_DEBUG_RTL=1
- fi ])
-
-AC_ARG_ENABLE(n32,
- [ --enable-n32 Enable n32 ABI support (IRIX only)],
- [ if test "$enableval" = "yes"; then
- USE_N32=1
- else if test "$enableval" = "no"; then
- USE_N32=
- fi
- fi ])
AC_ARG_ENABLE(64bit,
[ --enable-64bit Enable 64-bit support (on certain platforms)],
@@ -261,10 +211,6 @@ dnl svrcore implies both nspr and nss
if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS" ; then
if test -n "$_SYSTEM_SVRCORE"; then
AM_PATH_SVRCORE(4.0.1, [MOZ_NATIVE_SVRCORE=1], [MOZ_NATIVE_SVRCORE=])
- else
- dnl see if we are being built in the same build tree as svrcore
- AM_PATH_INTREE_SVRCORE(../../dist)
- dnl failing that, see if we can find svrcore-config or pkg-config svrcore
if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS"; then
AM_PATH_SVRCORE(4.0.1, [MOZ_NATIVE_SVRCORE=1], [MOZ_NATIVE_SVRCORE=])
fi
@@ -294,9 +240,6 @@ dnl nss requires nspr
_SYSTEM_NSS=no
fi], _SYSTEM_NSS= )
-if test "$_WIN32_MSVC"; then
- _SYSTEM_NSS=
-fi
dnl first, see if user has specified explicit NSPR include and lib paths,
dnl of if the user has explicitly disabled the use of nss
@@ -308,10 +251,6 @@ dnl next, see if user explicitly said to
if test -n "$USE_NSS" -a -z "$NSS_CFLAGS" -a -z "$NSS_LIBS" ; then
dnl nss requires nspr
no_nspr=no
- if test -z "$_SYSTEM_NSS" -o "$_SYSTEM_NSS" = "no" ; then
-dnl see if we are being built in the same build tree as nss
- AM_PATH_INTREE_NSS(../../dist)
- fi
dnl failing that, see if we can find nss-config or pkg-config nss
if test -z "$NSS_CFLAGS" -a "$_SYSTEM_NSS" != "no" ; then
AM_PATH_NSS(3.9.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
@@ -348,10 +287,6 @@ fi
dnl next, look for in-tree nspr if user did not specify explicit system nspr
if test "$no_nspr" = "no" -a -z "$NSPR_CFLAGS" -a -z "$NSPR_LIBS" ; then
- if test -z "$_SYSTEM_NSPR" -o "$_SYSTEM_NSPR" = "no" ; then
-dnl see if we are being built in the same build tree as nspr
- AM_PATH_INTREE_NSPR(../../dist)
- fi
dnl failing that, see if we can find nspr-config or pkg-config nspr
if test -z "$NSPR_CFLAGS" -a "$_SYSTEM_NSPR" != "no" ; then
AM_PATH_NSPR(4.0.0, [MOZ_NATIVE_NSPR=1], [MOZ_NATIVE_NSPR=])
@@ -1520,9 +1455,7 @@ tools are selected during the Xcode/Deve
;;
*-linux*)
- if test -z "$USE_NSPR_THREADS"; then
- USE_PTHREADS=1
- fi
+ USE_PTHREADS=1
AC_DEFINE(XP_UNIX)
AC_DEFINE(_POSIX_SOURCE)
AC_DEFINE(_BSD_SOURCE)

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/mozldap/mozldap-6.0.6-r2.ebuild,v 1.3 2012/07/11 18:16:29 lxnay Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/mozldap/mozldap-6.0.6-r2.ebuild,v 1.4 2013/03/14 17:08:10 lxnay Exp $
EAPI="2"
@ -51,7 +51,6 @@ src_configure() {
src_install () {
# Their build system is royally fucked, as usual
cd "${S}"
sed -e "s,%libdir%,\$\{exec_prefix\}/$(get_libdir)/${PN},g" \
-e "s,%prefix%,/usr,g" \
-e "s,%major%,$(get_major_version ${PV}),g" \

@ -0,0 +1,119 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/mozldap/mozldap-6.0.7.ebuild,v 1.1 2013/03/14 17:08:10 lxnay Exp $
EAPI="5"
WANT_AUTOCONF="2.1"
inherit eutils multilib versionator autotools
DESCRIPTION="Mozilla LDAP C SDK"
HOMEPAGE="http://wiki.mozilla.org/LDAP_C_SDK"
SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v${PV}/src/${P}.tar.gz"
LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="ipv6 debug +sasl"
COMMON_DEPEND=">=dev-libs/nss-3.11.4
>=dev-libs/nspr-4.0.1
>=dev-libs/svrcore-4.0.0
sasl? ( dev-libs/cyrus-sasl )"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
RDEPEND="${COMMON_DEPEND}"
S="${WORKDIR}/${P}/c-sdk"
src_prepare() {
epatch "${FILESDIR}"/${PN}-6.0.4-pkgconfig.patch
epatch "${FILESDIR}"/${P}-configure.in.patch
epatch "${FILESDIR}"/nss-m4.patch
epatch "${FILESDIR}"/nspr-m4.patch
epatch "${FILESDIR}"/${PN}-6.0.6-ldflags.patch
eautoreconf
}
src_configure() {
local myconf="--libdir=/usr/$(get_libdir)/mozldap"
econf $(use_enable debug) \
$(use_enable ipv6) \
$(use_enable amd64 64bit) \
$(use_with sasl) \
--with-svrcore-inc=/usr/include/svrcore \
--with-svrcore-lib=/usr/$(get_libdir)/svrcore \
--enable-clu \
--enable-optimize \
${myconf} || die "econf failed"
}
src_install () {
# Their build system is royally fucked, as usual
sed -e "s,%libdir%,\$\{exec_prefix\}/$(get_libdir)/${PN},g" \
-e "s,%prefix%,/usr,g" \
-e "s,%major%,$(get_major_version ${PV}),g" \
-e "s,%minor%,$(get_version_component_range 2 ${PV}),g" \
-e "s,%submin%,$(get_version_component_range 3 ${PV}),g" \
-e "s,%libsuffix%,$(get_major_version ${PV})$(get_version_component_range 2 ${PV}),g" \
-e "s,%bindir%,\$\{exec_prefix\}/$(get_libdir)/${PN},g" \
-e "s,%exec_prefix%,\$\{prefix\},g" \
-e "s,%includedir%,\$\{exec_prefix\}/include/${PN},g" \
-e "s,%NSPR_VERSION%,$(pkg-config --modversion nspr),g" \
-e "s,%NSS_VERSION%,$(pkg-config --modversion nss),g" \
-e "s,%SVRCORE_VERSION%,$(pkg-config --modversion svrcore),g" \
-e "s,%MOZLDAP_VERSION%,${PV},g" \
"${S}"/"${PN}".pc.in > "${S}"/"${PN}".pc || die "sed in install failed"
emake install || die "make failed"
local MY_S="${WORKDIR}"/"${P}"/mozilla/dist/
rm -rf "${MY_S}/bin/"lib*.so
rm -rf "${MY_S}/public/ldap-private"
exeinto /usr/$(get_libdir)/mozldap
doexe "${MY_S}"/lib/*so*
doexe "${MY_S}"/lib/*.a
doexe "${MY_S}"/bin/*
#create compatibility PATH link
for i in ldapcmp ldapcompare ldapdelete ldapmodify \
ldappasswd ldapsearch;do
dosym /usr/$(get_libdir)/mozldap/$i /usr/bin/moz"${i}" || die
# compat for 389-project
dosym /usr/$(get_libdir)/mozldap/$i /usr/bin/389-"${i}" || die
done
# move the headers around
insinto /usr/include/mozldap
doins "${MY_S}/public/ldap/"*.h
# add sample config
insinto /usr/share/mozldap
doins "${MY_S}"/etc/*.conf
#and while at it move them to files with versions-ending
#and link them back :)
cd "${D}"/usr/$(get_libdir)/mozldap
#create compatibility Link
ln -sf libldap$(get_major_version ${PV})$(get_version_component_range 2 ${PV}).so \
liblber$(get_major_version ${PV})$(get_version_component_range 2 ${PV}).so || die
#so lets move
for file in *.so; do
mv ${file} ${file}.$(get_major_version ${PV}).$(get_version_component_range 2 ${PV}) || die
ln -sf ${file}.$(get_major_version ${PV}).$(get_version_component_range 2 ${PV}) ${file} || die
ln -sf ${file}.$(get_major_version ${PV}).$(get_version_component_range 2 ${PV}) \
${file}.$(get_major_version ${PV}) || die
done
# cope with libraries being in /usr/lib/mozldap
dodir /etc/env.d
echo "LDPATH=/usr/$(get_libdir)/mozldap" > "${D}"/etc/env.d/08mozldap
# create pkg-config file
insinto /usr/$(get_libdir)/pkgconfig/
doins "${S}"/mozldap.pc
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.6.ebuild,v 1.11 2013/03/14 07:49:01 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.6.ebuild,v 1.13 2013/03/14 16:19:49 ago Exp $
EAPI="5"
@ -12,7 +12,7 @@ SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
LICENSE="|| ( LGPL-3 LGPL-2.1 )"
SLOT="0/4" # subslot = libnettle soname version
KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc +gmp static-libs test"
DEPEND="gmp? ( dev-libs/gmp )"

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.14.3.ebuild,v 1.10 2013/02/26 10:17:14 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.14.3.ebuild,v 1.11 2013/03/14 19:48:16 vapier Exp $
EAPI=3
inherit eutils flag-o-matic multilib toolchain-funcs
@ -88,8 +88,9 @@ nssarch() {
}
nssbits() {
local cc="${1}CC" cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
echo > "${T}"/test.c || die
${!1} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
${!cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}"/test.o || die
case $(file "${T}"/test.o) in
*32-bit*x86-64*) echo USE_x32=1;;
*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
@ -107,7 +108,7 @@ src_compile() {
AR="${AR} rc \$@"
RANLIB="${RANLIB}"
OPTIMIZER=
$(nssbits CC)
$(nssbits)
)
# Take care of nspr settings #436216
@ -140,7 +141,7 @@ src_compile() {
XCFLAGS="${BUILD_CFLAGS}" \
emake -j1 -C mozilla/security/coreconf \
CC="${BUILD_CC}" \
$(nssbits BUILD_CC) \
$(nssbits BUILD_) \
|| die
makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/pkcs11-helper/pkcs11-helper-1.10.ebuild,v 1.8 2013/03/14 07:49:26 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/pkcs11-helper/pkcs11-helper-1.10.ebuild,v 1.10 2013/03/14 16:20:14 ago Exp $
EAPI="4"
@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.bz2"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
IUSE="doc gnutls nss static-libs"
RDEPEND=">=dev-libs/openssl-0.9.7

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05.ebuild,v 1.13 2013/03/08 17:48:58 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05.ebuild,v 1.14 2013/03/14 16:14:16 jer Exp $
EAPI="4"
@ -23,7 +23,7 @@ SRC_URI="http://dev.gentoo.org/~maksbotan/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="abyss +cgi +curl +cxx +libxml2 static-libs threads"
REQUIRED_USE="test? ( static-libs abyss curl cxx )"

@ -1,7 +1,6 @@
DIST gcl-2.6.7.tar.gz 8193901 SHA256 2aa134bc03f12ad03f40666ad00db78b8b9c195cf2cf0b3db4d176158f722c06 SHA512 6af54cebae121c482fd465214d3959041df447139eea6a6a3547a6fdddb28ff4c426fbf185f118085a179235e75a790f769bb4da167620c9db87f9b7a8670247 WHIRLPOOL 5470dc588a2cf5638db4c0a25e6a3b237feb7b29937468dc9da2f1e2eb3f7fab44e9708bf303f194b59f603d74806181beced3abbd67c29dd062ab1acbb6c082
DIST gcl-2.6.8_pre20090419.tar.bz2 15688731 SHA256 63cf13ca6a9f1d2b1167385f50665d550e0f63dce5a99bb7a88191ae480e8b5b SHA512 bbe2f4ab1d5eb39003f5fd6d85cfdd35585b6c53cd90c212ff7c27d5b90ccfe72f1606aadb532195b6395f467b2b6cd92e96748c6dc407ce3af79453210f7780 WHIRLPOOL 86850eb1561cb44f4024e53faa35cfa59372addf415b1fbca1952d1a08730e50bf574fd0ecdfaac963c8fa0d8430e5929352370378ce527d5ec651c6e2ff64d0
DIST gcl-2.6.8_pre20111221.tar.bz2 4344690 SHA256 abd7099bc41f1a71106b56855315524ef68914909384370c71f65c929b4df5ed SHA512 4c22cbb1cd472cefe000e16768536c9a11df9e6f5debff3596446aef095a94a920f62c8370454f3bc657c2594d3b7759f3fe035b9103af96b390ef551948d340 WHIRLPOOL 74721587ab374594eea34c375ecaa6254a59a3f41fecaf205d0b06f3818e597205412b5b31e640732092e0675a5873900b61f9db22f83b4d58a8142b49a4871b
DIST gcl-2.6.8_pre20120805.tar.bz2 4350186 SHA256 61115c9e0bcda847b1ca58b9bcef629c6c1c55513c14b90b35b06b7ef7ef1a2f SHA512 5dc6c0083f9995f5387800fdeccfeb144b6887512bcc4b68e688d651182d811a2223f835b05b03dd1314886652d1d1adf76c87cdbdc5172b92cf8a4fc587044e WHIRLPOOL 01de8aad62d60de1ffd7b4ddb2d9c000d4d10cb4a58ea1659fa52f5b907e2a851b135005fc6b48fdf2f1a83a179d1e0f18158a1532dd48a0417bbc11968d3d63
DIST gcl-2.6.8_pre20130314.tar.bz2 4428151 SHA256 1aa08fe2d1aad5313daa8895f0986e5e19ddef58a865470b1d9fb6449caa6adf SHA512 909a9b0b73230c67ac06953162daa72b4cae8903e5adcc3c6863ff2306f89ad35d74ac645fdc0515eace53b9b6a635bbfc6b37cb4b8eac656fed5465247b3641 WHIRLPOOL 5d16c165f598c8aadc8659e9324c1d6bd60ba5eef56f7d9ff35c137a0d07ac6b0d813d664622b765ecae506ff52f9267237f6602c9ba83ead78ef7ec5e5f8df7
DIST gcl.info.tgz 678468 SHA256 06e60fcc99b09ffb66364569d0331b1f2549804d5d09582c6e18fd27f29bcb57 SHA512 ebeb293f12db145e9a3a0802946314cd3e3bdeaefb53ca66ee69423417f7a93e3a84571d9f6c65f019ce09c93559d229da642feb722d193952f462402973bab8 WHIRLPOOL dd1ed04c312a995a6818d934220e025c80a12c05c01b8f2124d809157f0bd9d52db145021602736e4cdd3dde623098ef28b7eda5b9912819514397d5dd71a649
DIST gcl_2.6.7-32.diff.gz 14463119 SHA256 5041b40bd96a0c73b70022831e6a697e00b64f572bca66d5a6c24978a879678e SHA512 aad44b6ee51a2598e86538905f3c00d253fbbf7c8f51452f2ece4ba060712f622a76814a2434e39d1585b5ea4b032a32c0601572dc737cd9b5852658897c2b6d WHIRLPOOL 6548733a982f2df96233e1542364902e4bdd739dba73d970bf70e9c9c78b3839cc9d83ede6653d5e686d421d80acf96e2e597a6790b95d2f2ae2b4818cf3bc1e
DIST gcl_2.6.7-34.diff.gz 14493530 SHA256 f8b57b98348e8c8f303756dea1e02fd9ff6aa2d4308e4e7189ab6fab5f216e65 SHA512 5e96c9498c532cd095ae320db06f5accb1173dd4bade552e1a1b9eecf2f4848bf7064a3b7a77019eefc5cb58ea42082a5c8da2fad0eb8b150567b233fc4d2305 WHIRLPOOL 694860592a6504e4ed40e0f32a67d5d9cb0128a391ff3440b1196ff21a685faff5b55298168ac42089abf4f83f0fa4d950d98e984aa57a9795b171fac59061fa

@ -1,139 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.8_pre20090419.ebuild,v 1.3 2012/06/07 18:59:25 zmedico Exp $
EAPI=1
#removing flag-o-matic results in make install failing due to a segfault
inherit elisp-common eutils flag-o-matic
DESCRIPTION="GNU Common Lisp"
HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc x86"
IUSE="+ansi debug doc emacs +readline tk X"
# See bug #205803
RESTRICT="strip"
RDEPEND="emacs? ( virtual/emacs )
readline? ( sys-libs/readline )
>=dev-libs/gmp-4.1
tk? ( dev-lang/tk )
X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw )
virtual/latex-base"
DEPEND="${RDEPEND}
doc? ( virtual/texi2dvi )
>=app-text/texi2html-1.64
>=sys-devel/autoconf-2.52"
src_unpack() {
unpack ${A}
cd "${S}"
# The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in
# option parsing, it may break.
epatch "${FILESDIR}"/${P}-configure.patch
}
src_compile() {
local myconfig=""
if use tk; then
myconfig="${myconfig} --enable-tkconfig=/usr/lib --enable-tclconfig=/usr/lib"
fi
myconfig="${myconfig} \
--enable-emacsdir=/usr/share/emacs/site-lisp/gcl \
--enable-dynsysgmp \
--disable-xdr
$(use_enable readline) \
$(use_with X x) \
$(use_enable debug) \
$(use_enable ansi)"
einfo "Configuring with the following:
${myconfig}"
econf ${myconfig}
make || die "make failed"
sed -e 's,@EXT@,,g' debian/in.gcl.1 >gcl.1
}
src_test() {
local make_ansi_tests_clean="rm -f test.out *.fasl *.o \
*.so *~ *.fn *.x86f *.fasl *.ufsl"
if use ansi; then
cd ansi-tests
( make clean && make test-unixport ) \
|| die "make ansi-tests failed!"
cat "${FILESDIR}/bootstrap-gcl" \
| ../unixport/saved_ansi_gcl
cat "${FILESDIR}/bootstrap-gcl" \
|sed s/bootstrapped_ansi_gcl/bootstrapped_r_ansi_gcl/g \
| ./bootstrapped_ansi_gcl
( ${make_ansi_tests_clean} && \
echo "(load \"gclload.lsp\")" \
| ./bootstrapped_r_ansi_gcl ) \
|| die "Phase 2, bootstraped compiler failed in tests"
else
ewarn "Upstream provides tests only for ansi-gcl."
ewarn "Please emerge with ansi USE flag enabled"
ewarn "if you wnat to run the ansi tests."
cat "${FILESDIR}/bootstrap-gcl" \
| sed s/bootstrapped_ansi_gcl/bootstrapped_gcl/g \
| unixport/saved_gcl
cat "${FILESDIR}/bootstrap-gcl" \
| sed s/bootstrapped_ansi_gcl/bootstrapped_r_gcl/g \
| ./bootstrapped_gcl
for x in "./bootstrapped_r_gcl" "unixport/saved_gcl" ; do
echo "(compiler::emit-fn t)" \
| ${x} \
|| die "Phase 2, bootstraped compiler failed in tests"
done
fi
}
src_install() {
make DESTDIR="${D}" install || die "make install failed"
rm -rf "${D}"usr/share/doc/${PN}-si "${D}"usr/share/doc/${PN}-tk
dosed /usr/bin/gcl
fperms 0755 /usr/bin/gcl
dodoc readme* RELEASE* ChangeLog* doc/*
doman gcl.1
doinfo info/*.info*
if use emacs; then
mv "${D}"usr/share/emacs/site-lisp/${PN}/add-default.el "${T}"/50${PN}-gentoo.el
elisp-site-file-install "${T}"/50${PN}-gentoo.el
elisp-install ${PN} elisp/*
fperms 0644 /usr/share/emacs/site-lisp/gcl/*
else
rm -rf "${D}"usr/share/emacs
fi
if use doc; then
mv "${D}"usr/share/doc/*.dvi "${D}"usr/share/doc/dwdoc* "${D}"usr/share/doc/${PF}/
else
rm -rf "${D}"usr/share/doc/*.dvi "${D}"usr/share/doc/dwdoc*
fi
}
pkg_postinst() {
use emacs && elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
}

@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.8_pre20111221.ebuild,v 1.2 2012/06/07 18:59:25 zmedico Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.8_pre20130314.ebuild,v 1.1 2013/03/14 12:06:29 grozin Exp $
EAPI=3
EAPI=5
#removing flag-o-matic results in make install failing due to a segfault
inherit elisp-common eutils flag-o-matic
@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~grozin/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86"
KEYWORDS="~amd64 ~x86"
IUSE="+ansi debug doc emacs +readline tk X"
# See bug #205803
@ -30,10 +30,6 @@ DEPEND="${RDEPEND}
>=app-text/texi2html-1.64
>=sys-devel/autoconf-2.52"
src_prepare() {
epatch "${FILESDIR}"/${PN}-default-el.patch
}
src_configure() {
local myconfig=""
if use tk; then
@ -105,7 +101,6 @@ src_install() {
make DESTDIR="${D}" install || die "make install failed"
rm -rf "${D}"usr/share/doc/${PN}-si "${D}"usr/share/doc/${PN}-tk
dosed /usr/bin/gcl
fperms 0755 /usr/bin/gcl
dodoc readme* RELEASE* ChangeLog* doc/*

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Socket-SSL/IO-Socket-SSL-1.840.0.ebuild,v 1.1 2013/02/19 16:30:47 tove Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Socket-SSL/IO-Socket-SSL-1.840.0.ebuild,v 1.6 2013/03/14 16:19:22 ago Exp $
EAPI=5
@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="idn"
DEPEND="

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-SSLeay/Net-SSLeay-1.520.0.ebuild,v 1.2 2013/02/19 04:59:09 zmedico Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-SSLeay/Net-SSLeay-1.520.0.ebuild,v 1.7 2013/03/14 16:19:01 ago Exp $
EAPI=5
@ -12,7 +12,7 @@ DESCRIPTION="Net::SSLeay module for perl"
LICENSE="SSLeay"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="dev-libs/openssl"

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Search-Xapian/Search-Xapian-1.2.13.0.ebuild,v 1.4 2013/03/12 18:28:27 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Search-Xapian/Search-Xapian-1.2.13.0.ebuild,v 1.5 2013/03/14 15:13:52 ago Exp $
EAPI="4"
@ -14,7 +14,7 @@ DESCRIPTION="Perl XS frontend to the Xapian C++ search library."
LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
SLOT="0"
KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 x86"
KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86"
IUSE="examples"
RDEPEND=">=dev-libs/xapian-1.2.9

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/adodb-5.17-r1.ebuild,v 1.5 2013/03/14 07:46:13 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/adodb-5.17-r1.ebuild,v 1.8 2013/03/14 13:22:45 ago Exp $
EAPI=4
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/adodb/${PN}${MY_PV}.zip"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc ~x86"
KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
IUSE=""
DEPEND="app-arch/unzip"

@ -0,0 +1 @@
DIST amqp-1.0.9.tgz 40693 SHA256 82d3dd875261ae0a983c8a24092cc14aebb291b584a7f0ad233df920e2cb4f0f SHA512 52db33f4e938d056b1e3c19973a05276d5dbf4c50decbf248783277b1478a99c855698810b9de5ae0b69aafc05899f3e212613ef817ad2ae046d0f156ba3e4c2 WHIRLPOOL f1dcf9ed0006a2a88edec8a82d4823051fc6de041d9951363b4d5a7133d5470de846827e241aa1974b9a33986359c58244a4a6f076f14bcf63aed9be31c572e6

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>php</herd>
<longdescription lang="en">
</longdescription>
</pkgmetadata>

@ -0,0 +1,19 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-amqp/pecl-amqp-1.0.9.ebuild,v 1.1 2013/03/14 18:52:16 olemarkus Exp $
EAPI=4
USE_PHP="php5-3 php5-4"
inherit php-ext-pecl-r2
KEYWORDS="~amd64 ~x86"
DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers."
LICENSE="PHP-3.01"
SLOT="0"
IUSE=""
DEPEND="net-libs/rabbitmq-c"
RDEPEND="${DEPEND}"

@ -5,3 +5,4 @@ DIST logilab-astng-0.22.0.tar.gz 101227 SHA256 af36daf5e7f3acdbc1aff58d5400c3402
DIST logilab-astng-0.23.1.tar.gz 103664 SHA256 99788c4495056c3ea54d24892afc69e4d1ccba1f4018e89a3f9b806cb6bb0028 SHA512 4acbeab92c514470345b00ac8edd8dc4ae149fd06632f9fae287fc63acdd72688c3c4b781c0f51a330a9b9e20c47717e5ab7f2b5139b5f4636c8d9dd911ca221 WHIRLPOOL 982124f212afd1e5f405157750664b4fe99a0e1b171b087105440b93534574eb112185fc0234bc538dfb7a955080b2491cd65b2f28142407eeb3fcf8ddb4079d
DIST logilab-astng-0.24.0.tar.gz 104818 SHA256 7efb907c8917f9291cdc3848a031bdd1969043f9bbe7e10665c03fa5041b3a03 SHA512 caa840b346308cdc2f8a7fce3bfbbb7007ffd92b3321d540229d35bf2b7219063647f0eb6368446360350463d24ee429cc5a554163513c024fe86524a6704aba WHIRLPOOL 0d95faca4551e86618ab14fc548fd0dbdb744c639260871b3ccb8262eee06f716d824dbacb34bed6c54e9d5fd3bbb7e9b038a5fc845f25c60b795a8b2aa94150
DIST logilab-astng-0.24.1.tar.gz 106826 SHA256 1ca0249f4d5459e61951370376e0a3892f4346713b10090d29df9a7be71e5721 SHA512 c05317f3febb943bc4a0865b520a1e70ddf584fd838931e43a7910a25d7c2c68a952ed3a9a6d58ad4a5334bb02c9e9259877842d2cc332abe69f62c88a61f300 WHIRLPOOL e434774ebd4905d170993bef2909a8e1a7244f8a23eea4314c5283294a0659e85c7799a027e5b82e9e63fea166333a1e2845f4d15e1021bdfd1023df0d50d436
DIST logilab-astng-0.24.2.tar.gz 104617 SHA256 0fe39057ce6e98426f62d22e013ad50305f2dea3fd1282ae4245f898f052d981 SHA512 a13d9686d2a481b6e4f666cd115635c232524da6a56f1c8629384caaf2f41cc5b0224c6f40f6aaaf3d492f3dddd891a4007c16b81abd6f13f34867f8f04734a1 WHIRLPOOL 582b35b5e6d5aaa95acd347a28d410af0a76610f760b2fe9d0775b5e717c1b24402b649db51cf259f102bebe5962ac967bdeee41457b1c9844b5efa722691d64

@ -0,0 +1,43 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/astng-0.24.2.ebuild,v 1.1 2013/03/14 16:34:13 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy{1_9,2_0} )
inherit distutils-r1
DESCRIPTION="Abstract Syntax Tree for logilab packages"
HOMEPAGE="http://www.logilab.org/project/logilab-astng http://pypi.python.org/pypi/logilab-astng"
SRC_URI="ftp://ftp.logilab.org/pub/astng/logilab-${P}.tar.gz mirror://pypi/l/logilab-astng/logilab-${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
IUSE="test"
# Version specified in __pkginfo__.py.
RDEPEND=">=dev-python/logilab-common-0.53.0[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? ( >=dev-python/egenix-mx-base-3.0.0[$(python_gen_usedep python2*)] )"
S="${WORKDIR}/logilab-${P}"
python_test() {
# Make sure that the tests use correct modules & paths, for now at least
# python3 currently doesn't pass all tests on std testing
cd "${BUILD_DIR}"/lib || die
[[ "${EPYTHON:6:1}" == '3' ]] && return
pushd logilab/astng > /dev/null || return 1
pytest $(find . -name test) || die "Tests fail with ${EPYTHON}"
popd > /dev/null || return 1
}
python_install() {
distutils-r1_python_install
rm "${D}$(python_get_sitedir)/logilab/__init__.py" || die
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-1.1.1-r1.ebuild,v 1.3 2013/02/20 09:05:18 ssuominen Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-1.1.1-r1.ebuild,v 1.5 2013/03/15 11:56:14 ago Exp $
EAPI=5
@ -14,7 +14,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="doc examples test"
# API docs generated with epydoc, which is python2-only
REQUIRED_USE="doc? ( || ( python_targets_python2_6 python_targets_python2_7 ) )"

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild,v 1.3 2013/01/16 02:42:49 idella4 Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild,v 1.4 2013/03/15 09:33:33 patrick Exp $
EAPI=5
@ -22,7 +22,8 @@ IUSE="test"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-python/django"
dev-python/django
test? ( dev-python/nose )"
S=${WORKDIR}/${MY_P}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/epydoc-3.0.1-r2.ebuild,v 1.2 2012/12/17 19:55:55 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/epydoc-3.0.1-r2.ebuild,v 1.7 2013/03/14 16:17:29 ago Exp $
EAPI=5
PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc latex tk"
DEPEND=""

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/paste/paste-1.7.5.1-r1.ebuild,v 1.1 2013/02/12 23:37:32 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/paste/paste-1.7.5.1-r1.ebuild,v 1.2 2013/03/15 04:12:07 patrick Exp $
EAPI=5
@ -48,7 +48,7 @@ python_prepare_all() {
}
python_compile_all() {
"${PYTHON}" setup.py build_sphinx || die
"${PYTHON}" setup.py build || die
}
python_test() {

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.2.2-r1.ebuild,v 1.1 2012/12/16 20:57:36 tetromino Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.2.2-r1.ebuild,v 1.3 2013/03/15 11:56:44 ago Exp $
EAPI="5"
GCONF_DEBUG="no"
@ -14,7 +14,7 @@ HOMEPAGE="http://www.pygtk.org/"
LICENSE="LGPL-2.1+"
SLOT="3"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cairo examples test +threads"
REQUIRED_USE="test? ( cairo )"

@ -0,0 +1,56 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.1.1-r1.ebuild,v 1.1 2013/03/14 19:25:55 radhermit Exp $
EAPI=5
PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
PYTHON_REQ_USE="ncurses"
inherit distutils-r1
DESCRIPTION="Urwid is a curses-based user interface library for Python"
HOMEPAGE="http://excess.org/urwid/ http://pypi.python.org/pypi/urwid"
SRC_URI="http://excess.org/urwid/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="doc examples test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? ( dev-python/twisted )"
PATCHES=( "${FILESDIR}"/${PN}-1.1.0-sphinx.patch )
python_compile_all() {
if use doc ; then
if [[ ${EPYTHON} == python3* ]] ; then
2to3 -nw --no-diffs docs/conf.py || die
fi
cd docs
sphinx-build . _build/html || die
fi
}
python_compile() {
if [[ ${EPYTHON} == python2* ]] ; then
local CFLAGS="${CFLAGS} -fno-strict-aliasing"
export CFLAGS
fi
distutils-r1_python_compile
}
python_test() {
esetup.py test
}
python_install_all() {
use doc && dohtml -r docs/_build/html/*
if use examples ; then
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
}

@ -0,0 +1,28 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/yolk/yolk-0.4.3-r1.ebuild,v 1.1 2013/03/14 17:04:09 idella4 Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
inherit distutils-r1
DESCRIPTION="Tool and library for querying PyPI and locally installed Python packages"
HOMEPAGE="http://pypi.python.org/pypi/yolk"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="examples"
DEPEND="dev-python/setuptools
dev-python/yolk-portage"
RDEPEND="${DEPEND}"
python_install_all() {
if use examples; then
docinto examples/plugins
dodoc -r examples/plugins/*
fi
}

@ -1,2 +1,3 @@
DIST mail-2.3.3-git.tar.gz 668618 SHA256 1adb276d2de312bd95fbe5552b9df2c3b802eedbdaaf25dbbbcd4cf45b5951e0 SHA512 b6478f9b63fe6855ff857443aab718ff9a66b6b603aa203f6cf6cc2a32ccd3c3b52d0ce8697c84285a209fd2cf30c31e12addffe1b7eb5326c806553817f0523 WHIRLPOOL 7a8f020c89d38343ce6305a6f926f709298093198a285dd5d7ae1d9f7bd728e19c3119abc293ede81aee63dde254cfa387972cffdc5df48c887fe7102a0585e1
DIST mail-2.4.4.tar.gz 677102 SHA256 2195c789c5178388f3ed5094ddad93683bac601fe3d9ecb13a3a9f9e7d97ba87 SHA512 aeb0075950d5938e1a972c9195ec836160c6c9f600aaa2c0e78c715aabf4000074bde311cc0c87a1f3edf237e5a6835299c23f3b903541a043134139472eae82 WHIRLPOOL e75e9e62602ca13658e16d096cc48921307c9035e1b42700eaee77d38c4f10891731d34e0984c8eb98d2d30320ac87fb64b5cf03bc1c88eeb11be5d172a594d8
DIST mail-2.5.3-git.tar.gz 828104 SHA256 6608c1c5dd9fc58f8a167c834d14d272dfb721eac7356983cb9f64ce934048ab SHA512 210e8eb7c10b8636747980fbaef09a444a80fdba38fced326e6f9fcab6dc41e99a685c3a1472f887f22d875f4a5691364246e4975efe2a608cec657e3ad67bcf WHIRLPOOL 38ebe1ed453c2e01d22e170bf24f527aab65ef6a65c74448e6d9888d0b49a10bde406a1f9824806b42569c118b9efcc1f1a2ab598c4517f665ca21fb40de725f

@ -0,0 +1,21 @@
commit 819c4767cea5c8523938b27a29e48a7ab82b503d
Author: kennyj <kennyj@gmail.com>
Date: Fri Nov 30 00:22:08 2012 +0900
Fix build on Ruby18. We should specify endian for UTF16/32.
diff --git a/lib/mail/version_specific/ruby_1_8.rb b/lib/mail/version_specific/ruby_1_8.rb
index cb2bae6..f7c65bb 100644
--- a/lib/mail/version_specific/ruby_1_8.rb
+++ b/lib/mail/version_specific/ruby_1_8.rb
@@ -107,6 +107,10 @@ module Mail
case encoding.upcase
when 'UTF8'
'UTF-8'
+ when 'UTF16', 'UTF-16'
+ 'UTF-16BE'
+ when 'UTF32', 'UTF-32'
+ 'UTF-32BE'
else
encoding
end

@ -0,0 +1,42 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mail/mail-2.5.3.ebuild,v 1.1 2013/03/15 07:01:02 graaff Exp $
EAPI=5
USE_RUBY="ruby18 ruby19 ree18"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md ROADMAP TODO.rdoc"
RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
inherit ruby-fakegem versionator
GITHUB_USER="mikel"
COMMIT="e8ec8d53c4f5c889691630d0422b9dc044762f1b"
DESCRIPTION="An email handling library"
HOMEPAGE="https://github.com/mikel/mail"
SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git.tar.gz"
LICENSE="MIT"
SLOT="$(get_version_component_range 1-2)"
KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RUBY_PATCHES=( "${P}-utf8-ruby18.patch" )
ruby_add_rdepend "
>=dev-ruby/i18n-0.4.0
>=dev-ruby/mime-types-1.16
>=dev-ruby/treetop-1.4.8"
all_ruby_prepare() {
rm Gemfile || die
sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
# Fix up dependencies to match our own.
sed -i -e 's/~>/>=/' mail.gemspec || die "Unable to fix up dependencies."
}

@ -1,3 +1,2 @@
DIST hevea-2.00.tar.gz 411092 SHA256 bb32c6207a33685eca37330794649c654837f8d795010e7b1385619320833cbf SHA512 d24e35deafbb04b3a6f7248950a02d1dbb2d92fc7e8b7b69f4395e0265af0a09832163043108fc28c5ea166eacae42544128ef9395c300b5d3273861a386800f WHIRLPOOL b1e31d41e56ba4049a79c7e639c058a52d8ac1a2261d8547668adff3ba04aa86545b81323d7a88f96c9b7778ff4338daff3f3ab3e068675030dfdacfb8d62ed4
DIST hevea-2.02.tar.gz 410332 SHA256 406683222913713ed3b81c153d1a84c0347f6e49181bb178636877c4f410fd6c SHA512 2e68a6f6aa046839e63fb64cfd8adbb14f4f6642c16af72f104a2f8048310951bf9e66295b3ad6cedd4eafd20db7183ebecb27859ab0de8d8863e60aa5e26d78 WHIRLPOOL 9bdd2c03fab710ddb73b4083ff0dd6b279d7348b433b5475d4e9f0fdf5419dd864b127bcc93d11a2c59e75a669fdb5863fae080eff537808fc827c05247880ab
DIST hevea-2.03.tar.gz 385865 SHA256 d927f538b47935f8b6cf34a817071195dfeb5da05debfd55ab47253c7868dab5 SHA512 dcb30992ff74935d92e6fdc4710bf8ee3b555e094673557e697531c3bff7155d6577349e2d80de21180abe5ea8d0ac1b4eaffcf217736477a33d8895ebd1aacc WHIRLPOOL 9d5c7a8cfb3f2fcffb90c09c0bfb43d50c0a7cd4cad8073de2b9640365e16613b202c76e8b35993f1a5dcecd7a215091597587a854fc8a8ff742ad0e04656e8e

@ -1,57 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-tex/hevea/hevea-2.00.ebuild,v 1.5 2012/12/29 14:35:15 ago Exp $
EAPI="2"
inherit eutils multilib
IUSE="+ocamlopt"
DESCRIPTION="HeVeA is a quite complete and fast LaTeX to HTML translator"
HOMEPAGE="http://hevea.inria.fr/"
SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
LICENSE="QPL"
SLOT="0"
KEYWORDS="amd64 ppc ~ppc64 sparc x86"
DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]"
RDEPEND="${DEPEND}"
src_compile() {
rm -f config.sh
emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh || die "Failed to create config.sh"
if use ocamlopt; then
emake PREFIX=/usr || die "Failed to build native code binaries"
else
emake PREFIX=/usr TARGET=byte || die "Failed to build bytecode binaries"
fi
}
src_install() {
if use ocamlopt; then
emake DESTDIR="${D}" PREFIX=/usr install || die "Install failed"
else
emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install || die "Install failed"
fi
dodoc README CHANGES
}
# If texmf-update is present this means we have a latex install; update it so
# that hevea.sty can be found
# Do not (r)depend on latex though because hevea does not need it itself
# If latex is installed later, it will see hevea.sty
pkg_postinst() {
if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
/usr/sbin/texmf-update
fi
}
pkg_postrm() {
if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
/usr/sbin/texmf-update
fi
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-tex/hevea/hevea-2.02.ebuild,v 1.5 2013/03/12 18:31:55 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-tex/hevea/hevea-2.02.ebuild,v 1.6 2013/03/14 12:45:29 ago Exp $
EAPI=5
@ -14,7 +14,7 @@ SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
LICENSE="QPL"
SLOT="0"
KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
KEYWORDS="amd64 ppc ~ppc64 sparc x86"
DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
RDEPEND="${DEPEND}"

@ -1,3 +1,4 @@
DIST cloc-1.55.pl 309536 SHA256 8dd6893c450f3be6a461ef2068cd853181eb21015b3cfa92c360dc2b4b897479 SHA512 05c84c730c1222fd544debeef985f0b7bf370a3d0c62766c3b606c27f8320bb6429700e5e51a92770249876b263447213e1eb956957255a0ab4863ef57ec5c6d WHIRLPOOL f022749f511ea71f4432b0b03b7889e06b48ac1259fd7a309afbca5ab6f27079c3f78bc0e079b800f09c4b60de6d6b69876dc6d23e3162e62ea39fcbddb37d6c
DIST cloc-1.56.pl 320786 SHA256 f525906def12195df1ed61a6aa0584c401b10509c7770900b31026c91868acd2 SHA512 6bbd74c79bc6c905bc20be1d5d4b75efdb01d5b395e5f163e0ea1358b5da2b41ae7c7f27fc0487a37c3144fd3ac81d7242e31245994e257bd09e313837f50979 WHIRLPOOL 57ae1f883446668da9d0c42ba590c42482cdc04067c4a2e6fdb4c9815121e7e0c78b41b8bdf4a00e5b51127e7818f0ff80767fbc52b3713ec60e3d087f20ab68
DIST cloc-1.58.pl 336446 SHA256 4a484496ee05be4e5b3a6bef8f3337d7f6733c731bbc58dc7d00f5c3eb714f68 SHA512 5f189545e97d132888948a8a7f60dc551e4a0700af4a37c949f5311da326d9ada6780f2faee7fbb4b02545f9fa3afe2caf01c7bf3a8eedbde0155ab797b29f55 WHIRLPOOL b74cfc99159101cd465a9721893719e81f7caa2156848b52ad3e0b2f6879ff1b8711a9f904a64690d29ffe813cfb45b059f9ecfa3628a62da310d7239af4d321
DIST cloc.1.pod 12468 SHA256 0e6890acd5836ec43aabed1476e2a1417ea4d454968297c68c1b782e818f979b SHA512 50b4085704c7936de9993476195570957c9c5e864f4a2dbac114ff148a813b50ccba0c6e29d5bda4c4e5cd7c7a09e314233438ddd28f0e0585db54975e602659 WHIRLPOOL 25d9b78a7a0fb88f2ff1192afd8cd5963ab61b06883874b8339a1d4fefbeac4b080d413107f06b34975cd2e7ea92e4313767f2c2aebf39e21ef7cd408bf152ae

@ -0,0 +1,35 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/cloc/cloc-1.58.ebuild,v 1.1 2013/03/15 03:44:04 radhermit Exp $
EAPI=5
DESCRIPTION="Count Lines of Code"
HOMEPAGE="http://cloc.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.pl mirror://sourceforge/${PN}/${PN}.1.pod"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
DEPEND=">=dev-lang/perl-5.6"
RDEPEND="${DEPEND}
dev-perl/Algorithm-Diff
dev-perl/regexp-common
virtual/perl-Digest-MD5
virtual/perl-Getopt-Long
virtual/perl-File-Spec
virtual/perl-File-Temp"
S=${WORKDIR}
src_unpack() { :; }
src_prepare() {
pod2man "${DISTDIR}"/${PN}.1.pod > ${PN}.1 || die
}
src_install() {
doman ${PN}.1
newbin "${DISTDIR}"/${P}.pl ${PN}
}

@ -1,2 +1,2 @@
DIST mdds_0.6.1.tar.bz2 128115 SHA256 4381b38db6ee807090c6f352d62575ea8ce9768701ad95f01afbcda497e69960 SHA512 9b53ddfe5330f276a3e3d9febf6e6749957915f2997cd81059f060221f2dcb6ba53576f9b3b01d10289143e98a0f80bcee29654bebc3c96ddf9b0a32c411dfd2 WHIRLPOOL 51b60a028b1f75f9167903aa0395876e7a8c7c96d21d619aca280ac485197b387dca55f55c61c98f7203b16ad1989c6d2c4eab8f8eb113cbec8af929ddafbb63
DIST mdds_0.7.0.tar.bz2 137114 SHA256 092b8ab9cdd4738f46f3a34fb6ecf44a81049910e545eabe031bd0e1b7261c88 SHA512 de971443715cb70b4951473f713e78ad9f8d2518e24f0e38c67361a4802230ea3d7281597d8aa1e104da2dd2ad064686254b469847141761025c54a2fe89bc2a WHIRLPOOL 304e07067d4fd3da1ec4ec11f7de80a845e6814c68669376b9d3e09a886b16d84745438c20bc016318d51944d6a4003b22809c7c4d44aab900a09bae2b06efbb
DIST mdds_0.7.1.tar.bz2 134376 SHA256 fe7bc2805bb1b74cac821723fd1d50bcc2a0ecaa5445262262765e02eae9197e SHA512 0a501af19280b34f038e31e5a6a0625631a95328cba7a2e2e4c308eb0ea2ead6c0aa4db90bc65897ae1319df89ede124931b4ab7902368ed2ca9d1fff4c883ef WHIRLPOOL a24ed89d6b30812885f2359d240b09074949021e060a7ca8cbf55286b9fd4b387f4b0078282b0430f53998c43ffade261b26472c22af12b806a5edb1bfcd4c85

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/mdds/mdds-0.7.0.ebuild,v 1.3 2013/03/07 08:18:17 scarabeus Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-util/mdds/mdds-0.7.1.ebuild,v 1.1 2013/03/14 20:02:11 scarabeus Exp $
EAPI=5

@ -0,0 +1 @@
DIST umockdev-0.2.1.tar.xz 363652 SHA256 38972c7b8f2bf8acc28f13a6ed99d56557204600400288acdda69b05b25573a4 SHA512 a65e5dc6cc8d7fe0948f07e34379050a0b3640523f7f60393d81a2e1615bb4029a3c107f29b26425df59c5e34e9f69a5f3bf2683608e787b5e9b1ae70807dbb5 WHIRLPOOL 23a195bbf54dd3a4978718b817be6938c371793d779bace18c01b855bf7d63a78a19682cdf82156d0a973d589e3d52fd5a828ac92ee396f02d24f63385af5df5

@ -0,0 +1,38 @@
--- umockdev-0.2.1/Makefile.am
+++ umockdev-0.2.1/Makefile.am
@@ -41,21 +41,7 @@
# use this for running Python tests
PYTEST = $(TESTS_ENVIRONMENT) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning
-AM_CFLAGS = \
- -Werror=missing-prototypes \
- -Werror=strict-prototypes \
- -Werror=nested-externs \
- -Werror=pointer-arith \
- -Werror=implicit-function-declaration \
- -Werror=pointer-arith \
- -Werror=init-self \
- -Werror=format-security \
- -Werror=format=2 \
- -Werror=missing-include-dirs \
- -Werror=unused-variable \
- -Werror=return-type \
- -Werror=uninitialized \
- -Wall
+AM_CFLAGS = -Wall
# this allows us to use regexp literals without warnings
AM_VALAFLAGS = --enable-experimental
@@ -82,9 +68,9 @@
# this is an LD_PRELOAD library, so remove static library and libtool wrappers
libumockdev-preload-install-hook:
- rm $(DESTDIR)$(libdir)/libumockdev-preload.a
- rm $(DESTDIR)$(libdir)/libumockdev-preload.so
- rm $(DESTDIR)$(libdir)/libumockdev-preload.la
+ rm -f $(DESTDIR)$(libdir)/libumockdev-preload.a
+ rm -f $(DESTDIR)$(libdir)/libumockdev-preload.so
+ rm -f $(DESTDIR)$(libdir)/libumockdev-preload.la
libumockdev-preload-uninstall-hook:
rm $(DESTDIR)$(libdir)/libumockdev-preload.so.*

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save