# HG changeset patch # User Dirk Olmes # Date 1259073286 -3600 # Node ID 24790a7e3ea2d7cf17d99617df7e955f486b0cbd # Parent 11adf80154c3010762aa0c65921fc0e26fbb8a94# Parent ae604915eca98e94044aea7825bbff77dcdfa0a4 Automated merge with http://hoho.dyndns.org/hg/portage diff -r 11adf80154c3 -r 24790a7e3ea2 .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,2 @@ +^layman/ +\.orig$ diff -r 11adf80154c3 -r 24790a7e3ea2 app-crypt/truecrypt/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-crypt/truecrypt/Manifest Tue Nov 24 15:34:46 2009 +0100 @@ -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 11adf80154c3 -r 24790a7e3ea2 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 Tue Nov 24 15:34:46 2009 +0100 @@ -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 11adf80154c3 -r 24790a7e3ea2 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 Tue Nov 24 15:34:46 2009 +0100 @@ -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 11adf80154c3 -r 24790a7e3ea2 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 Tue Nov 24 15:34:46 2009 +0100 @@ -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 11adf80154c3 -r 24790a7e3ea2 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 Tue Nov 24 15:34:46 2009 +0100 @@ -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 install.sfx + chmod +x install.sfx + ./install.sfx || die + rm install.sfx + + if [[ -f ${S}/lib/unpack ]]; then + UNPACK_CMD=${S}/lib/unpack + chmod +x $UNPACK_CMD + sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD + local PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar \ + jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar \ + jre/javaws/javaws.jar" + for i in $PACKED_JARS; do + PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack + if [ -f ${PACK_FILE} ]; then + echo " unpacking: $i" + $UNPACK_CMD ${PACK_FILE} "${S}"/$i + rm -f ${PACK_FILE} + fi + done + fi +} + +src_install() { + local dirs="bin include jre lib man" + dodir /opt/${P} + + cp -dPR ${dirs} "${D}/opt/${P}/" + + # Set PaX markings on all JDK/JRE executables to allow code-generation on + # the heap by the JIT compiler. + pax-mark srpm $(list-paxables "${D}"/opt/${P}/{,/jre}/bin/*) + + dodoc COPYRIGHT README THIRDPARTYLICENSEREADME.txt || die + dohtml README.html || die + if use examples; then + cp -pPR demo "${D}/opt/${P}/" || die + fi + + cp -pPR src.zip "${D}/opt/${P}/" || die + + if use jce ; then + # Using unlimited jce while still retaining the strong jce + # May have repercussions when you find you cannot symlink libraries + # in classpaths. + cd "${D}/opt/${P}/jre/lib/security" + unzip "${DISTDIR}/${jce_policy}" + mv jce unlimited-jce + dodir /opt/${P}/jre/lib/security/strong-jce + mv "${D}/opt/${P}/jre/lib/security/US_export_policy.jar" \ + "${D}/opt/${P}/jre/lib/security/strong-jce" || die + mv "${D}/opt/${P}/jre/lib/security/local_policy.jar" \ + "${D}/opt/${P}/jre/lib/security/strong-jce" || die + dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/ + dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ + fi + + if use nsplugin; then + local plugin_dir="ns610" + if has_version '>=sys-devel/gcc-3.2' ; then + plugin_dir="ns610-gcc32" + fi + + install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so + fi + + # bug #147259 + dosym ../jre/javaws/javaws /opt/${P}/bin/javaws + dosym ../javaws/javaws /opt/${P}/jre/bin/javaws + + # create dir for system preferences + dodir /opt/${P}/.systemPrefs + # Create files used as storage for system preferences. + touch "${D}/opt/${P}/.systemPrefs/.system.lock" + chmod 644 "${D}/opt/${P}/.systemPrefs/.system.lock" + touch "${D}/opt/${P}/.systemPrefs/.systemRootModFile" + chmod 644 "${D}/opt/${P}/.systemPrefs/.systemRootModFile" + + # install control panel for Gnome/KDE + sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \ + -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \ + "${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop" > \ + "${T}/sun_java-${SLOT}.desktop" + + domenu "${T}/sun_java-${SLOT}.desktop" + + set_java_env + java-vm_revdep-mask +} diff -r 11adf80154c3 -r 24790a7e3ea2 dev-util/bouml/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-util/bouml/Manifest Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,2 @@ +DIST bouml_4.4.1.tar.gz 4621079 RMD160 6e532366a3efa399944675c88d63549c695ea0ef SHA1 edef76f9de7e6d74d67778d3c135323b1ac4ab1c SHA256 d73117423d5b79549e5520e8d816c88eecb4400533fd8bffa7584003739fb3d6 +EBUILD bouml-4.4.1.ebuild 863 RMD160 47066bd3274de00e80f41fbe4238b37e65029d8e SHA1 1e8919260fa88786101ace8225f4e68a3b628022 SHA256 84b59c27cd15b4ed4a1b15a712492c547606df27a31990929c3d9a7a76c1fbb5 diff -r 11adf80154c3 -r 24790a7e3ea2 dev-util/bouml/bouml-4.4.1.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-util/bouml/bouml-4.4.1.ebuild Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,34 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/bouml/bouml-3.4.ebuild,v 1.1 2007/12/23 21:27:06 ferdy Exp $ + +inherit multilib qt3 + +MY_P="${PN}_${PV}" + +DESCRIPTION="Free UML 2 tool with code generation" +HOMEPAGE="http://bouml.free.fr/" +SRC_URI="http://bouml.free.fr/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-fbsd" +IUSE="" + +DEPEND="x11-libs/qt:3" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_compile() { + find src/ genplugouts/ -type f -name "*.pro" | while read file; do + local subdir="${file%/*}" + eqmake3 "${file}" -o "${subdir}"/Makefile + emake -C "${subdir}" || die "emake failed in ${subdir}" + done +} + +src_install() { + emake BOUML_LIB="/usr/$(get_libdir)/bouml" DESTDIR="${D}" install \ + || die "emake install failed" +} diff -r 11adf80154c3 -r 24790a7e3ea2 dev-util/mercurial/Manifest diff -r 11adf80154c3 -r 24790a7e3ea2 dev-util/subversion/Manifest --- a/dev-util/subversion/Manifest Tue Nov 24 10:58:16 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -AUX 1.5.0/70svn-gentoo.el 435 RMD160 e9f4b2e5511523c124f9ba3781249db2860fe5a7 SHA1 c3a3081f79a579b848369cfae76662a98e97687e SHA256 a39bea9a821aa91c7990dd07e1c2d0cec79f1efaac04e2d61882b7c8d5346a34 -AUX 1.5.0/80subversion-extras 62 RMD160 c334b15a86eaf19129afa5b62558dd47504a4e3d SHA1 ba05e978e7ff7b047ec99225e4d932036c340d26 SHA256 758d07cf161fff5e0afef5791dca641d3af58192ad1e4874c5f5c2c285c1149d -AUX 1.5.0/disable-unneeded-linking.patch 2409 RMD160 0d7c34cc83eff7d08369128762ed714fabcd1dde SHA1 92b80f6cb30fe569f79368aea66027a6da022c53 SHA256 2ef8fcd9fabfd1a71bdd50e1156cb9d421a7008fccd73b7ae3536e9a30886231 -AUX 70svn-gentoo.el 331 RMD160 1de1310ae7e4bdbecef3c685ef8d7ff95b9aab87 SHA1 48eb99e9d494a4a674de32e599914df234b627cd SHA256 c0d733bd3f7c75c47acaea4fd0c816d45ee2cd765da70dc494666f38c91e3d87 -AUX svnserve.confd 323 RMD160 cbf4d810d9f41bac1611004741170d1047cbeef0 SHA1 39e922bc777ba847eb85d421d92f560f84b895b5 SHA256 90d3e2532715a6230ebf65023566a6591eed4b3fc12abbca0d2fb7949e146006 -AUX svnserve.confd2 320 RMD160 dc1e74d06d9bd3eeb1a8dfd20aacebecd8378abb SHA1 557191219c3afa90126b8a2bfe7dd62b8a09eb82 SHA256 c70655c073dc06f538c5acdbcd49e216f4be2c859ce395bdf78757a1eeccab00 -AUX svnserve.initd 817 RMD160 59f4e8e983d4595b7c27615889a9c0809d015a18 SHA1 483b47512fb444c0f752ad4eb6c3252f659a967e SHA256 6b483e211b5c311079605e246fca9228c7e5762d27a023fa4c4529fdaa766b08 -AUX svnserve.xinetd 332 RMD160 c2fc4eb02da7e7405756fce650b8897f0a9da7f7 SHA1 d7d478fc257a40626888f9b12ee218df55dac570 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2 -AUX vc-svn.el 16847 RMD160 8665b9a34c8fd9acae40e18aac33026aff3a39d7 SHA1 4d1a5a9331ff96e943244a6d5538e4f0abeac9e7 SHA256 b4979d5df9fba02dbc8ad71d813229222e95ee1e8e89dec3060611d2d6be87aa -DIST subversion-1.5.6.tar.bz2 4946600 RMD160 5883f925e19e719c8656b5488ed9b00c0f7c3a79 SHA1 774b6dbd4245c36e86289393e651e36dedf17018 SHA256 f701fe75fecc43d9aecf717260ca18661469128a2f28a57c7e6672f3f64f46c2 -EBUILD subversion-1.5.6.ebuild 13393 RMD160 0ef259d6fc6440536d9fb74c1fc24ad08b8c1997 SHA1 13bb283d304eedc5e1e9937be804e41e4db48015 SHA256 17e47cc89d09b11c79a924b8765a90d2bb0944506e54ab434c4a2016aca95a66 -MISC metadata.xml 958 RMD160 9e4aa5a4dfeef1a81c20121e8e75baf45d0962ca SHA1 c8844225273473a569cefae106533215961c287f SHA256 396a72dd2fddb8fb146ce87fa05692ab9f7d183057c0940d9365f88602a03dc7 diff -r 11adf80154c3 -r 24790a7e3ea2 dev-util/subversion/files/1.5.0/70svn-gentoo.el --- a/dev-util/subversion/files/1.5.0/70svn-gentoo.el Tue Nov 24 10:58:16 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -;;; svn site-lisp configuration - -(add-to-list 'load-path "@SITELISP@") -(and (< emacs-major-version 22) - (add-to-list 'load-path "@SITELISP@/compat")) -(add-to-list 'vc-handled-backends 'SVN) - -(defalias 'svn-examine 'svn-status) -(autoload 'svn-status "dsvn" "Run `svn status'." t) -(autoload 'svn-update "dsvn" "Run `svn update'." t) -(autoload 'svn-status "psvn" - "Examine the status of Subversion working copy in directory DIR." t) diff -r 11adf80154c3 -r 24790a7e3ea2 dev-util/subversion/files/1.5.0/80subversion-extras --- a/dev-util/subversion/files/1.5.0/80subversion-extras Tue Nov 24 10:58:16 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -ROOTPATH=/usr/lib/subversion/bin -PATH=/usr/lib/subversion/bin diff -r 11adf80154c3 -r 24790a7e3ea2 dev-util/subversion/files/1.5.0/disable-unneeded-linking.patch --- a/dev-util/subversion/files/1.5.0/disable-unneeded-linking.patch Tue Nov 24 10:58:16 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -234,6 +234,8 @@ - AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_PATCH, $SVN_FS_WANT_DB_PATCH, - [The desired patch version for the Berkeley DB]) - -+AC_SUBST(SVN_DB_LIBS) -+ - SVN_LIB_SASL - - if test "$svn_lib_sasl" = "yes"; then ---- Makefile.in -+++ Makefile.in -@@ -40,9 +40,10 @@ - NEON_LIBS = @NEON_LIBS@ - SVN_APR_LIBS = @SVN_APR_LIBS@ - SVN_APRUTIL_LIBS = @SVN_APRUTIL_LIBS@ --SVN_DB_LIBS = --SVN_SERF_LIBS = @SVN_SERF_LIBS@ -+SVN_DB_LIBS = @SVN_DB_LIBS@ - SVN_SASL_LIBS = @SVN_SASL_LIBS@ -+SVN_SERF_LIBS = @SVN_SERF_LIBS@ -+SVN_XML_LIBS = -lexpat - SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@ - - LIBS = @LIBS@ ---- build/ac-macros/aprutil.m4 -+++ build/ac-macros/aprutil.m4 -@@ -72,16 +72,14 @@ - AC_MSG_ERROR([apu-config --includes failed]) - fi - -- dnl When APR stores the dependent libs in the .la file, we don't need -- dnl --libs. -- SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`" -+ SVN_APRUTIL_LIBS="`$apu_config --link-libtool`" - if test $? -ne 0; then -- AC_MSG_ERROR([apu-config --link-libtool --libs failed]) -+ AC_MSG_ERROR([apu-config --link-libtool failed]) - fi - -- SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`" -+ SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld`" - if test $? -ne 0; then -- AC_MSG_ERROR([apu-config --link-ld --libs failed]) -+ AC_MSG_ERROR([apu-config --link-ld failed]) - fi - - AC_SUBST(SVN_APRUTIL_INCLUDES) ---- build/ac-macros/apr.m4 -+++ build/ac-macros/apr.m4 -@@ -74,16 +74,14 @@ - AC_MSG_ERROR([apr-config --prefix failed]) - fi - -- dnl When APR stores the dependent libs in the .la file, we don't need -- dnl --libs. -- SVN_APR_LIBS="`$apr_config --link-libtool --libs`" -+ SVN_APR_LIBS="`$apr_config --link-libtool`" - if test $? -ne 0; then -- AC_MSG_ERROR([apr-config --link-libtool --libs failed]) -+ AC_MSG_ERROR([apr-config --link-libtool failed]) - fi - -- SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`" -+ SVN_APR_EXPORT_LIBS="`$apr_config --link-ld`" - if test $? -ne 0; then -- AC_MSG_ERROR([apr-config --link-ld --libs failed]) -+ AC_MSG_ERROR([apr-config --link-ld failed]) - fi - - SVN_APR_SHLIB_PATH_VAR="`$apr_config --shlib-path-var`" ---- build/ac-macros/berkeley-db.m4 -+++ build/ac-macros/berkeley-db.m4 -@@ -218,5 +218,6 @@ - - CPPFLAGS="$svn_lib_berkeley_db_try_save_cppflags" - LIBS="$svn_lib_berkeley_db_try_save_libs" -+ SVN_DB_LIBS="$svn_apu_bdb_lib" - ] - ) diff -r 11adf80154c3 -r 24790a7e3ea2 dev-util/subversion/files/70svn-gentoo.el --- a/dev-util/subversion/files/70svn-gentoo.el Tue Nov 24 10:58:16 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -;;; svn site-lisp configuration - -(add-to-list 'load-path "@SITELISP@") -(and (< emacs-major-version 22) - (add-to-list 'load-path "@SITELISP@/compat")) -(add-to-list 'vc-handled-backends 'SVN) - -(defalias 'svn-examine 'svn-status) -(autoload 'svn-status "psvn" - "Examine the status of Subversion working copy in directory DIR." t) diff -r 11adf80154c3 -r 24790a7e3ea2 dev-util/subversion/files/svnserve.confd --- a/dev-util/subversion/files/svnserve.confd Tue Nov 24 10:58:16 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -# The commented variables in this file are the defaults that are used -# in the init-script. You don't need to uncomment them except to -# customize them to different values. - -# Options for svnserve -#SVNSERVE_OPTS="--root=/var/svn" - -# User and group as which to run svnserve -#SVNSERVE_USER="apache" -#SVNSERVE_GROUP="apache" diff -r 11adf80154c3 -r 24790a7e3ea2 dev-util/subversion/files/svnserve.confd2 --- a/dev-util/subversion/files/svnserve.confd2 Tue Nov 24 10:58:16 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -# The commented variables in this file are the defaults that are used -# in the init-script. You don't need to uncomment them except to -# customize them to different values. - -# Options for svnserve -#SVNSERVE_OPTS="--root=/var/svn" - -# User and group as which to run svnserve -SVNSERVE_USER="svn" -SVNSERVE_GROUP="svnusers" diff -r 11adf80154c3 -r 24790a7e3ea2 dev-util/subversion/files/svnserve.initd --- a/dev-util/subversion/files/svnserve.initd Tue Nov 24 10:58:16 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -#!/sbin/runscript -# Copyright 2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/files/svnserve.initd,v 1.2 2005/08/25 13:59:48 pauldv Exp $ - -depend() { - need net -} - -start() { - ebegin "Starting svnserve" - # Ensure that we run from a readable working dir, and that we do not - # lock filesystems when being run from such a location. - cd / - start-stop-daemon --start --quiet --background --make-pidfile \ - --pidfile /var/run/svnserve.pid --exec /usr/bin/svnserve \ - --chuid ${SVNSERVE_USER:-apache}:${SVNSERVE_GROUP:-apache} -- \ - --foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn} - eend $? -} - -stop() { - ebegin "Stopping svnserve" - start-stop-daemon --stop --quiet --pidfile /var/run/svnserve.pid - eend $? -} diff -r 11adf80154c3 -r 24790a7e3ea2 dev-util/subversion/files/svnserve.xinetd --- a/dev-util/subversion/files/svnserve.xinetd Tue Nov 24 10:58:16 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -service svn -{ - socket_type = stream - wait = no - user = apache - group = apache - umask = 002 - protocol = tcp - log_on_failure += USERID HOST - port = 3690 - server = /usr/bin/svnserve - server_args = -i - disable = yes -} diff -r 11adf80154c3 -r 24790a7e3ea2 dev-util/subversion/files/vc-svn.el --- a/dev-util/subversion/files/vc-svn.el Tue Nov 24 10:58:16 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,414 +0,0 @@ -;;;; vc-svn.el --- a VC backend for Subversion -;;;; Jim Blandy --- July 2002 - -;;; Writing this back end has shown up some problems in VC: bugs, -;;; shortcomings in the back end interface, and so on. But I want to -;;; first produce code that Subversion users can use with an already -;;; released Emacs distribution. -;;; -;;; So for now we're working within the limitations of the released -;;; VC; once we've got something functional, then we can start writing -;;; VC patches. - - -;;; To make this file load on demand, put this file into a directory -;;; in `load-path', and add this line to a startup file: -;;; -;;; (add-to-list 'vc-handled-backends 'SVN) - - -;;; To do here: -;;; Provide more of the optional VC backend functions: -;;; - dir-state -;;; - merge across arbitrary revisions -;;; -;;; Maybe we want more info in mode-line-string. Status of props? Status -;;; compared to what's in the repository (svn st -u) ? -;;; -;;; VC passes the vc-svn-register function a COMMENT argument, which -;;; is like the file description in CVS and RCS. Could we store the -;;; COMMENT as a Subversion property? Would that show up in fancy DAV -;;; web folder displays, or would it just languish in obscurity, the -;;; way CVS and RCS descriptions do? -;;; -;;; After manual merging, need some way to run `svn resolved'. Perhaps -;;; we should just prompt for approval when somebody tries to commit a -;;; conflicted file? -;;; -;;; vc-svn ought to handle more gracefully an attempted commit that -;;; fails with "Transaction is out of date". Probably the best -;;; approach is to ask "file is not up-to-date; do you want to merge -;;; now?" I think vc-cvs does this. -;;; -;;; Perhaps show the "conflicted" marker in the modeline? -;;; -;;; If conflicted, before committing or merging, ask the user if they -;;; want to mark the file as resolved. -;;; -;;; Won't searching for strings in svn output cause trouble if the -;;; locale language is not English? -;;; -;;; After merging news, need to recheck our idea of which workfile -;;; version we have. Reverting the file does this but we need to -;;; force it. Note that this can be necessary even if the file has -;;; not changed. -;;; -;;; Does everything work properly if we're rolled back to an old -;;; revision? -;;; -;;; Perhaps need to implement vc-svn-latest-on-branch-p? - - -;;; To do in VC: -;;; -;;; Make sure vc's documentation for `workfile-unchanged-p' default -;;; function mentions that it must not run asynchronously, and the -;;; symptoms if it does. -;;; -;;; Fix logic for finding log entries. -;;; -;;; Allow historical diff to choose an appropriate default previous -;;; revision number. I think this entails moving vc-previous-revision -;;; et al into the back end. -;;; -;;; Should vc-BACKEND-checkout really have to set the workfile version -;;; itself? -;;; -;;; Fix smerge for svn conflict markers. -;;; -;;; We can have files which are not editable for reasons other than -;;; needing to be checked out. For example, they might be a read-only -;;; view of an old revision opened with [C-x v ~]. (See vc-merge) -;;; -;;; Would be nice if there was a way to mark a file as -;;; just-checked-out, aside from updating the checkout-time property -;;; which in theory is not to be changed by backends. - - -(add-to-list 'vc-handled-backends 'SVN) - -(defcustom vc-svn-program-name "svn" - "*Name of Subversion client program, for use by Emacs's VC package." - :type 'string - :group 'vc - :version "21.2.90.2") - -(defcustom vc-svn-diff-switches nil - "*A string or list of strings specifying extra switches for `svn diff' under VC." - :type '(repeat string) - :group 'vc - :version "21.2.90.2") - -(defun vc-svn-registered (file) - "Return true if FILE is registered under Subversion." - ;; First, a quick false positive test: is there a `.svn/entries' file? - (and (file-exists-p (expand-file-name ".svn/entries" - (file-name-directory file))) - (not (null (vc-svn-run-status file))))) - - -(put 'vc-svn-with-output-buffer 'lisp-indent-function 0) -(defmacro vc-svn-with-output-buffer (&rest body) - "Save excursion, switch to buffer ` *Subversion Output*', and erase it." - `(save-excursion - ;; Let's not delete this buffer when we're done --- leave - ;; it around for debugging. - (set-buffer (get-buffer-create " *Subversion Output*")) - (erase-buffer) - ,@body)) - - -(defun vc-svn-pop-up-error (&rest args) - "Pop up the Subversion output buffer, and raise an error with ARGS." - (pop-to-buffer " *Subversion Output*") - (goto-char (point-min)) - (shrink-window-if-larger-than-buffer) - (apply 'error args)) - - -(defun vc-svn-run-status (file &optional update) - "Run `svn status -v' on FILE, and return the result. -If optional arg UPDATE is true, pass the `-u' flag to check against -the repository, across the network. -See `vc-svn-parse-status' for a description of the result." - (vc-svn-with-output-buffer - - ;; We should call vc-do-command here, but Subversion exits with an - ;; error status if FILE isn't under its control, and we want to - ;; return that as nil, not display it to the user. We can tell - ;; vc-do-command to - - (let ((status (apply 'call-process vc-svn-program-name nil t nil - (append '("status" "-v") - (if update '("-u") '()) - (list file))))) - (goto-char (point-min)) - (if (not (equal 0 status)) ; not zerop; status can be a string - ;; If you ask for the status of a file that isn't even in a - ;; Subversion-controlled directory, then Subversion exits with - ;; this error. - (if (or (looking-at "\\(.*\n\\)*.*is not a working copy") - (looking-at "\\(.*\n\\)*.*is not a versioned resource") - (looking-at "\\(.*\n\\)*.*: No such file or directory")) - nil - ;; Other errors we should actually report to the user. - (vc-svn-pop-up-error - "Error running Subversion to check status of `%s'" - (file-name-nondirectory file))) - - ;; Otherwise, we've got valid status output in the buffer, so - ;; just parse that. - (vc-svn-parse-status))))) - - -(defun vc-svn-parse-status () - "Parse the output from `svn status -v' at point. -We return nil for a file not under Subversion's control, -or (STATE LOCAL CHANGED) for files that are, where: -STATE is the file's VC state (see the documentation for `vc-state'), -LOCAL is the base revision in the working copy, and -CHANGED is the last revision in which it was changed. -Both LOCAL and CHANGED are strings, not numbers. -If we passed `svn status' the `-u' flag, then CHANGED could be a later -revision than LOCAL. -If the file is newly added, LOCAL is \"0\" and CHANGED is nil." - (let ((state (vc-svn-parse-state-only))) - (cond - ((not state) nil) - ;; A newly added file has no revision. - ((looking-at "....\\s-+\\(\\*\\s-+\\)?[-0]\\s-+\\?") - (list state "0" nil)) - ((looking-at "....\\s-+\\(\\*\\s-+\\)?\\([0-9]+\\)\\s-+\\([0-9]+\\)") - (list state - (match-string 2) - (match-string 3))) - ((looking-at "^I +") nil) ;; An ignored file - ((looking-at " \\{40\\}") nil) ;; A file that is not in the wc nor svn? - (t (error "Couldn't parse output from `svn status -v'"))))) - - -(defun vc-svn-parse-state-only () - "Parse the output from `svn status -v' at point, and return a state. -The documentation for the function `vc-state' describes the possible values." - (cond - ;; Be careful --- some of the later clauses here could yield false - ;; positives, if the clauses preceding them didn't screen those - ;; out. Making a pattern more selective could break something. - - ;; nil The given file is not under version control, - ;; or does not exist. - ((looking-at "\\?\\|^$") nil) - - ;; 'needs-patch The file has not been edited by the - ;; user, but there is a more recent version - ;; on the current branch stored in the - ;; master file. - ((looking-at " ..\\s-+\\*") 'needs-patch) - - ;; 'up-to-date The working file is unmodified with - ;; respect to the latest version on the - ;; current branch, and not locked. - ;; - ;; This is also returned for files which do not - ;; exist, as will be the case when finding a - ;; new file in a svn-controlled directory. That - ;; case is handled in vc-svn-parse-status. - ((looking-at " ") 'up-to-date) - - ;; 'needs-merge The file has been edited by the user, - ;; and there is also a more recent version - ;; on the current branch stored in the - ;; master file. This state can only occur - ;; if locking is not used for the file. - ((looking-at "\\S-+\\s-+\\*") 'needs-merge) - - ;; 'edited The working file has been edited by the - ;; user. If locking is used for the file, - ;; this state means that the current - ;; version is locked by the calling user. - (t 'edited))) - - -;;; Is it really safe not to check for updates? I haven't seen any -;;; cases where failing to check causes a problem that is not caught -;;; in some other way. However, there *are* cases where checking -;;; needlessly causes network delay, such as C-x v v. The common case -;;; is for the commit to be OK; we can handle errors if they occur. -- mbp -(defun vc-svn-state (file) - "Return the current version control state of FILE. -For a list of possible return values, see `vc-state'. - -This function should do a full and reliable state computation; it is -usually called immediately after `C-x v v'. `vc-svn-state-heuristic' -provides a faster heuristic when visiting a file. - -For svn this does *not* check for updates in the repository, because -that needlessly slows down vc when the repository is remote. Instead, -we rely on Subversion to trap situations such as needing a merge -before commit." - (car (vc-svn-run-status file))) - - -(defun vc-svn-state-heuristic (file) - "Estimate the version control state of FILE at visiting time. -For a list of possible values, see the doc string of `vc-state'. -This is supposed to be considerably faster than `vc-svn-state'. It -just runs `svn status -v', without the `-u' flag, so it's a strictly -local operation." - (car (vc-svn-run-status file))) - - - -(defun vc-svn-workfile-version (file) - "Return the current workfile version of FILE." - (cadr (vc-svn-run-status file))) - - -(defun vc-svn-checkout-model (file) - 'implicit) - - -(defun vc-svn-register (file &optional rev comment) - "Register FILE with Subversion. -REV is an initial revision; Subversion ignores it. -COMMENT is an initial description of the file; currently this is ignored." - (vc-svn-with-output-buffer - (let ((status (call-process vc-svn-program-name nil t nil "add" file))) - (or (equal 0 status) ; not zerop; status can be a string - (vc-svn-pop-up-error "Error running Subversion to add `%s'" - (file-name-nondirectory file)))))) - - -(defun vc-svn-checkin (file rev comment) - (apply 'vc-do-command nil 0 vc-svn-program-name file - "commit" (if comment (list "-m" comment) '()))) - - -(defun vc-svn-checkout (file &optional editable rev destfile) - "Check out revision REV of FILE into the working area. -The EDITABLE argument must be non-nil, since Subversion doesn't -support locking. -If REV is non-nil, that is the revision to check out (default is -current workfile version). If REV is the empty string, that means to -check out the head of the trunk. For Subversion, that's equivalent to -passing nil. -If optional arg DESTFILE is given, it is an alternate filename to -write the contents to; we raise an error." - (unless editable - (error "VC asked Subversion to check out a read-only copy of file")) - (when destfile - (error "VC asked Subversion to check out a file under another name")) - (when (equal rev "") - (setq rev nil)) - (apply 'vc-do-command nil 0 vc-svn-program-name file - "update" (if rev (list "-r" rev) '())) - (vc-file-setprop file 'vc-workfile-version nil)) - - -(defun vc-svn-revert (file &optional contents-done) - "Revert FILE back to the current workfile version. -If optional arg CONTENTS-DONE is non-nil, then the contents of FILE -have already been reverted from a version backup, and this function -only needs to update the status of FILE within the backend. This -function ignores the CONTENTS-DONE argument." - (vc-do-command nil 0 vc-svn-program-name file "revert")) - - -(defun vc-svn-merge-news (file) - "Merge recent changes into FILE. - -This calls `svn update'. In the case of conflicts, Subversion puts -conflict markers into the file and leaves additional temporary files -containing the `ancestor', `mine', and `other' files. - -You may need to run `svn resolved' by hand once these conflicts have -been resolved. - -Returns a vc status, which is used to determine whether conflicts need -to be merged." - (prog1 - (vc-do-command nil 0 vc-svn-program-name file "update") - - ;; This file may not have changed in the revisions which were - ;; merged, which means that its mtime on disk will not have been - ;; updated. However, the workfile version may still have been - ;; updated, and we want that to be shown correctly in the - ;; modeline. - - ;; vc-cvs does something like this - (vc-file-setprop file 'vc-checkout-time 0) - (vc-file-setprop file 'vc-workfile-version - (vc-svn-workfile-version file)))) - - -(defun vc-svn-print-log (file) - "Insert the revision log of FILE into the *vc* buffer." - (vc-do-command nil 'async vc-svn-program-name file "log")) - - -(defun vc-svn-show-log-entry (version) - "Search the log entry for VERSION in the current buffer. -Make sure it is displayed in the buffer's window." - (when (re-search-forward (concat "^-+\n\\(rev\\) " - (regexp-quote version) - ":[^|]+|[^|]+| [0-9]+ lines?")) - (goto-char (match-beginning 1)) - (recenter 1))) - - -(defun vc-svn-diff (file &optional rev1 rev2) - "Insert the diff for FILE into the *vc-diff* buffer. -If REV1 and REV2 are non-nil, report differences from REV1 to REV2. -If REV1 is nil, use the current workfile version (as found in the -repository) as the older version; if REV2 is nil, use the current -workfile contents as the newer version. -This function returns a status of either 0 (no differences found), or -1 (either non-empty diff or the diff is run asynchronously)." - (let* ((diff-switches-list - ;; In Emacs 21.3.50 or so, the `vc-diff-switches-list' macro - ;; started requiring its symbol argument to be quoted. - (condition-case nil - (vc-diff-switches-list svn) - (void-variable (vc-diff-switches-list 'SVN)))) - (status (vc-svn-run-status file)) - (local (elt status 1)) - (changed (elt status 2)) - - ;; If rev1 is the default (the base revision) set it to nil. - ;; This is nice because it lets us recognize when the diff - ;; will run locally, and thus when we shouldn't bother to run - ;; it asynchronously. But it's also necessary, since a diff - ;; for vc-default-workfile-unchanged-p *must* run - ;; synchronously, or else you'll end up with two diffs in the - ;; *vc-diff* buffer. `vc-diff-workfile-unchanged-p' passes - ;; the base revision explicitly, but this kludge lets us - ;; recognize that we can run the diff synchronously anyway. - ;; Fragile, no? - (rev1 (if (and rev1 (not (equal rev1 local))) rev1)) - - (rev-switches-list - (cond - ;; Given base rev against given rev. - ((and rev1 rev2) (list "-r" (format "%s:%s" rev1 rev2))) - ;; Given base rev against working copy. - (rev1 (list "-r" rev1)) - ;; Working copy base against given rev. - (rev2 (list "-r" (format "%s:%s" local rev2))) - ;; Working copy base against working copy. - (t '()))) - - ;; Run diff asynchronously if we're going to have to go - ;; across the network. - (async (or rev1 rev2))) - - (let ((status (apply 'vc-do-command "*vc-diff*" (if async 'async 0) - vc-svn-program-name file - (append '("diff") rev-switches-list)))) - (if (or async (> (buffer-size (get-buffer "*vc-diff*")) 0)) - 1 0)))) - -(defun vc-svn-find-version (file rev buffer) - (vc-do-command buffer 0 vc-svn-program-name file - "cat" "-r" rev)) - -(provide 'vc-svn) diff -r 11adf80154c3 -r 24790a7e3ea2 dev-util/subversion/metadata.xml --- a/dev-util/subversion/metadata.xml Tue Nov 24 10:58:16 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ - - - - - hollow@gentoo.org - Benedikt Böhm - Gentoo Subversion maintainer - - - Arfrever.FTA@GMail.Com - Arfrever Frehtes Taifersar Arahesis - Subversion upstream representative - - - Enable runtime module search - Install extras scripts (examples, tools, hooks) - Disables WebDAV support via neon library - Install scripts for svnserve - Enable WebDAV support using net-misc/neon - Enable WebDAV support using net-libs/serf - - diff -r 11adf80154c3 -r 24790a7e3ea2 dev-util/subversion/subversion-1.5.6.ebuild --- a/dev-util/subversion/subversion-1.5.6.ebuild Tue Nov 24 10:58:16 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,412 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.4.ebuild,v 1.11 2008/12/07 12:13:48 vapier Exp $ - -EAPI="1" -WANT_AUTOMAKE="none" - -inherit autotools bash-completion confutils depend.apache elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module python - -DESCRIPTION="Advanced version control system" -HOMEPAGE="http://subversion.tigris.org/" -SRC_URI="http://subversion.tigris.org/downloads/${P/_/-}.tar.bz2" - -LICENSE="Subversion" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="apache2 berkdb debug doc +dso emacs extras java nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf" -RESTRICT="test" - -CDEPEND=">=dev-libs/apr-1.2.8 - >=dev-libs/apr-util-1.2.8 - dev-libs/expat - sys-libs/zlib - berkdb? ( =sys-libs/db-4* ) - emacs? ( virtual/emacs ) - ruby? ( >=dev-lang/ruby-1.8.2 ) - sasl? ( dev-libs/cyrus-sasl ) - webdav-neon? ( >=net-misc/neon-0.28 ) - webdav-serf? ( net-libs/serf )" - -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.5 ) - nls? ( virtual/libintl ) - perl? ( dev-perl/URI )" - -DEPEND="${CDEPEND} - doc? ( app-doc/doxygen ) - java? ( >=virtual/jdk-1.5 ) - nls? ( sys-devel/gettext )" - -want_apache - -S="${WORKDIR}"/${P/_/-} - -# Allow for custom repository locations. -# This can't be in pkg_setup because the variable needs to be available to -# pkg_config. -: ${SVN_REPOS_LOC:=/var/svn} - -pkg_setup() { - confutils_use_depend_built_with_all berkdb dev-libs/apr-util berkdb - java-pkg-opt-2_pkg_setup - - if ! use webdav-neon && ! use webdav-serf; then - ewarn - ewarn "WebDAV support is disabled. You need WebDAV to" - ewarn "access repositories through the HTTP protocol." - ewarn - ewarn "WebDAV support needs one of the following USE flags enabled:" - ewarn " webdav-neon webdav-serf" - ewarn - ewarn "You can do this by enabling one of these flags in /etc/portage/package.use:" - ewarn " =${CATEGORY}/${PF} webdav-neon webdav-serf" - ewarn - ebeep - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/1.5.0/disable-unneeded-linking.patch - - sed -i \ - -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ - -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac - - sed -e 's:@bindir@/svn-contrib:@libdir@/subversion/bin:' \ - -e 's:@bindir@/svn-tools:@libdir@/subversion/bin:' \ - -i Makefile.in - - eautoconf - elibtoolize -} - -src_compile() { - local myconf - - if use python || use perl || use ruby; then - myconf="${myconf} --with-swig" - else - myconf="${myconf} --without-swig" - fi - - if use debug; then - append-cppflags -DSVN_DEBUG -DAP_DEBUG - fi - - append-flags -fno-strict-aliasing - - econf ${myconf} \ - $(use_with apache2 apxs "${APXS}") \ - $(use_with berkdb berkeley-db) \ - $(use_enable dso runtime-module-search) \ - $(use_enable java javahl) \ - $(use_with java jdk "${JAVA_HOME}") \ - $(use_enable nls) \ - $(use_with sasl) \ - $(use_with webdav-neon neon /usr) \ - $(use_with webdav-serf serf /usr) \ - --with-apr=/usr/bin/apr-1-config \ - --with-apr-util=/usr/bin/apu-1-config \ - --disable-experimental-libtool \ - --without-jikes \ - --without-junit \ - --disable-mod-activation - - emake local-all || die "Building of core Subversion failed" - - if use python; then - emake swig-py || die "Building of Subversion Python bindings failed" - fi - - if use perl; then - emake -j1 swig-pl || die "Building of Subversion Perl bindings failed" - fi - - if use ruby; then - emake swig-rb || die "Building of Subversion Ruby bindings failed" - fi - - if use java; then - make JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl \ - || die "Building of Subversion JavaHL library failed" - fi - - if use emacs; then - elisp-compile contrib/client-side/emacs/{dsvn,psvn,vc-svn}.el \ - doc/svn-doc.el doc/tools/svnbook.el \ - || die "Compilation of Emacs modules failed" - fi - - if use extras; then - emake contrib || die "Building of contrib failed" - emake tools || die "Building of tools failed" - fi - - if use doc; then - doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" - - if use java; then - emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed" - fi - fi -} - -src_install() { - python_version - PYTHON_DIR=/usr/$(get_libdir)/python${PYVER} - - emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed" - - if use python; then - emake -j1 DESTDIR="${D}" DISTUTIL_PARAM="--prefix=${D}" LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" install-swig-py \ - || die "Installation of Subversion Python bindings failed" - - # Move Python bindings. - dodir "${PYTHON_DIR}/site-packages" - mv "${D}"/usr/$(get_libdir)/svn-python/svn "${D}${PYTHON_DIR}/site-packages" - mv "${D}"/usr/$(get_libdir)/svn-python/libsvn "${D}${PYTHON_DIR}/site-packages" - rm -Rf "${D}"/usr/$(get_libdir)/svn-python - fi - - if use perl; then - emake -j1 DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion Perl bindings failed" - fixlocalpod - fi - - if use ruby; then - emake -j1 DESTDIR="${D}" install-swig-rb || die "Installation of Subversion Ruby bindings failed" - fi - - if use java; then - emake -j1 DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed" - java-pkg_regso "${D}"/usr/$(get_libdir)/libsvnjavahl*.so - java-pkg_dojar "${D}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar - rm -Rf "${D}"/usr/$(get_libdir)/svn-javahl/*.jar - fi - - # Install Apache module configuration. - if use apache2; then - dodir "${APACHE_MODULES_CONFDIR}" - cat <"${D}/${APACHE_MODULES_CONFDIR}"/47_mod_dav_svn.conf - -LoadModule dav_svn_module modules/mod_dav_svn.so - -LoadModule authz_svn_module modules/mod_authz_svn.so - - -# Example configuration: -# -# DAV svn -# SVNPath ${SVN_REPOS_LOC}/repos -# AuthType Basic -# AuthName "Subversion repository" -# AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers -# Require valid-user -# - -EOF - fi - - # Install Bash Completion, bug 43179. - dobashcompletion tools/client-side/bash_completion subversion - rm -f tools/client-side/bash_completion - - # Install hot backup script, bug 54304. - newbin tools/backup/hot-backup.py svn-hot-backup - rm -fr tools/backup - - # Install svn_load_dirs.pl. - if use perl; then - newbin contrib/client-side/svn_load_dirs/svn_load_dirs.pl svn-load-dirs - fi - rm -f contrib/client-side/svn_load_dirs/svn_load_dirs.pl - - # Install svnserve init-script and xinet.d snippet, bug 43245. - newinitd "${FILESDIR}"/svnserve.initd svnserve - if use apache2; then - newconfd "${FILESDIR}"/svnserve.confd svnserve - else - newconfd "${FILESDIR}"/svnserve.confd2 svnserve - fi - insinto /etc/xinetd.d - newins "${FILESDIR}"/svnserve.xinetd svnserve - - # Install documentation. - dodoc CHANGES COMMITTERS README - dohtml www/hacking.html - dodoc tools/xslt/svnindex.{css,xsl} - rm -fr tools/xslt - - # Install Vim syntax files. - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins contrib/client-side/vim/svn.vim - fi - rm -f contrib/client-side/vim/svn.vim - - # Install Emacs Lisps. - if use emacs; then - elisp-install ${PN} contrib/client-side/emacs/{dsvn,psvn}.{el,elc} \ - doc/svn-doc.{el,elc} doc/tools/svnbook.{el,elc} \ - || die "Installation of Emacs modules failed" - elisp-install ${PN}/compat contrib/client-side/emacs/vc-svn.{el,elc} \ - || die "Installation of Emacs modules failed" - touch "${D}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/1.5.0/70svn-gentoo.el \ - || die "Installation of Emacs site-init file failed" - fi - rm -fr contrib/client-side/emacs - - # Install extra files. - if use extras; then - doenvd "${FILESDIR}"/1.5.0/80subversion-extras - - emake DESTDIR="${D}" install-contrib || die "Installation of contrib failed" - emake DESTDIR="${D}" install-tools || die "Installation of tools failed" - - find contrib tools '(' -name "*.bat" -o -name "*.in" -o -name ".libs" ')' -print0 | xargs -0 rm -fr - rm -fr contrib/client-side/{svn-push,svnmucc} - rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* - rm -fr tools/{buildbot,dev,diff,po} - - insinto /usr/share/${PN} - doins -r contrib tools - fi - - if use doc; then - dohtml doc/doxygen/html/* - - insinto /usr/share/doc/${PF} - doins -r notes - ecompressdir /usr/share/doc/${PF}/notes - - if use java; then - java-pkg_dojavadoc doc/javadoc - fi - fi -} - -pkg_preinst() { - # Compare versions of Berkeley DB, bug 122877. - if use berkdb && [[ -f "${ROOT}usr/bin/svn" ]] ; then - OLD_BDB_VERSION="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - NEW_BDB_VERSION="$(scanelf -nq "${D}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then - CHANGED_BDB_VERSION=1 - fi - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen - use perl && perl-module_pkg_postinst - - elog "Subversion Server Notes" - elog "-----------------------" - elog - elog "If you intend to run a server, a repository needs to be created using" - elog "svnadmin (see man svnadmin) or the following command to create it in" - elog "${SVN_REPOS_LOC}:" - elog - elog " emerge --config =${CATEGORY}/${PF}" - elog - elog "Subversion has multiple server types, take your pick:" - elog - elog " - svnserve daemon: " - elog " 1. Edit /etc/conf.d/svnserve" - elog " 2. Fix the repository permissions (see \"Fixing the repository permissions\")" - elog " 3. Start daemon: /etc/init.d/svnserve start" - elog " 4. Make persistent: rc-update add svnserve default" - elog - elog " - svnserve via xinetd:" - elog " 1. Edit /etc/xinetd.d/svnserve (remove disable line)" - elog " 2. Fix the repository permissions (see \"Fixing the repository permissions\")" - elog " 3. Restart xinetd.d: /etc/init.d/xinetd restart" - elog - elog " - svn over ssh:" - elog " 1. Fix the repository permissions (see \"Fixing the repository permissions\")" - elog " Additionally run:" - elog " groupadd svnusers" - elog " chown -R root:svnusers ${SVN_REPOS_LOC}/repos" - elog " 2. Create an svnserve wrapper in /usr/local/bin to set the umask you" - elog " want, for example:" - elog " #!/bin/bash" - elog " . /etc/conf.d/svnserve" - elog " umask 007" - elog " exec /usr/bin/svnserve \${SVNSERVE_OPTS} \"\$@\"" - elog - - if use apache2; then - elog " - http-based server:" - elog " 1. Edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\"" - elog " 2. Create an htpasswd file:" - elog " htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME" - elog " 3. Fix the repository permissions (see \"Fixing the repository permissions\")" - elog " 4. Restart Apache: /etc/init.d/apache2 restart" - elog - fi - - elog " Fixing the repository permissions:" - elog " chmod -Rf go-rwx ${SVN_REPOS_LOC}/conf" - elog " chmod -Rf g-w,o-rwx ${SVN_REPOS_LOC}/repos" - elog " chmod -Rf g+rw ${SVN_REPOS_LOC}/repos/db" - elog " chmod -Rf g+rw ${SVN_REPOS_LOC}/repos/locks" - elog - - elog "If you intend to use svn-hot-backup, you can specify the number of" - elog "backups to keep per repository by specifying an environment variable." - elog "If you want to keep e.g. 2 backups, do the following:" - elog "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion" - elog "echo 'SVN_HOTBACKUP_BACKUPS_NUMBER=2' >> /etc/env.d/80subversion" - elog - - if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then - ewarn "You upgraded from an older version of Berkeley DB and may experience" - ewarn "problems with your repository. Run the following commands as root to fix it:" - ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" - ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen - use perl && perl-module_pkg_postrm -} - -pkg_config() { - if [[ ! -x "${ROOT}usr/bin/svnadmin" ]] ; then - die "You seem to only have built the Subversion client" - fi - - einfo ">>> Initializing the database in ${ROOT}${SVN_REPOS_LOC} ..." - if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]] ; then - echo "A Subversion repository already exists and I will not overwrite it." - echo "Delete \"${ROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version." - else - mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf" - - einfo ">>> Populating repository directory ..." - # Create initial repository. - "${ROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos" - - einfo ">>> Setting repository permissions ..." - SVNSERVE_USER="$(. "${ROOT}etc/conf.d/svnserve" ; echo "${SVNSERVE_USER}")" - SVNSERVE_GROUP="$(. "${ROOT}etc/conf.d/svnserve" ; echo "${SVNSERVE_GROUP}")" - if use apache2 ; then - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" - else - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" - enewgroup "${SVNSERVE_GROUP}" - enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP}" - fi - chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos" - chmod -Rf go-rwx "${ROOT}${SVN_REPOS_LOC}/conf" - chmod -Rf o-rwx "${ROOT}${SVN_REPOS_LOC}/repos" - fi -} diff -r 11adf80154c3 -r 24790a7e3ea2 layman/.keep_app-portage_layman-0 diff -r 11adf80154c3 -r 24790a7e3ea2 mail-filter/spambayes/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mail-filter/spambayes/Manifest Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,6 @@ +DIST spambayes-1.0.1.tar.gz 688955 RMD160 77a66c0d147a6f273029f67f0770129101c5cbd3 SHA1 07bfea7886c9941458c2688dc01a4deb041d8f31 SHA256 3f0417b4d1e7019bacddd4b817401aea7755a9cdafc04a31ba53d37ed348998e +DIST spambayes-1.0.3.tar.gz 696822 RMD160 689926117f4896abc5d7fc27f712b335241359df SHA1 30a0cdc11741ed1d86a9b0964c0fd756b56174e2 SHA256 db9f50e4518e1cc9e809ed3c516e41f7bae3da49a7f8990e9da6722a643f3e68 +DIST spambayes-1.0.4.tar.gz 697781 RMD160 6dfbaa5cc7eb14d9ddbb68c381580e793cb9c28e SHA1 a7b92eb8465a6ac093d29e64c539ff8348b08c26 SHA256 53c498d98e2f0a88d6edb928e3e1abcf65fc4aee8a98e142175809b9409d30aa +EBUILD spambayes-1.0.1.ebuild 1325 RMD160 ae6368e1d23e9e682cf512e59e91fd856de1d026 SHA1 1146a78562f9ca29bb154ef5b06b1b97c40c4bf3 SHA256 838f9b65d91b7fbaf5be9d8f6a807c7773074ea618440dd10c07ccd2f4ceac42 +EBUILD spambayes-1.0.3.ebuild 1325 RMD160 d70828530277153d87d276b40bcf891537ba43cc SHA1 3874bda86ebd71f7eb908ecdff42daf4262fa29f SHA256 4cbb1d41bb863f072f3051d67aba8f253db8736916718cad0af78017b319c5b9 +EBUILD spambayes-1.0.4.ebuild 1185 RMD160 c76faeca416fcf186170c1915aab4e284d1afade SHA1 54189565f5a125149516f3f442c5f289b42ef086 SHA256 1afc17bef3bb06791632a2b448d3b0e5ab64c63e39ff0404c33e217b1f1f312f diff -r 11adf80154c3 -r 24790a7e3ea2 mail-filter/spambayes/spambayes-1.0.1.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mail-filter/spambayes/spambayes-1.0.1.ebuild Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,48 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.0_rc1.ebuild,v 1.3 2004/06/24 22:22:43 agriffis Exp $ + +inherit distutils + +DESCRIPTION="An anti-spam filter using on Bayesian filtering" +HOMEPAGE="http://spambayes.sourceforge.net" +#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="http://mesh.dl.sourceforge.net/sourceforge/${PN}/${P}.tar.gz" + +RESTRICT="nomirror" + +LICENSE="PSF-2.2" +SLOT="0" +KEYWORDS="~x86 ~ppc" +IUSE="" + +DEPEND=">=dev-lang/python-2.2.2" + +# removing ".1" from the work directory name +#S=${WORKDIR}/${MY_P/.1} + +src_install() { + + distutils_src_install + dodoc *.txt || die "doc *.txt files failed" + + # someone might have benefits of the other documetation too, + # therefore added. + + docinto contrib || die "doc directory, contrib, fail" + dodoc contrib/* || die "doc contrib/* failed" + docinto utilities || die "doc directory, utilities, failed" + dodoc utilities/* || die "doc utilities/* failed" + docinto testtools || die "doc directory, testtools, failed" + dodoc testtools/* || die "doc testtools/* failed" + + exeinto /etc/init.d + newexe ${FILESDIR}/spambayespop3proxy.rc spambayespop3proxy + + insinto /etc + doins ${FILESDIR}/bayescustomize.ini + + keepdir /var/lib/spambayes + +} + diff -r 11adf80154c3 -r 24790a7e3ea2 mail-filter/spambayes/spambayes-1.0.3.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mail-filter/spambayes/spambayes-1.0.3.ebuild Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,48 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.0_rc1.ebuild,v 1.3 2004/06/24 22:22:43 agriffis Exp $ + +inherit distutils + +DESCRIPTION="An anti-spam filter using on Bayesian filtering" +HOMEPAGE="http://spambayes.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +#SRC_URI="http://mesh.dl.sourceforge.net/sourceforge/${PN}/${P}.tar.gz" + +RESTRICT="nomirror" + +LICENSE="PSF-2.2" +SLOT="0" +KEYWORDS="~x86 ~ppc" +IUSE="" + +DEPEND=">=dev-lang/python-2.2.2" + +# removing ".1" from the work directory name +#S=${WORKDIR}/${MY_P/.1} + +src_install() { + + distutils_src_install + dodoc *.txt || die "doc *.txt files failed" + + # someone might have benefits of the other documetation too, + # therefore added. + + docinto contrib || die "doc directory, contrib, fail" + dodoc contrib/* || die "doc contrib/* failed" + docinto utilities || die "doc directory, utilities, failed" + dodoc utilities/* || die "doc utilities/* failed" + docinto testtools || die "doc directory, testtools, failed" + dodoc testtools/* || die "doc testtools/* failed" + + exeinto /etc/init.d + newexe ${FILESDIR}/spambayespop3proxy.rc spambayespop3proxy + + insinto /etc + doins ${FILESDIR}/bayescustomize.ini + + keepdir /var/lib/spambayes + +} + diff -r 11adf80154c3 -r 24790a7e3ea2 mail-filter/spambayes/spambayes-1.0.4.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mail-filter/spambayes/spambayes-1.0.4.ebuild Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,41 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.0.4.ebuild,v 1.0 2005/04/08 22:22:43 userwaldo Exp $ + +inherit distutils + +DESCRIPTION="An anti-spam filter using on Bayesian filtering" +HOMEPAGE="http://spambayes.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +RESTRICT="nomirror" + +LICENSE="PSF-2.2" +SLOT="0" +KEYWORDS="~x86 ~ppc ~amd64" +IUSE="" + +DEPEND=">=dev-lang/python-2.2.2" + +src_install() { + distutils_src_install + dodoc *.txt || die "doc *.txt files failed" + # someone might have benefits of the other documetation too, + # therefore added. + docinto contrib || die "doc directory, contrib, fail" + dodoc contrib/* || die "doc contrib/* failed" + docinto utilities || die "doc directory, utilities, failed" + dodoc utilities/* || die "doc utilities/* failed" + docinto testtools || die "doc directory, testtools, failed" + dodoc testtools/* || die "doc testtools/* failed" + + exeinto /etc/init.d + newexe ${FILESDIR}/spambayespop3proxy.rc spambayespop3proxy + + insinto /etc + doins ${FILESDIR}/bayescustomize.ini + + keepdir /var/lib/spambayes + +} + diff -r 11adf80154c3 -r 24790a7e3ea2 net-im/skype/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-im/skype/Manifest Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,3 @@ +DIST skype-2.1.0.47.tar.bz2 19748117 RMD160 7b5a3255b6a1db7c622355793ec3e582d9ff2777 SHA1 a0c7918767f01e79c37d4bd4dc085855c111994b SHA256 f4db42b21138ca9d424409f880dd311faa0f5e60003f5bbb82d6006dcfd61971 +DIST skype_static-2.1.0.47.tar.bz2 27323809 RMD160 6e63f345a40bf06d51a9d9d7698bf61992ac93c8 SHA1 aa9a2b6b8bc164ffbaa0141bc0ba7de470792921 SHA256 56b0fa6185661b187a409dc09b99ada3e01fa82aaae5f1048f8a698aa6f86e81 +EBUILD skype-2.1.0.47.ebuild 2544 RMD160 2147e6aaabaeb815d8421c200ff1e935e40573f8 SHA1 23342f107302dbc8e9c9ae41fe058ca5d2289f2a SHA256 96ebf4360badf5cdd15bb4c56629778b5a0b97b9743771c008540e18b8971ec6 diff -r 11adf80154c3 -r 24790a7e3ea2 net-im/skype/skype-2.1.0.47.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-im/skype/skype-2.1.0.47.ebuild Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,101 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.72.ebuild,v 1.3 2009/04/14 09:38:40 armin76 Exp $ + +EAPI=2 + +inherit eutils qt4 pax-utils + +DESCRIPTION="A P2P-VoiceIP client." +HOMEPAGE="http://www.skype.com/" + +SFILENAME=${PN}_static-${PV}.tar.bz2 +DFILENAME=${P}.tar.bz2 +SRC_URI="!qt-static? ( http://download.skype.com/linux/${DFILENAME} ) + qt-static? ( http://download.skype.com/linux/${SFILENAME} )" + +LICENSE="skype-eula" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="qt-static" +RESTRICT="mirror strip" + +DEPEND="amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.2 + >=app-emulation/emul-linux-x86-baselibs-2.1.1 + >=app-emulation/emul-linux-x86-soundlibs-2.4 + app-emulation/emul-linux-x86-compat ) + x86? ( >=sys-libs/glibc-2.4 + >=media-libs/alsa-lib-1.0.11 + x11-libs/libXScrnSaver + x11-libs/libXv + qt-static? ( media-libs/fontconfig + media-libs/freetype + x11-libs/libICE + x11-libs/libSM + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libX11 ) + !qt-static? ( x11-libs/qt-core:4 + x11-libs/qt-gui:4[accessibility,dbus] + x11-libs/qt-dbus:4 + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp ) )" +RDEPEND="${DEPEND}" + +QA_EXECSTACK="opt/skype/skype" + +use qt-static && S="${WORKDIR}/${PN}_static-${PV}" + +src_install() { + exeinto /opt/${PN} + doexe skype + fowners root:audio /opt/skype/skype + make_wrapper skype /opt/${PN}/skype /opt/${PN} /opt/${PN} /usr/bin + + insinto /opt/${PN}/sounds + doins sounds/*.wav + + if ! use qt-static ; then + insinto /etc/dbus-1/system.d + newins "${FILESDIR}"/skype.debus.config skype.conf + fi + + insinto /opt/${PN}/lang + # + #There have been some issues were lang is not updated from the .ts files + #but if we have qt we can rebuild it + # + if ! use qt-static ; then + lrelease lang/*.ts + fi + + doins lang/*.qm + + insinto /opt/${PN}/avatars + doins avatars/*.png + + insinto /opt/${PN} + for X in 16 32 48 + do + insinto /usr/share/icons/hicolor/${X}x${X}/apps + newins "${S}"/icons/SkypeBlue_${X}x${X}.png ${PN}.png + done + + dodoc README + + # insinto /usr/share/applications/ + # doins skype.desktop + make_desktop_entry ${PN} "Skype VoIP" ${PN} "Network;InstantMessaging;Telephony" + + #Fix for no sound notifications + dosym /opt/${PN} /usr/share/${PN} + + # TODO: Optional configuration of callto:// in KDE, Mozilla and friends + # doexe skype-callto-handler +} diff -r 11adf80154c3 -r 24790a7e3ea2 net-misc/rabbitmq-server/Manifest diff -r 11adf80154c3 -r 24790a7e3ea2 sys-apps/servant/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sys-apps/servant/Manifest Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,4 @@ +DIST servant-0.1.5.tar.bz2 77475 RMD160 7dd2946ca1d169faf35192fe6b918e2ca072b6ed SHA1 25b67f1d187e2eb2eb8075ab51d4fe6c7964644e SHA256 8f7ae7d78321564fde4c7a2f65c1093341a962c6dfa78789e2ab728fd041806a +DIST servant-0.1.7.tar.bz2 135551 RMD160 c52e22ba74ebb1fd00c60c48248a1a91ee69117e SHA1 d807a0a1368e4a9803afb016575ce92a73eae3d9 SHA256 e223742e09f67cc8703a2d74f43b91cdb4a3af78872627a6bc9b18a1f88a19d7 +EBUILD servant-0.1.5.ebuild 944 RMD160 2e5750d8c4afa1146f84c0c0a4d3fcf2ae0f68f0 SHA1 dbeea830eb0c9dc5e16896c9f5f7a46eb114540c SHA256 e99673486bf1625fc82fa459ba8e2b0aef5e10189b7c9f61524eeae3a02fac31 +EBUILD servant-0.1.7.ebuild 944 RMD160 2e5750d8c4afa1146f84c0c0a4d3fcf2ae0f68f0 SHA1 dbeea830eb0c9dc5e16896c9f5f7a46eb114540c SHA256 e99673486bf1625fc82fa459ba8e2b0aef5e10189b7c9f61524eeae3a02fac31 diff -r 11adf80154c3 -r 24790a7e3ea2 sys-apps/servant/servant-0.1.5.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sys-apps/servant/servant-0.1.5.ebuild Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,38 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils + +DESCRIPTION="Graphical rc-update replacement (Qt4)" + +# Homepage, not used by Portage directly but handy for developer reference +HOMEPAGE="http://www.informatik.uni-bremen.de/~momesana/sys-apps/servant/" +SRC_URI="http://www.informatik.uni-bremen.de/~momesana/sys-apps/servant/${P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="" +DEPEND=">=x11-libs/qt-4.2.0" +S=${WORKDIR}/${PN} + +src_compile() { + qmake || die "qmake failed" + emake || die "emake failed" +} + +src_install() { + dobin ${S}/servant || die "dobin ${S}/servant failed" + + dodoc ${S}/AUTHORS \ + ${S}/COPYING \ + ${S}/ChangeLog \ + ${S}/README \ + ${S}/TODO || die "installing documentation failed" + insinto /usr/share/applnk/System/ + doins ${S}/servant.desktop +} + +pkg_postinst() { + einfo "Send your Bugreports to momesana@yahoo.de" +} diff -r 11adf80154c3 -r 24790a7e3ea2 sys-apps/servant/servant-0.1.7.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sys-apps/servant/servant-0.1.7.ebuild Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,38 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils + +DESCRIPTION="Graphical rc-update replacement (Qt4)" + +# Homepage, not used by Portage directly but handy for developer reference +HOMEPAGE="http://www.informatik.uni-bremen.de/~momesana/sys-apps/servant/" +SRC_URI="http://www.informatik.uni-bremen.de/~momesana/sys-apps/servant/${P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="" +DEPEND=">=x11-libs/qt-4.2.0" +S=${WORKDIR}/${PN} + +src_compile() { + qmake || die "qmake failed" + emake || die "emake failed" +} + +src_install() { + dobin ${S}/servant || die "dobin ${S}/servant failed" + + dodoc ${S}/AUTHORS \ + ${S}/COPYING \ + ${S}/ChangeLog \ + ${S}/README \ + ${S}/TODO || die "installing documentation failed" + insinto /usr/share/applnk/System/ + doins ${S}/servant.desktop +} + +pkg_postinst() { + einfo "Send your Bugreports to momesana@yahoo.de" +} diff -r 11adf80154c3 -r 24790a7e3ea2 www-apps/serendipity/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www-apps/serendipity/Manifest Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,6 @@ +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 +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 diff -r 11adf80154c3 -r 24790a7e3ea2 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 Tue Nov 24 15:34:46 2009 +0100 @@ -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 11adf80154c3 -r 24790a7e3ea2 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 Tue Nov 24 15:34:46 2009 +0100 @@ -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 11adf80154c3 -r 24790a7e3ea2 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 Tue Nov 24 15:34:46 2009 +0100 @@ -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 +}