[gentoo-commits] gentoo-x86 commit in eclass: gdesklets.eclass

[Joe Sapp (nixphoeni)]

nixphoeni    09/04/28 00:57:18

  Modified:             gdesklets.eclass
  Log:
  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.

Revision  Changes    Path
1.17                 eclass/gdesklets.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gdesklets.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gdesklets.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gdesklets.eclass?r1=1.16&r2=1.17

Index: gdesklets.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gdesklets.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gdesklets.eclass	19 Feb 2008 01:51:00 -0000	1.16
+++ gdesklets.eclass	28 Apr 2009 00:57:18 -0000	1.17
@@ -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@g.o>
 #		Mike Gardiner <obz@g.o>
@@ -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 @@
 		# 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 @@
 
 			insinto "${CONTROL_INSDIR}/${CTRL_NAME}"
 
-			doins -r *
+			doins -r *.py
 
 			cd "${S}"
 
@@ -195,7 +196,7 @@
 	fi # if -n "${GFX}"
 
 	# Install some docs if so requested
-	[[ -n "${DOCS}" ]] && dodoc "${DOCS}" && \
+	[[ -n "${DOCS}" ]] && dodoc ${DOCS} && \
 	debug-print "Installed ${DOCS}"
 
 }