merged xen & php

app-office/scribus/Manifest

@@ -0,0 +1,3 @@
+AUX scribus-1.3.5-fpic.patch 564 RMD160 71c853ad74a72c5b7914373b60a52b9e679e15d9 SHA1 ed3dfb044be9c69343aedc5b6edeee43291cc894 SHA256 01ec36689647ddfdeade2f476fde0b3c54fed0bf33954d2e4c568f8277b2d4a1
+DIST scribus-1.3.5.1.tar.bz2 23680739 RMD160 8b8a73909b3c482de2a77cd344e91a8aedbf2611 SHA1 d138e47e2177974d18c2f7c87a1db9e462bf6287 SHA256 2e40fdf19aec6e4cfa7923bcf1214a8ab76e298c2a8401553fe808ee1b29006c
+EBUILD scribus-1.3.5.1-r3.ebuild 1954 RMD160 84e725fe1faca04fb64d5e53b8cddbc62a8ed6d0 SHA1 4201e70cd83a4912c06d604e671dab3cbcebc9e0 SHA256 4e45a185fbdc4db2992a6ab6416355ac7bd98ac935620e8caab71679f4184e55

app-office/scribus/files/scribus-1.3.5-fpic.patch

@@ -0,0 +1,11 @@
+--- scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt.old	2009-04-23 02:29:46.920745916 -0700
++++ scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt	2009-04-23 02:31:52.794615295 -0700
+@@ -15,6 +15,7 @@
+ #CB SET(CMAKE_CXX_FLAGS "-Wall")
+ #CB SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM}")
+ # We need to pass -fPIC only to lib2geom on amd64 - avoid it elsewhere see: http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3
++SET(CMAKE_CXX_FLAGS "-fPIC")
+ 
+ OPTION(2GEOM_BUILD_SHARED
+   "Build lib2geom and libtoy as shared libraries."
+

app-office/scribus/scribus-1.3.5.1-r3.ebuild

@@ -0,0 +1,80 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+inherit qt4 cmake-utils eutils
+
+DESCRIPTION="Desktop Publishing (DTP) and Layout program for Linux."
+HOMEPAGE="http://www.scribus.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+IUSE="cairo cups debug spell +fontconfig xml gs python +imaging debug +podofo "
+
+DEPEND="dev-libs/boost
+	>=media-libs/freetype-2.3.7
+	media-libs/jpeg
+	>=media-libs/lcms-1.15
+	media-libs/libpng
+	>=media-libs/tiff-3.6
+	sys-libs/zlib
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-sql:4
+	x11-libs/qt-xmlpatterns:4
+	dev-util/pkgconfig
+	cairo? ( >=x11-libs/cairo-1.4.10[X,svg] )
+	cups? ( net-print/cups )
+	spell? ( app-text/aspell )
+	fontconfig? ( >=media-libs/fontconfig-2.0 )
+	xml? ( >=dev-libs/libxml2-2.6.0 )
+	gs? ( virtual/ghostscript )
+	python? ( >=dev-lang/python-2.3 )
+	imaging? ( dev-python/imaging )
+	podofo? ( >=app-text/podofo-0.5.0 )"
+
+src_prepare() {
+	# Fix lib2geom relocation errors on amd64
+	if use amd64 ; then
+		epatch "${FILESDIR}/${PN}-1.3.5-fpic.patch"
+	fi
+}
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		-DWANT_NORPATH=ON
+		-D2GEOM_BUILD_SHARED=ON
+		-DHAVE_CMS=ON
+		-DHAVE_FONTCONFIG=ON
+		-DHAVE_LIBZ=ON
+		-DHAVE_TIFF=ON
+		-DWANT_NORPATH=ON
+		-DWANT_QTARTHUR=OFF
+		-DWANT_QT3SUPPORT=OFF
+		$(cmake-utils_use_has debug DEBUG )
+		$(cmake-utils_use_has python PYTHON )
+		$(cmake-utils_use_has spell ASPELL )
+		$(cmake-utils_use_want cairo CAIRO )
+		$(cmake-utils_use_want fontconfig FONTCONFIG )
+		$(cmake-utils_use_want xml XML )
+		$(cmake-utils_use_has podofo PODOFO ) "
+
+	if use amd64 ; then
+		mycmakeargs="${mycmakeargs} -DWANT_LIB64=ON"
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile || die "compile failed"
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu scribus.desktop
+	doicon scribus/icons/scribus.png || die "doicon failed"
+}

sys-kernel/xen-sources/Manifest

@@ -1,4 +1,4 @@
-DIST genpatches-2.6.31-4.base.tar.bz2 93174 RMD160 67df4ebe2c15e23e8bebaffffb769c1b76a35365 SHA1 fbb4ec5765ffe692686375898391b15781176f8b SHA256 ec587f2d0a02405cc9e2f7be9abe82ed175955464799c5cefc64ece157181dd7
+DIST genpatches-2.6.31-5.base.tar.bz2 112611 RMD160 dab5d152b178a2384008522c4070dd783a6c8df3 SHA1 b89564aa873f71f98d33e95a776761952ffef619 SHA256 03ae19a723974c6fc17eb05a4e202495c5eb1dcc0003313c1f60341eb6458707
 DIST linux-2.6.31.tar.bz2 61494822 RMD160 c0d88e63740abf0d4f9d82557260a31643f5a01b SHA1 c6e0e6b473ba2b80d164e37cfabf294e783c03d9 SHA256 0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512
