Use split-ebuild patches from one tarball

diff --git a/eclass/virtuoso.eclass b/eclass/virtuoso.eclass
index 33ac934ac9b5f08709ee7b878ad27be4357b20f9..4c6fe16d685195e542a449ba043bb0d31a443150 100644 (file)
--- a/eclass/virtuoso.eclass
+++ b/eclass/virtuoso.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtuoso.eclass,v 1.2 2010/03/26 12:24:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtuoso.eclass,v 1.3 2010/04/06 17:28:31 reavertm Exp $
 
 # @ECLASS: virtuoso.eclass
 # @MAINTAINER:
@@ -12,7 +12,7 @@
 
 case ${EAPI:-0} in
        2|3) : ;;
-       *) DEPEND="EAPI-TOO-OLD" ;;
+       *) DEPEND='EAPI-TOO-OLD' ;;
 esac
 
 inherit base autotools flag-o-matic multilib
@@ -22,42 +22,44 @@ MY_P="virtuoso-opensource-${PV}"
 case ${PV} in
        *9999*)
                ECVS_SERVER="virtuoso.cvs.sourceforge.net:/cvsroot/virtuoso"
+               ECVS_PROJECT='virtuoso'
                SRC_URI=""
                inherit cvs
                ;;
        *)
                # Use this variable to determine distribution method (live or tarball)
                TARBALL="${MY_P}.tar.gz"
-               SRC_URI="mirror://sourceforge/virtuoso/${TARBALL}"
+               SRC_URI="mirror://sourceforge/virtuoso/${TARBALL} mirror://gentoo/VOS-genpatches-${PV}.tar.bz2"
                ;;
 esac
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install
 
 # Set some defaults
-HOMEPAGE="http://virtuoso.openlinksw.com/wiki/main/Main/"
-LICENSE="GPL-2"
-SLOT="0"
+HOMEPAGE='http://virtuoso.openlinksw.com/wiki/main/Main/'
+LICENSE='GPL-2'
+SLOT='0'
 
-DEPEND=">=sys-devel/libtool-2.2.6a"
-RDEPEND=""
+DEPEND='
+       >=sys-devel/libtool-2.2.6a
+'
+RDEPEND=''
 
 S="${WORKDIR}/${MY_P}"
 
 # @FUNCTION: virtuoso_src_prepare
 # @DESCRIPTION:
-# 1. Applies common release patches (from ${FILESDIR}/${PV}/ dir)
+# 1. Applies common release patches
 # 2. Applies package-specific patches (from ${FILESDIR}/, PATCHES can be used)
-# 3. Modifies makefiles for split build. Uses VOS_EXTRACT
-# 4. eautoreconf
+# 3. Applies user patches from /etc/portage/patches/${CATEGORY}/${PN}/
+# 4. Modifies makefiles for split build. Uses VOS_EXTRACT
+# 5. eautoreconf
 virtuoso_src_prepare() {
        debug-print-function ${FUNCNAME} "$@"
 
-       for file in "${FILESDIR}/${PV}"/*; do
-               epatch "${file}"
-       done
-
+       EPATCH_SUFFIX='patch' EPATCH_FORCE='yes' epatch
        base_src_prepare
+       epatch_user
 
        # @ECLASS-VARIABLE: VOS_EXTRACT
        # @DESCRIPTION:
@@ -67,7 +69,7 @@ virtuoso_src_prepare() {
                # Comment out everything
                find . -name Makefile.am -exec \
                        sed -e '/SUBDIRS\s*=/s/^/# DISABLED /g' -i {} + \
-                               || die "failed to disable subdirs"
+                               || die 'failed to disable subdirs'
 
                # Uncomment specified
                local path
@@ -107,18 +109,18 @@ virtuoso_src_prepare() {
 virtuoso_src_configure() {
        debug-print-function ${FUNCNAME} "$@"
 
-       use amd64 && append-flags "-m64"
+       use amd64 && append-flags '-m64'
 
        # Override some variables to make tests work
        if [[ ${PN} != virtuoso-server ]]; then
                [[ ${EAPI} == 2 ]] && ! use prefix && EPREFIX=
-               export ISQL=${EPREFIX}/usr/bin/isql-v
-               export SERVER=${EPREFIX}/usr/bin/virtuoso-t
+               export ISQL="${EPREFIX}"/usr/bin/isql-v
+               export SERVER="${EPREFIX}"/usr/bin/virtuoso-t
        fi
 
        econf \
                --with-layout=gentoo \
-               --localstatedir=${EPREFIX}/var \
+               --localstatedir="${EPREFIX}"/var \
                --enable-shared \
                --with-pthreads \
                --without-internal-zlib \
@@ -126,7 +128,7 @@ virtuoso_src_configure() {
 }
 
 # @FUNCTION: virtuoso_src_compile
-# @DESCRIPTION:
+# @DESCRIPTION
 # Runs make for specified subdirs
 virtuoso_src_compile() {
        debug-print-function ${FUNCNAME} "$@"