# HG changeset patch # User Dirk Olmes # Date 1333373945 -7200 # Node ID cee7e5f9f250cd24610568373e5dfff53d88deb5 # Parent 19a25aae5976912762628551be4df783cb49d01f# Parent 90e704dfb755bf93c777b5fa448a4c59c99e3f5e Automated merge with http://hoho.dyndns.org/hg/portage diff -r 19a25aae5976 -r cee7e5f9f250 .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,2 @@ +^layman/ +\.orig$ diff -r 19a25aae5976 -r cee7e5f9f250 app-admin/jailkit/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-admin/jailkit/Manifest Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,11 @@ +AUX jailkit 277 RMD160 3008e6f78a67af2eb318988c034f58197c54abc1 SHA1 a365679a5c9f80db63c3737f979c5b1c99d8f5d4 SHA256 58a7fcdaae6b1706d0183c826b4ff5856c99f24ba41eaf7956b42ff8e35388a7 +AUX jailkit-2.11-ldflags.patch 1885 RMD160 4a1b7bbabb29f9852e9988945ba1047b33443dad SHA1 afbf0aa87f43f881aafc4ee9f6c54c606063d1ad SHA256 a4c32f8ede109b5bdf8b40c32fe18d7c60fef9da9aeb55f86ffae1db0b4bd1a7 +AUX jailkit-2.11-noshells.patch 514 RMD160 5583bcdfb602d6f682db2e125bde2507fd2ebb1a SHA1 4c6c722093ae6d7616269ff48ed402db06533b57 SHA256 1dac48a765603f506e1cc0a0d876fb32ed5121cb64cf12dd5ffec31136880ae3 +AUX jailkit-2.11-pyc.patch 354 RMD160 d0a548409b74ed94fcb9537850ebba96954917b3 SHA1 c55581b9216680aeec54d5e12da4f988052c4777 SHA256 7ec99db35b9483446601495d2ae481df52611e6f52926d3cd18ffbd569a5fd70 +AUX jailkit-2.13-ldflags.patch 1885 RMD160 4a1b7bbabb29f9852e9988945ba1047b33443dad SHA1 afbf0aa87f43f881aafc4ee9f6c54c606063d1ad SHA256 a4c32f8ede109b5bdf8b40c32fe18d7c60fef9da9aeb55f86ffae1db0b4bd1a7 +AUX jailkit-2.13-noshells.patch 514 RMD160 5583bcdfb602d6f682db2e125bde2507fd2ebb1a SHA1 4c6c722093ae6d7616269ff48ed402db06533b57 SHA256 1dac48a765603f506e1cc0a0d876fb32ed5121cb64cf12dd5ffec31136880ae3 +AUX jailkit-2.13-pyc.patch 354 RMD160 d0a548409b74ed94fcb9537850ebba96954917b3 SHA1 c55581b9216680aeec54d5e12da4f988052c4777 SHA256 7ec99db35b9483446601495d2ae481df52611e6f52926d3cd18ffbd569a5fd70 +DIST jailkit-2.11.tar.bz2 110684 RMD160 2d04fa253fc4b419c05137e4618ef18c51c88a19 SHA1 6344b79a2093699115d22668a08e052e75f655e3 SHA256 e774de4ebfa261c82c6fc9e6294a5b5f88d871d26ba0ca4f6d7ccc7308f17de2 +DIST jailkit-2.13.tar.bz2 113352 RMD160 b9224b9b5108842d7345f32ee7daa10110b6ae84 SHA1 ebe77105308d53b254cf9a0cc1dbccd1729c8308 SHA256 ffebd6d1414f0575bd14410063b007409a0662743ef72b60aaa1500249b14f67 +EBUILD jailkit-2.11.ebuild 887 RMD160 2e457e785e5047d654d90ecdf0b089867e87ce4e SHA1 6448166e336586f6e4e3adcca23920dd98d2afe4 SHA256 0d2583c4098860c9c3fcb469d17b918ee1c3b85f84db8a3214cfe1e37ba2a75f +EBUILD jailkit-2.13.ebuild 887 RMD160 2e457e785e5047d654d90ecdf0b089867e87ce4e SHA1 6448166e336586f6e4e3adcca23920dd98d2afe4 SHA256 0d2583c4098860c9c3fcb469d17b918ee1c3b85f84db8a3214cfe1e37ba2a75f diff -r 19a25aae5976 -r cee7e5f9f250 app-admin/jailkit/files/jailkit --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-admin/jailkit/files/jailkit Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,18 @@ +#!/sbin/runscript + +JK_SOCKETD="/usr/sbin/jk_socketd" + +depend() { + need logger +} + +start() { + ebegin "Starting jk_socketd" + start-stop-daemon --start --exec ${JK_SOCKETD} + eend $? +} +stop() { + ebegin "Stopping jk_socketd" + start-stop-daemon --stop --exec ${JK_SOCKETD} + eend $? +} diff -r 19a25aae5976 -r cee7e5f9f250 app-admin/jailkit/files/jailkit-2.11-ldflags.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-admin/jailkit/files/jailkit-2.11-ldflags.patch Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,46 @@ +diff --git a/configure.ac b/configure.ac +index e77ea24..1814f2a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -142,7 +142,7 @@ AC_CHECK_FUNCS( + [cap_get_proc],, + AC_CHECK_LIB([cap], [cap_get_proc], + AC_DEFINE(HAVE_CAP_GET_PROC) +- LDFLAGS="$LDLAGS -lcap", ++ LIBS="$LIBS -lcap", + ) + ) + +diff --git a/src/Makefile.in b/src/Makefile.in +index 49449b6..f55150f 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -67,22 +67,22 @@ OBJS = $(SRCS:.c=.o) + all: ${BINARIES} + + jk_chrootlaunch: jk_chrootlaunch.o jk_lib.o utils.o +- $(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_chrootlaunch.o jk_lib.o utils.o ++ $(CC) $(DEFS) $(LDFLAGS) -o $@ jk_chrootlaunch.o jk_lib.o utils.o $(LIBS) + + jk_socketd: jk_socketd.o jk_lib.o utils.o iniparser.o +- $(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_socketd.o jk_lib.o utils.o iniparser.o ++ $(CC) $(DEFS) $(LDFLAGS) -o $@ jk_socketd.o jk_lib.o utils.o iniparser.o $(LIBS) + + jk_lsh: jk_lsh.o iniparser.o jk_lib.o utils.o wordexp.o +- $(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_lsh.o iniparser.o jk_lib.o utils.o wordexp.o ++ $(CC) $(DEFS) $(LDFLAGS) -o $@ jk_lsh.o iniparser.o jk_lib.o utils.o wordexp.o $(LIBS) + + jk_chrootsh: jk_chrootsh.o iniparser.o jk_lib.o utils.o passwdparser.o +- $(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_chrootsh.o iniparser.o jk_lib.o utils.o passwdparser.o ++ $(CC) $(DEFS) $(LDFLAGS) -o $@ jk_chrootsh.o iniparser.o jk_lib.o utils.o passwdparser.o $(LIBS) + + jk_uchroot: jk_uchroot.o iniparser.o jk_lib.o utils.o +- $(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_uchroot.o iniparser.o jk_lib.o utils.o ++ $(CC) $(DEFS) $(LDFLAGS) -o $@ jk_uchroot.o iniparser.o jk_lib.o utils.o $(LIBS) + + jk_procmailwrapper: jk_procmailwrapper.o jk_lib.o utils.o +- $(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_procmailwrapper.o jk_lib.o utils.o ++ $(CC) $(DEFS) $(LDFLAGS) -o $@ jk_procmailwrapper.o jk_lib.o utils.o $(LIBS) + + clean: + rm -f ${BINARIES} diff -r 19a25aae5976 -r cee7e5f9f250 app-admin/jailkit/files/jailkit-2.11-noshells.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-admin/jailkit/files/jailkit-2.11-noshells.patch Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,17 @@ +diff --git a/Makefile.in b/Makefile.in +index 69a9229..eccdbf4 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -69,12 +69,6 @@ install: + @cd man/ && $(MAKE) install + # test if the jk_chrootsh is already in /etc/shells + # this previously had @echo but that fails on FreeBSD +- if test -w /etc/shells; then \ +- if ! grep ${prefix}/sbin/jk_chrootsh /etc/shells ; then \ +- echo "appending ${prefix}/sbin/jk_chroots to /etc/shells";\ +- echo ${prefix}/sbin/jk_chrootsh >> /etc/shells ;\ +- fi \ +- fi + + + uninstall: diff -r 19a25aae5976 -r cee7e5f9f250 app-admin/jailkit/files/jailkit-2.11-pyc.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-admin/jailkit/files/jailkit-2.11-pyc.patch Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,12 @@ +diff --git a/py/Makefile.in b/py/Makefile.in +index 925cd12..7ffb1a2 100644 +--- a/py/Makefile.in ++++ b/py/Makefile.in +@@ -67,7 +67,6 @@ install: all + done + ${INSTALL} -d -m 755 ${DESTDIR}${PYLIBDIR} + ${INSTALL} -m 0644 jk_lib.py ${DESTDIR}${PYLIBDIR}/ +- ${INSTALL} -m 0644 jk_lib.pyc ${DESTDIR}${PYLIBDIR}/ + + uninstall: + for file in ${PY_BINS}; do \ diff -r 19a25aae5976 -r cee7e5f9f250 app-admin/jailkit/files/jailkit-2.13-ldflags.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-admin/jailkit/files/jailkit-2.13-ldflags.patch Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,46 @@ +diff --git a/configure.ac b/configure.ac +index e77ea24..1814f2a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -142,7 +142,7 @@ AC_CHECK_FUNCS( + [cap_get_proc],, + AC_CHECK_LIB([cap], [cap_get_proc], + AC_DEFINE(HAVE_CAP_GET_PROC) +- LDFLAGS="$LDLAGS -lcap", ++ LIBS="$LIBS -lcap", + ) + ) + +diff --git a/src/Makefile.in b/src/Makefile.in +index 49449b6..f55150f 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -67,22 +67,22 @@ OBJS = $(SRCS:.c=.o) + all: ${BINARIES} + + jk_chrootlaunch: jk_chrootlaunch.o jk_lib.o utils.o +- $(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_chrootlaunch.o jk_lib.o utils.o ++ $(CC) $(DEFS) $(LDFLAGS) -o $@ jk_chrootlaunch.o jk_lib.o utils.o $(LIBS) + + jk_socketd: jk_socketd.o jk_lib.o utils.o iniparser.o +- $(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_socketd.o jk_lib.o utils.o iniparser.o ++ $(CC) $(DEFS) $(LDFLAGS) -o $@ jk_socketd.o jk_lib.o utils.o iniparser.o $(LIBS) + + jk_lsh: jk_lsh.o iniparser.o jk_lib.o utils.o wordexp.o +- $(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_lsh.o iniparser.o jk_lib.o utils.o wordexp.o ++ $(CC) $(DEFS) $(LDFLAGS) -o $@ jk_lsh.o iniparser.o jk_lib.o utils.o wordexp.o $(LIBS) + + jk_chrootsh: jk_chrootsh.o iniparser.o jk_lib.o utils.o passwdparser.o +- $(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_chrootsh.o iniparser.o jk_lib.o utils.o passwdparser.o ++ $(CC) $(DEFS) $(LDFLAGS) -o $@ jk_chrootsh.o iniparser.o jk_lib.o utils.o passwdparser.o $(LIBS) + + jk_uchroot: jk_uchroot.o iniparser.o jk_lib.o utils.o +- $(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_uchroot.o iniparser.o jk_lib.o utils.o ++ $(CC) $(DEFS) $(LDFLAGS) -o $@ jk_uchroot.o iniparser.o jk_lib.o utils.o $(LIBS) + + jk_procmailwrapper: jk_procmailwrapper.o jk_lib.o utils.o +- $(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_procmailwrapper.o jk_lib.o utils.o ++ $(CC) $(DEFS) $(LDFLAGS) -o $@ jk_procmailwrapper.o jk_lib.o utils.o $(LIBS) + + clean: + rm -f ${BINARIES} diff -r 19a25aae5976 -r cee7e5f9f250 app-admin/jailkit/files/jailkit-2.13-noshells.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-admin/jailkit/files/jailkit-2.13-noshells.patch Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,17 @@ +diff --git a/Makefile.in b/Makefile.in +index 69a9229..eccdbf4 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -69,12 +69,6 @@ install: + @cd man/ && $(MAKE) install + # test if the jk_chrootsh is already in /etc/shells + # this previously had @echo but that fails on FreeBSD +- if test -w /etc/shells; then \ +- if ! grep ${prefix}/sbin/jk_chrootsh /etc/shells ; then \ +- echo "appending ${prefix}/sbin/jk_chroots to /etc/shells";\ +- echo ${prefix}/sbin/jk_chrootsh >> /etc/shells ;\ +- fi \ +- fi + + + uninstall: diff -r 19a25aae5976 -r cee7e5f9f250 app-admin/jailkit/files/jailkit-2.13-pyc.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-admin/jailkit/files/jailkit-2.13-pyc.patch Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,12 @@ +diff --git a/py/Makefile.in b/py/Makefile.in +index 925cd12..7ffb1a2 100644 +--- a/py/Makefile.in ++++ b/py/Makefile.in +@@ -67,7 +67,6 @@ install: all + done + ${INSTALL} -d -m 755 ${DESTDIR}${PYLIBDIR} + ${INSTALL} -m 0644 jk_lib.py ${DESTDIR}${PYLIBDIR}/ +- ${INSTALL} -m 0644 jk_lib.pyc ${DESTDIR}${PYLIBDIR}/ + + uninstall: + for file in ${PY_BINS}; do \ diff -r 19a25aae5976 -r cee7e5f9f250 app-admin/jailkit/jailkit-2.11.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-admin/jailkit/jailkit-2.11.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,36 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit autotools eutils + +DESCRIPTION="Allows you to easily put programs and users in a chrooted environment" +HOMEPAGE="http://olivier.sessink.nl/jailkit/" +SRC_URI="http://olivier.sessink.nl/${PN}/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~x86" +IUSE="" + +src_prepare() { + epatch \ + "${FILESDIR}/${P}-ldflags.patch" \ + "${FILESDIR}/${P}-pyc.patch" \ + "${FILESDIR}/${P}-noshells.patch" + eautoreconf +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + doinitd "${FILESDIR}/jailkit" || die "doinit install failed" +} + +pkg_postinst() { + ebegin "Updating /etc/shells" + { grep -v "^/usr/sbin/jk_chrootsh$" "${ROOT}"etc/shells; echo "/usr/sbin/jk_chrootsh"; } > "${T}"/shells + mv -f "${T}"/shells "${ROOT}"etc/shells + eend $? +} diff -r 19a25aae5976 -r cee7e5f9f250 app-admin/jailkit/jailkit-2.13.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-admin/jailkit/jailkit-2.13.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,36 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit autotools eutils + +DESCRIPTION="Allows you to easily put programs and users in a chrooted environment" +HOMEPAGE="http://olivier.sessink.nl/jailkit/" +SRC_URI="http://olivier.sessink.nl/${PN}/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~x86" +IUSE="" + +src_prepare() { + epatch \ + "${FILESDIR}/${P}-ldflags.patch" \ + "${FILESDIR}/${P}-pyc.patch" \ + "${FILESDIR}/${P}-noshells.patch" + eautoreconf +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + doinitd "${FILESDIR}/jailkit" || die "doinit install failed" +} + +pkg_postinst() { + ebegin "Updating /etc/shells" + { grep -v "^/usr/sbin/jk_chrootsh$" "${ROOT}"etc/shells; echo "/usr/sbin/jk_chrootsh"; } > "${T}"/shells + mv -f "${T}"/shells "${ROOT}"etc/shells + eend $? +} diff -r 19a25aae5976 -r cee7e5f9f250 app-crypt/truecrypt/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-crypt/truecrypt/Manifest Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,8 @@ +AUX truecrypt-6.1-64bit.patch 664 RMD160 0f6b1ef68746290670a805b9483de5625041e3b6 SHA1 a9290da440cdc9c42caec10c4fc9eeedb8b2a3a1 SHA256 f41bc0c1cbd9a7c64b4142f839e362e787de31abd5623fce75c2d734189e82f5 +AUX truecrypt-6.1-bool.patch 883 RMD160 1b9b91f239bd504371f73a96d04fea5a33ca2f62 SHA1 87c470f2f338ef6234846b3ed3606d37416a9ace SHA256 58f364a135d124210bb4f65a5d38a7b59efa3db4afaaf6159d4344ca798c881a +AUX truecrypt-6.1-external-wx.patch 391 RMD160 742f8d7a239211738d30b0da6efdd790e88e34f2 SHA1 8d3cf5bcbc7d55ef74c3b52d34dbd370584b69fe SHA256 668e4460f0daeb1e896b7b6d6673b741db12d82e04eb503a1e2c7924ed819331 +DIST pkcs11.h 9578 RMD160 038002de5e6ed90174051bc5f96a12c51e5f87f0 SHA1 4a87fd021aed6304bccf3987107812b9d701dfe9 SHA256 1563d877b6f8868b8eb8687358162bfb7f868104ed694beb35ae1c5cf1a58b9b +DIST pkcs11f.h 29258 RMD160 c47b5818f84e42aa9d11dfe250a6da2cca14cb77 SHA1 853ad63da8961ac309bac902d270d3497a8e3356 SHA256 5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8 +DIST pkcs11t.h 70934 RMD160 da30e5792b7b56b4f3651f65f548c23e1ac96eac SHA1 1909623adf647589c7d7e8f49672936c8e03d500 SHA256 8ce68616304684f92a7e267bcc8f486441e92a5cbdfcfd97e69ac9a0b436fb7b +DIST truecrypt-6.1a.tar.gz 1773482 RMD160 d3753af8fee062e4d4c554145cddc9590b1d9ccf SHA1 f2fb1c8cd18b4452529edb53479418a5c1460a58 SHA256 a2bb8273edcb3c3d10d9819daac853f940033deb1f9726986311356bd5b88c4a +EBUILD truecrypt-6.1a.ebuild 2724 RMD160 478e4476ea376050310d8a0d8b32502550f402cb SHA1 d0898cd36a0d45247c6347b8881ee34f6024aeb5 SHA256 5951a886dc2237cdf30b76aadc4adf2b17454bd6b8b48d26d2cc33e953aed422 diff -r 19a25aae5976 -r cee7e5f9f250 app-crypt/truecrypt/files/truecrypt-6.1-64bit.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-crypt/truecrypt/files/truecrypt-6.1-64bit.patch Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,15 @@ +diff -urNp truecrypt-6.1-source.orig/Makefile truecrypt-6.1-source/Makefile +--- truecrypt-6.1-source.orig/Makefile 2008-11-11 12:43:29.000000000 +0300 ++++ truecrypt-6.1-source/Makefile 2008-11-11 13:34:37.000000000 +0300 +@@ -50,7 +50,11 @@ C_CXX_FLAGS += -I$(PKCS11_INC) + endif + + C_CXX_FLAGS += -DBOOL=int -DFALSE=0 -DTRUE=1 ++ifeq "$(origin USE64BIT)" "command line" ++C_CXX_FLAGS += -D__int8=char -D__int16=short -D__int32=int '-D__int64=long' # Tested in PlatformTest ++else + C_CXX_FLAGS += -D__int8=char -D__int16=short -D__int32=int '-D__int64=long long' # Tested in PlatformTest ++endif + + export LFLAGS := + export PKG_CONFIG_PATH ?= /usr/local/lib/pkgconfig diff -r 19a25aae5976 -r cee7e5f9f250 app-crypt/truecrypt/files/truecrypt-6.1-bool.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-crypt/truecrypt/files/truecrypt-6.1-bool.patch Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,25 @@ +diff -urNp truecrypt-6.1-source.orig/Common/Crypto.h truecrypt-6.1-source/Common/Crypto.h +--- truecrypt-6.1-source.orig/Common/Crypto.h 2008-11-11 23:12:53.000000000 +0300 ++++ truecrypt-6.1-source/Common/Crypto.h 2008-11-11 23:14:33.000000000 +0300 +@@ -29,6 +29,10 @@ + + #include "Tcdefs.h" + ++#ifndef BOOL ++#define BOOL BOOL1 ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +diff -urNp truecrypt-6.1-source.orig/Makefile truecrypt-6.1-source/Makefile +--- truecrypt-6.1-source.orig/Makefile 2008-11-11 23:12:53.000000000 +0300 ++++ truecrypt-6.1-source/Makefile 2008-11-11 23:13:32.000000000 +0300 +@@ -50,6 +50,7 @@ C_CXX_FLAGS += -I$(PKCS11_INC) + endif + + C_CXX_FLAGS += -DBOOL=int -DFALSE=0 -DTRUE=1 ++C_CXX_FLAGS += -DBOOL1=int + ifeq "$(origin USE64BIT)" "command line" + C_CXX_FLAGS += -D__int8=char -D__int16=short -D__int32=int '-D__int64=long' # Tested in PlatformTest + else diff -r 19a25aae5976 -r cee7e5f9f250 app-crypt/truecrypt/files/truecrypt-6.1-external-wx.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-crypt/truecrypt/files/truecrypt-6.1-external-wx.patch Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,11 @@ +diff -urNp truecrypt-6.1-source.orig/Main/Main.make truecrypt-6.1-source/Main/Main.make +--- truecrypt-6.1-source.orig/Main/Main.make 2008-11-11 14:05:16.000000000 +0300 ++++ truecrypt-6.1-source/Main/Main.make 2008-11-11 15:53:16.000000000 +0300 +@@ -76,6 +76,7 @@ WX_CONFIG_LIBS := base + else + WX_CONFIG_LIBS := adv,core,base + endif ++WX_CONFIG_LIBS = + + ifeq "$(TC_BUILD_CONFIG)" "Release" + diff -r 19a25aae5976 -r cee7e5f9f250 app-crypt/truecrypt/truecrypt-6.1a.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-crypt/truecrypt/truecrypt-6.1a.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,105 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils toolchain-funcs multilib wxwidgets + +MY_P="${P}.tar.gz" + +DESCRIPTION="Free open-source disk encryption software" +HOMEPAGE="http://www.truecrypt.org/" +#SRC_URI="TrueCrypt ${PV} Source.tar.gz" +SRC_URI="${P}.tar.gz + pkcs11.h + pkcs11f.h + pkcs11t.h" + +LICENSE="truecrypt-collective-1.4" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X" +RESTRICT="mirror fetch bindist" + +RDEPEND="sys-fs/fuse + =x11-libs/wxGTK-2.8*" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${P}-source" + +pkg_nofetch() { + einfo "Please download tar.gz source from:" + einfo "http://www.truecrypt.org/downloads2.php" + einfo "Then put the file in ${DISTDIR}/${MY_P}" + einfo "Please download RSA Security Inc. PKCS #11 Cryptographic Token Interface (Cryptoki) 2.20" + einfo "header files:" + einfo "ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11.h" + einfo "ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11f.h" + einfo "ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11t.h" + einfo "Then put files in ${DISTDIR}" +} + +pkg_setup() { + WX_GTK_VER="2.8" + if use X; then + need-wxwidgets unicode + else + need-wxwidgets base-unicode + fi +} + +src_unpack() { + unpack ${MY_P} + cd "${S}" + + epatch "${FILESDIR}/${PN}-6.1-64bit.patch" + epatch "${FILESDIR}/${PN}-6.1-bool.patch" + epatch "${FILESDIR}/${PN}-6.1-external-wx.patch" +} + +src_compile() { + local EXTRA + use amd64 && EXTRA="${EXTRA} USE64BIT=1" + use X || EXTRA="${EXTRA} NOGUI=1" + if has_version '=sys-devel/gcc-4.3 and =sys-libs/glibc-2.7 or use dev-php5/jpgraph-1.13 + + +need_httpd_cgi +need_php_httpd + +S=${WORKDIR}/${PN} + +src_prepare() { + esvn_clean + + if use jpgraph; then + einfo "Fixing jpgraph location" + MY_JPGRAPH_VERSION="$(best_version dev-php5/jpgraph)" + MY_JPGRAPH_VERSION="${MY_JPGRAPH_VERSION/'dev-php5/jpgraph-'/}" + sed -i "s|EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph.php'|'/usr/share/php5/jpgraph/jpgraph.php'|" \ + projectmanager/inc/class.projectmanager_ganttchart.inc.php || die + sed -i "s|EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph_gantt.php'|'/usr/share/php5/jpgraph/jpgraph_gantt.php'|" \ + projectmanager/inc/class.projectmanager_ganttchart.inc.php || die + sed -i "s|$jpgraph_path .= SEP.'jpgraph';|$jpgraph_path = dirname('/usr/share/php5/jpgraph/jpgraph.php');|" \ + setup/check_install.php || die + sed -i "s|'unknown';|'${MY_JPGRAPH_VERSION}';\n \$available = version_compare(\$version,\$min_version,'>=');|" \ + setup/check_install.php || die + fi +} + +src_install() { + webapp_src_preinst + insinto "${MY_HTDOCSDIR}" + doins -r . + webapp_serverowned "${MY_HTDOCSDIR}/phpgwapi/images" + webapp_postinst_txt en "${FILESDIR}/postinstall-en-1.2.txt" + webapp_src_install +} + +pkg_postinst() { + if use ldap; then + elog "If you are using LDAP contacts/addressbook, please read the upgrade instructions at" + elog "http://www.egroupware.org/index.php?page_name=wiki&wikipage=ManualSetupUpdate" + elog "before running the egroupware setup" + fi + webapp_pkg_postinst +} diff -r 19a25aae5976 -r cee7e5f9f250 www-apps/egroupware/files/postinstall-en-1.2.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www-apps/egroupware/files/postinstall-en-1.2.txt Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,12 @@ +You are almost done! + +0. Restart your webserver and your database daemon. + +1. Point your browser to the URL http://${VHOST_HOSTNAME}/egroupware/setup +and follow the install/upgrade script. + +Don't forget to read the installation manual, available from +http://egroupware.org/specialpages/index.php?page_name=wiki&wikipage=ManualSetup +It describes the rest of the installation process. + +Enjoy eGroupWare! diff -r 19a25aae5976 -r cee7e5f9f250 www-apps/gallery/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www-apps/gallery/Manifest Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,2 @@ +DIST gallery-3.0.1.zip 1810327 RMD160 07fe57682b4bce71f952c8673f9c1ebc293b7bd0 SHA1 7a023960a4035aec451a25af4de70090ab4ec924 SHA256 bdff3e0f5f157343f414cdfe000b11c93400d379103529bbc5852d85eb54b64f +EBUILD gallery-3.0.1.ebuild 1522 RMD160 fdfa8646f7b58a95976a0b3d3127282d1c3d961a SHA1 c3f099ac623d58356f13e3c32e9a1f3800987d55 SHA256 231b68b8e83c4cefe5cb27585fc67b708937b126a671cbbf68cfe4a25fd15872 diff -r 19a25aae5976 -r cee7e5f9f250 www-apps/gallery/gallery-3.0.1.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www-apps/gallery/gallery-3.0.1.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,72 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header $ + +EAPI="2" + +inherit webapp eutils depend.php + +DESCRIPTION="Web based (PHP Script) photo album viewer/creator" +HOMEPAGE="http://gallery.menalto.com/" +SRC_URI="mirror://sourceforge/gallery/${P}.zip" + +LICENSE="GPL-2" +KEYWORDS="~x86 ~amd64" +IUSE="" + +# Build depend is on unzip +DEPEND="app-arch/unzip" + +RDEPEND=" + >=dev-db/mysql-5 + >=dev-lang/php-5.2.3 + >=www-servers/apache-2 + " + +My_PN="${PN}3" +S=${WORKDIR}/${My_PN} + +need_httpd_cgi +need_php_httpd + + +src_install() { + webapp_src_preinst + + INSTALL_DIR="/${My_PN}" + + cp -R * ${D}/${MY_HTDOCSDIR} + + keepdir ${MY_HTDOCSDIR}/var + webapp_serverowned ${MY_HTDOCSDIR}/var + + ewarn "ATTANTION!" + ewarn "gallery3 requires short_open_tag to be On" + ewarn "You need to edit \"/etc/php/apache2-php5.?/php.ini\"" + ewarn "and change short_open_tag to \"On\" and " + ewarn "re-start apache (/etc/init.d/apache2 restart)" + + webapp_src_install +} + +pkg_postinst() { + elog + elog "To start \"gallery3\" just browse to " + elog + elog "http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/gallery3" + elog + elog "and follow the simple instructions." + elog + ewarn "MAKE SURE TO CHANGE YOUR ADMIN PASSWORD!" + elog + elog + elog "Please read the file http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/README" + elog "for additional information." + elog "For example, how to upgrade from gallery2 to gallery3." + elog + elog "For additional information refer to ${HOMEPAGE}, please." + elog + + webapp_pkg_postinst +} + diff -r 19a25aae5976 -r cee7e5f9f250 www-apps/redaxo/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www-apps/redaxo/Manifest Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,2 @@ +DIST redaxo4_2_1.zip 2143442 RMD160 18d637be99cf076bf2a9feb59a98357da0db192a SHA1 b8f8a23c2b8b97d2b2eb854fafe3001e22840043 SHA256 4d9daacc0104a47cb05c43ffe6be5445b0ed0d00bee4bea9e58e1ac46fd5d61b +EBUILD redaxo-4.2.1.ebuild 2003 RMD160 6316f835508f1a20d3052c4fc77f218207bb8255 SHA1 76b8a8a4d0b53b5081c55139f88836841f572251 SHA256 a5b22b487dc4f19aae5f089f463613bf516de62754f885ecdaa266cdc689d308 diff -r 19a25aae5976 -r cee7e5f9f250 www-apps/redaxo/redaxo-4.2.1.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www-apps/redaxo/redaxo-4.2.1.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,73 @@ + +EAPI=2 +inherit webapp depend.php versionator + +DESCRIPTION="PHP-powered CMS application." +HOMEPAGE="http://www.redaxo.de/" + +# translate redaxo-0.0.0 to redaxo0_0_0 +MY_PV=$(replace_all_version_separators '_') +MY_P=${PN}${MY_PV} +SRC_URI="http://www.redaxo.de/files/${MY_P}.zip" + +LICENSE="GPL" +KEYWORDS="~amd64 ~x86" +DEPEND="app-arch/unzip" +RDEPEND="virtual/httpd-cgi" + +need_php_httpd + +pkg_setup() { + webapp_pkg_setup + + if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql ; then + eerror + eerror "${PHP_PKG} needs to be reinstalled with the mysql USE flag enabled." + die "Reinstall ${PHP_PKG} with the above-stated USE flags." + fi +} + +src_unpack() { + unpack ${A} + + # clean up some cruft that comes as part of the install package + cd ${WORKDIR}/${MY_P} + find . -name .DS_Store -exec rm {} \; + remove_if_exists _lastchanges.txt +} + +src_install() { + webapp_src_preinst + + einfo "Installing application files." + cd ${MY_P} + cp -r . "${D}"${MY_HTDOCSDIR} + + # .htaccess, index.php and the redaxo dir are part of the distro + local SERVEROWNED="index.php files files/_readme.txt files/addons \ + redaxo redaxo/include/clang.inc.php redaxo/include/plugins.inc.php \ + redaxo/include/addons.inc.php redaxo/include/master.inc.php \ + redaxo/include/generated redaxo/include/generated/* \ + redaxo/include/addons/* redaxo/include/addons/import_export/backup \ + redaxo/include/addons/image_resize/config.inc.php" + for SFILES in ${SERVEROWNED}; do + webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} + done + + webapp_src_install +} + +webapp_pkg_postinst() { + einfo "This ebuild does not perform any autoinstall of the package" + einfo "" + einfo "This allows you to install redaxo directly into the top of" + einfo "your document root using:" + einfo "webapp-config -I -h localhost -u root redaxo ${PV}" + einfo "" +} + +function remove_if_exists() { + if [ -f $1 ]; then + rm $1 + fi +} diff -r 19a25aae5976 -r cee7e5f9f250 www-apps/serendipity/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www-apps/serendipity/Manifest Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,12 @@ +DIST serendipity-1.3.1.tar.gz 4482417 RMD160 40565957b31bad1c41506abf9bb9d8c20eb13d92 SHA1 623d689136fa9e9a5b013046090392b016cf09fa SHA256 6304a5885f3c60188c1d49aa74e85908788ce50e006e9443a649be9f902edcba +DIST serendipity-1.4.1.tar.gz 5278932 RMD160 56eb582c37d9f0a21e0f38f067a3c8f42946ed60 SHA1 03a9511dcd11b08b2fb3d5a129072a1158224b60 SHA256 e950cff732323aaf3243d3a28afd18322cc7ab86daf81b21c2b4a2667d70e6f7 +DIST serendipity-1.4.tar.gz 5277144 RMD160 d03ee511172863433eac3c6b96fc254db0acab4b SHA1 fdafeb0374e8bf9ca4ff1845d13a67fbade54d58 SHA256 c636c4199d26eb262c077997850fa871a160c067404250752e8ca2d0804e098a +DIST serendipity-1.5.1.tar.gz 5337760 RMD160 5a14551f727230e0c134a0aff555c40a0856ece6 SHA1 4f7712835480b24b05de68fc6af2f7c7fb700377 SHA256 5e6dc05208e115c3068f91a91687aa91078f19a36e630104146e2fc8a0ffcbe9 +DIST serendipity-1.5.2.tar.gz 5337799 RMD160 9210d2982b28459929488a46b8cba70efd220cd1 SHA1 58ba1d14d0beb07d538968ddfa7f95419002251b SHA256 75544fd4104a2b1afbac6a80aa8ff0bb5bfc008dcdaa1e4531740d96e00465e5 +DIST serendipity-1.5.5.tar.gz 5338491 RMD160 883c746ef50267b96d5ba9669491d81d6107cb1a SHA1 70c0287630e213e9067be384917233498fe8b745 SHA256 b61bb613eba147a30b3be479a2cf8b218b2475d1f045127964e56fa285bdb657 +EBUILD serendipity-1.3.1.ebuild 1976 RMD160 44845a102490482da1fe3ff4ee2950069b411d47 SHA1 be7d9821dac7feac30927f077dc4765dfd04a5fd SHA256 5a06f6ae838bacdcaa4cfe0ca4f90ff6a10081b6eb20df457cc47e9b0db06f38 +EBUILD serendipity-1.4.1.ebuild 2128 RMD160 fb4e4c13ce065160984fe8a0298448d5f55841da SHA1 5e7cc2e38a87fba7a40801f1ac7fb952ea1b9033 SHA256 227ab84ff8eef17579fe4352610f258ffede0ae18c362b42658c1638e6b64465 +EBUILD serendipity-1.4.ebuild 1976 RMD160 44845a102490482da1fe3ff4ee2950069b411d47 SHA1 be7d9821dac7feac30927f077dc4765dfd04a5fd SHA256 5a06f6ae838bacdcaa4cfe0ca4f90ff6a10081b6eb20df457cc47e9b0db06f38 +EBUILD serendipity-1.5.1.ebuild 2128 RMD160 fb4e4c13ce065160984fe8a0298448d5f55841da SHA1 5e7cc2e38a87fba7a40801f1ac7fb952ea1b9033 SHA256 227ab84ff8eef17579fe4352610f258ffede0ae18c362b42658c1638e6b64465 +EBUILD serendipity-1.5.2.ebuild 2128 RMD160 fb4e4c13ce065160984fe8a0298448d5f55841da SHA1 5e7cc2e38a87fba7a40801f1ac7fb952ea1b9033 SHA256 227ab84ff8eef17579fe4352610f258ffede0ae18c362b42658c1638e6b64465 +EBUILD serendipity-1.5.5.ebuild 2123 RMD160 c88742b8a8429794801e14b7f7ac5577c7711276 SHA1 a0e2a70e846a67344f7d0c5790b105bc7f50646f SHA256 8514b35a5e8e5c321f5e15306e1d12e4d2a7dd492dbfb8e11e86681017ffc998 diff -r 19a25aae5976 -r cee7e5f9f250 www-apps/serendipity/serendipity-1.3.1.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www-apps/serendipity/serendipity-1.3.1.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,64 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit webapp depend.php + +DESCRIPTION="PHP-powered, flexible blogging/CMS application." +HOMEPAGE="http://www.s9y.org/" +SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~x86" +IUSE="imagemagick" + +DEPEND="" +RDEPEND="virtual/httpd-cgi + imagemagick? ( media-gfx/imagemagick )" + +need_php_httpd + +S="${WORKDIR}/${PN}" + +pkg_setup() { + webapp_pkg_setup + + if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \ + || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \ + || ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode zlib ; then + eerror + eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli," + eerror "postgres or sqlite USE flags enabled for a database backend." + eerror "It must also have either gd or gd-external USE flag enabled." + eerror "It must also have all of iconv pcre unicode zlib USE flags enabled." + die "Reinstall ${PHP_PKG} with the above-stated USE flags." + fi +} + +src_install() { + webapp_src_preinst + + rm docs/INSTALL* + local docs="docs/*" + dodoc ${docs} + rm -rf docs/ + + einfo "Installing application files." + cp -r . "${D}"${MY_HTDOCSDIR} + touch "${D}"${MY_HTDOCSDIR}/.htaccess + touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php + + keepdir ${MY_HTDOCSDIR}/archives/ + webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php + #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + + # archives, templates_c and uploads need to be writable to PHP + # .htaccess amd serendipity_config_local.inc.php need to be too + # plugins and templates need to be writable for spartacus support. + local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads" + for SFILES in ${SERVEROWNED}; do + webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} + done + + webapp_src_install +} diff -r 19a25aae5976 -r cee7e5f9f250 www-apps/serendipity/serendipity-1.4.1.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www-apps/serendipity/serendipity-1.4.1.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,64 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit webapp depend.php + +DESCRIPTION="PHP-powered, flexible blogging/CMS application." +HOMEPAGE="http://www.s9y.org/" +SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~x86" +IUSE="imagemagick" + +DEPEND="" +RDEPEND="virtual/httpd-cgi + imagemagick? ( media-gfx/imagemagick )" + +need_php_httpd + +S="${WORKDIR}/${PN}" + +pkg_setup() { + webapp_pkg_setup + + if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \ + || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \ + || ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode xml zlib ; then + eerror + eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli," + eerror "postgres or sqlite USE flags enabled for a database backend." + eerror "It must also have either gd or gd-external USE flag enabled." + eerror "It must also have all of iconv pcre unicode xml zlib USE flags enabled." + die "Reinstall ${PHP_PKG} with the above-stated USE flags." + fi +} + +src_install() { + webapp_src_preinst + + rm docs/INSTALL* + local docs="docs/*" + dodoc ${docs} + rm -rf docs/ + + einfo "Installing application files." + cp -r . "${D}"${MY_HTDOCSDIR} + touch "${D}"${MY_HTDOCSDIR}/.htaccess + touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php + + keepdir ${MY_HTDOCSDIR}/archives/ + webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php + #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + + # archives, templates_c and uploads need to be writable to PHP + # .htaccess amd serendipity_config_local.inc.php need to be too + # plugins and templates need to be writable for spartacus support. + local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads" + for SFILES in ${SERVEROWNED}; do + webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} + done + + webapp_src_install +} diff -r 19a25aae5976 -r cee7e5f9f250 www-apps/serendipity/serendipity-1.4.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www-apps/serendipity/serendipity-1.4.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,64 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit webapp depend.php + +DESCRIPTION="PHP-powered, flexible blogging/CMS application." +HOMEPAGE="http://www.s9y.org/" +SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~x86" +IUSE="imagemagick" + +DEPEND="" +RDEPEND="virtual/httpd-cgi + imagemagick? ( media-gfx/imagemagick )" + +need_php_httpd + +S="${WORKDIR}/${PN}" + +pkg_setup() { + webapp_pkg_setup + + if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \ + || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \ + || ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode zlib ; then + eerror + eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli," + eerror "postgres or sqlite USE flags enabled for a database backend." + eerror "It must also have either gd or gd-external USE flag enabled." + eerror "It must also have all of iconv pcre unicode zlib USE flags enabled." + die "Reinstall ${PHP_PKG} with the above-stated USE flags." + fi +} + +src_install() { + webapp_src_preinst + + rm docs/INSTALL* + local docs="docs/*" + dodoc ${docs} + rm -rf docs/ + + einfo "Installing application files." + cp -r . "${D}"${MY_HTDOCSDIR} + touch "${D}"${MY_HTDOCSDIR}/.htaccess + touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php + + keepdir ${MY_HTDOCSDIR}/archives/ + webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php + #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + + # archives, templates_c and uploads need to be writable to PHP + # .htaccess amd serendipity_config_local.inc.php need to be too + # plugins and templates need to be writable for spartacus support. + local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads" + for SFILES in ${SERVEROWNED}; do + webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} + done + + webapp_src_install +} diff -r 19a25aae5976 -r cee7e5f9f250 www-apps/serendipity/serendipity-1.5.1.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www-apps/serendipity/serendipity-1.5.1.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,64 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit webapp depend.php + +DESCRIPTION="PHP-powered, flexible blogging/CMS application." +HOMEPAGE="http://www.s9y.org/" +SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~x86" +IUSE="imagemagick" + +DEPEND="" +RDEPEND="virtual/httpd-cgi + imagemagick? ( media-gfx/imagemagick )" + +need_php_httpd + +S="${WORKDIR}/${PN}" + +pkg_setup() { + webapp_pkg_setup + + if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \ + || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \ + || ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode xml zlib ; then + eerror + eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli," + eerror "postgres or sqlite USE flags enabled for a database backend." + eerror "It must also have either gd or gd-external USE flag enabled." + eerror "It must also have all of iconv pcre unicode xml zlib USE flags enabled." + die "Reinstall ${PHP_PKG} with the above-stated USE flags." + fi +} + +src_install() { + webapp_src_preinst + + rm docs/INSTALL* + local docs="docs/*" + dodoc ${docs} + rm -rf docs/ + + einfo "Installing application files." + cp -r . "${D}"${MY_HTDOCSDIR} + touch "${D}"${MY_HTDOCSDIR}/.htaccess + touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php + + keepdir ${MY_HTDOCSDIR}/archives/ + webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php + #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + + # archives, templates_c and uploads need to be writable to PHP + # .htaccess amd serendipity_config_local.inc.php need to be too + # plugins and templates need to be writable for spartacus support. + local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads" + for SFILES in ${SERVEROWNED}; do + webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} + done + + webapp_src_install +} diff -r 19a25aae5976 -r cee7e5f9f250 www-apps/serendipity/serendipity-1.5.2.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www-apps/serendipity/serendipity-1.5.2.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,64 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit webapp depend.php + +DESCRIPTION="PHP-powered, flexible blogging/CMS application." +HOMEPAGE="http://www.s9y.org/" +SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~x86" +IUSE="imagemagick" + +DEPEND="" +RDEPEND="virtual/httpd-cgi + imagemagick? ( media-gfx/imagemagick )" + +need_php_httpd + +S="${WORKDIR}/${PN}" + +pkg_setup() { + webapp_pkg_setup + + if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \ + || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \ + || ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode xml zlib ; then + eerror + eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli," + eerror "postgres or sqlite USE flags enabled for a database backend." + eerror "It must also have either gd or gd-external USE flag enabled." + eerror "It must also have all of iconv pcre unicode xml zlib USE flags enabled." + die "Reinstall ${PHP_PKG} with the above-stated USE flags." + fi +} + +src_install() { + webapp_src_preinst + + rm docs/INSTALL* + local docs="docs/*" + dodoc ${docs} + rm -rf docs/ + + einfo "Installing application files." + cp -r . "${D}"${MY_HTDOCSDIR} + touch "${D}"${MY_HTDOCSDIR}/.htaccess + touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php + + keepdir ${MY_HTDOCSDIR}/archives/ + webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php + #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + + # archives, templates_c and uploads need to be writable to PHP + # .htaccess amd serendipity_config_local.inc.php need to be too + # plugins and templates need to be writable for spartacus support. + local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads" + for SFILES in ${SERVEROWNED}; do + webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} + done + + webapp_src_install +} diff -r 19a25aae5976 -r cee7e5f9f250 www-apps/serendipity/serendipity-1.5.5.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www-apps/serendipity/serendipity-1.5.5.ebuild Mon Apr 02 15:39:05 2012 +0200 @@ -0,0 +1,64 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit webapp depend.php + +DESCRIPTION="PHP-powered, flexible blogging/CMS application." +HOMEPAGE="http://www.s9y.org/" +SRC_URI="mirror://sourceforge/php-blog/${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~x86" +IUSE="imagemagick" + +DEPEND="" +RDEPEND="virtual/httpd-cgi + imagemagick? ( media-gfx/imagemagick )" + +need_php_httpd + +S="${WORKDIR}/${PN}" + +pkg_setup() { + webapp_pkg_setup + + if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \ + || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \ + || ! PHPCHECKNODIE="yes" require_php_with_use iconv unicode xml zlib ; then + eerror + eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli," + eerror "postgres or sqlite USE flags enabled for a database backend." + eerror "It must also have either gd or gd-external USE flag enabled." + eerror "It must also have all of iconv pcre unicode xml zlib USE flags enabled." + die "Reinstall ${PHP_PKG} with the above-stated USE flags." + fi +} + +src_install() { + webapp_src_preinst + + rm docs/INSTALL* + local docs="docs/*" + dodoc ${docs} + rm -rf docs/ + + einfo "Installing application files." + cp -r . "${D}"${MY_HTDOCSDIR} + touch "${D}"${MY_HTDOCSDIR}/.htaccess + touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php + + keepdir ${MY_HTDOCSDIR}/archives/ + webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php + #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + + # archives, templates_c and uploads need to be writable to PHP + # .htaccess amd serendipity_config_local.inc.php need to be too + # plugins and templates need to be writable for spartacus support. + local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads" + for SFILES in ${SERVEROWNED}; do + webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} + done + + webapp_src_install +}