-DIST xen-patches-2.6.31-4.tar.bz2 1825161 RMD160 4dc4b10518e529243f259b927cb6cc789935e304 SHA1 951c39f7344bf4b802dccd6bd99682c8ca428026 SHA256 e318842c6d4440751df92543dfb626a8ec842d13910961c4a9e9becf5b07fc1f
+DIST xen-patches-2.6.31-7.tar.bz2 1826571 RMD160 1163991c69e66ff8d99e51ce93fe721aed24cd37 SHA1 334f18c963dd4f2527629f7aa9be233f621d0d96 SHA256 6c045bed7aa47fa99c04971bdd78088050434aa2e4cf85e0ec6ed5cfcada3417
-EBUILD xen-sources-2.6.31-r4.ebuild 754 RMD160 296681ad68637cce3d68f4235ec790bf6ffdff33 SHA1 df04d3e034e972813353b572f72b39e1a699a2ed SHA256 5828b6707a025e43c761666bf8c06fdb6c7bf0778a8d088515b371ba8a50d3b5
+EBUILD xen-sources-2.6.31-r7.ebuild 754 RMD160 2ba69763a69ec4d535239aa7a1285d202de8b1c8 SHA1 5ec4db978125aecd7ee2e048b874eafd4504e475 SHA256 4ce492223c90befda82d598ce91cc1eea20c8cbece6275e05274e03e49dd6b56

sys-kernel/xen-sources/xen-sources-2.6.31-r7.ebuild

@@ -5,7 +5,7 @@
 ETYPE="sources"
 UNIPATCH_STRICTORDER="1"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="4"
+K_GENPATCHES_VER="5"
 inherit kernel-2
 detect_version
 
@@ -15,7 +15,7 @@ IUSE=""
 
 KEYWORDS="~x86 ~amd64"
 
-XENPATCHES_VER="4"
+XENPATCHES_VER="7"
 XENPATCHES="xen-patches-${PV}-${XENPATCHES_VER}.tar.bz2"
 XENPATCHES_URI="mirror://gentoo/${XENPATCHES}"
 

www-servers/nginx/Manifest

@@ -5,5 +5,5 @@ AUX nginx.conf-r4 878 RMD160 9515d77df5ce3f56e7bb06c7274b0b22b1f5a7c2 SHA1 83e00
 AUX nginx.logrotate 195 RMD160 56a165a6a42355f36f2d125318105708dfb948e1 SHA1 19cfc313d815c57c64df55282ae627c11280a6a6 SHA256 16fcd09e7c62b5693a4eed0924494c9794cd2e86d0e0f4d2d77519b75bf69bb6
 DIST nginx-0.8.26.tar.gz 615271 RMD160 40f146438ef1f412a6a40552476c59b608cd9250 SHA1 5d14fe8866c69e459348ba1e3c688516045ad447 SHA256 18f1845b991f3a165f6a89d2bf0c10c43c01c4fc1b67d281197d6210e2774f61
 DIST ngx_http_auth_pam_module-1.1.tar.gz 5193 RMD160 38437a1f5d34f93b22abb9f0a7181be756356d33 SHA1 d04065a512169925dda8bce710e1dc5012cac47b SHA256 ea9da5f106b952729398248cddabbe25f7a5752993e91c9b8252dbc2b03b8ecd
-EBUILD nginx-0.8.26.ebuild 3736 RMD160 68bd637733362c9ed56e3b32810ca39cb2a47a81 SHA1 921a75c7f136c7a8959db92fb33ced3b2d64ab06 SHA256 3fa57402f556f431d210cfed1979141051deee40ee6dbadf1edb399b4cf9bad5
+EBUILD nginx-0.8.26.ebuild 3853 RMD160 5dc3005121d12757e0023b2f9e28dc833b4affa6 SHA1 b41b865974501c40f57554ece5572c00d5e9b7d8 SHA256 fb9a9c9f3cfef344d54c0ec3b05eccc3a92c6471c1b5e469dd606366dff3f880
 MISC metadata.xml 711 RMD160 c2426ecf2ca328c1822edcd4fe4e1eb5ba9176c0 SHA1 0b9ea8e217537e7255a9bdd2f5668198c738cf09 SHA256 d3b05c228dd62148c8bc7e46abad586eb9a9f3061ef510e1ed0a4baa77595a99

www-servers/nginx/nginx-0.8.26.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.13.ebuild,v 1.1 2009/09/06 19:45:39 voxus Exp $
 
-inherit eutils ssl-cert toolchain-funcs
+inherit eutils ssl-cert toolchain-funcs versionator
 
 DESCRIPTION="Robust, small and high performance http and reverse proxy server"
 
@@ -13,7 +13,7 @@ SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="addition debug fastcgi flv imap ipv6 pamauth pcre perl random-index securelink ssl
+IUSE="addition debug fastcgi file-aio flv imap ipv6 pamauth pcre perl random-index securelink ssl
 status sub vim-syntax webdav zlib"
 
 DEPEND="dev-lang/perl
@@ -70,6 +70,9 @@ src_compile() {
 	use random-index	&& myconf="${myconf} --with-http_random_index_module"
 	use securelink && myconf="${myconf} --with-http_secure_link_module"
 
+	# --- works only with kernel > 2.6.22 
+	use file-aio 		&& myconf="${myconf} --with-file-aio" 
+
 	tc-export CC
 	./configure \
 		--prefix=/usr \