diff options
| author |   Joe Sapp <nixphoeni@gentoo.org> | 2009-04-28 00:57:18 +0000 |
|---|---|---|
| committer | Joe Sapp <nixphoeni@gentoo.org> | 2009-04-28 00:57:18 +0000 |
| commit | 80a0d6bb1496774c2946a844687dbcb63d596e99 (patch) | |
| tree | aa1f8793afb25762dcc60d8f8f6d3ab0efe57eeb /eclass | |
| parent | cleanup; stable x86; version bump (diff) | |
| download | historical-80a0d6bb1496774c2946a844687dbcb63d596e99.tar.gz historical-80a0d6bb1496774c2946a844687dbcb63d596e99.tar.bz2 historical-80a0d6bb1496774c2946a844687dbcb63d596e99.zip | |
Unquoted for use in dodoc (doesn't work with multiple filenames). Updated SRC_URI (for desklets - Controls have to do some rewriting). Also, Controls should be packaged by themselves so we shouldn't need to grep for [Cc]ontrols when searching for a directory with an __init__.py in order to determine the base directory for the control.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/gdesklets.eclass | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/eclass/gdesklets.eclass b/eclass/gdesklets.eclass index 4363bf98c080..815ec7ddb8b0 100644 --- a/eclass/gdesklets.eclass +++ b/eclass/gdesklets.eclass @@ -1,6 +1,6 @@ # Copyright 2004-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/eclass/gdesklets.eclass,v 1.16 2008/02/19 01:51:00 nixphoeni Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gdesklets.eclass,v 1.17 2009/04/28 00:57:18 nixphoeni Exp $ # # Authors: Joe Sapp <nixphoeni@gentoo.org> # Mike Gardiner <obz@gentoo.org> @@ -19,10 +19,11 @@ inherit eutils multilib python -MY_P="${DESKLET_NAME}-${PV}" -S=${WORKDIR}/${DESKLET_NAME} +MY_PN="${DESKLET_NAME}" +MY_P="${MY_PN}-${PV}" +S="${WORKDIR}/${DESKLET_NAME}" -SRC_URI="http://gdesklets.gnomedesktop.org/files/${MY_P}.tar.gz" +SRC_URI="http://gdesklets.de/files/desklets/${MY_PN}/${MY_P}.tar.gz" # Ebuild writer shouldn't need to touch these (except maybe $RDEPEND) SLOT="0" @@ -153,7 +154,7 @@ gdesklets_src_install() { # Base installation directory for Controls CONTROL_INSDIR="${GDESKLETS_INST_DIR}/Controls" - CONTROL_INITS=$(find . -iname "__init__.py" | grep [Cc]ontrols) + CONTROL_INITS=$(find . -iname "__init__.py") # There are possibly multiple Controls packaged with the display. # For each __init__.py found, there must be a Control associated with it. @@ -169,7 +170,7 @@ gdesklets_src_install() { insinto "${CONTROL_INSDIR}/${CTRL_NAME}" - doins -r * + doins -r *.py cd "${S}" @@ -195,7 +196,7 @@ gdesklets_src_install() { fi # if -n "${GFX}" # Install some docs if so requested - [[ -n "${DOCS}" ]] && dodoc "${DOCS}" && \ + [[ -n "${DOCS}" ]] && dodoc ${DOCS} && \ debug-print "Installed ${DOCS}" } |