merge of 'c05229a8c5246cada336c3cfe5a3417367366836'

     and 'ef9cb35b2ec71124443e3492f55fe842c40ba66e'

7 files changed, 92 insertions, 62 deletions

diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index 5495af9e1c..a857c5b331 100644
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -50,6 +50,7 @@ TOOLS_INSTALL = "\
   nano \
   powertop \
   s3c24xx-gpio \
+  sysstat \
 "
 
 # audio
diff --git a/packages/python/python-pygame-1.7.1/Setup b/packages/python/python-pygame-1.7.1/Setup
deleted file mode 100644
index c4558b39bb..0000000000
--- a/packages/python/python-pygame-1.7.1/Setup
+++ /dev/null
@@ -1,57 +0,0 @@
-#This Setup file is used by the setup.py script to configure the
-#python extensions. You will likely use the "config.py" which will
-#build a correct Setup file for you based on your system settings.
-#If not, the format is simple enough to edit by hand. First change
-#the needed commandline flags for each dependency, then comment out
-#any unavailable optional modules in the first optional section.
-
-#SDL = ???
-
-FONT = -lSDL_ttf-2.0
-IMAGE = -lSDL_image-1.2
-MIXER = -lSDL_mixer-1.2
-SMPEG = -lsmpeg $(SDL)
-NUMERIC = -I.
-
-
-
-#the following modules are optional. you will want to compile
-#everything you can, but you can ignore ones you don't have
-#dependencies for, just comment them out
-
-imageext src/imageext.c $(SDL) $(IMAGE)
-font src/font.c $(SDL) $(FONT)
-mixer src/mixer.c $(SDL) $(MIXER)
-mixer_music src/music.c $(SDL) $(MIXER)
-movie src/movie.c $(SDL) $(SMPEG)
-surfarray src/surfarray.c $(SDL) $(NUMERIC)
-sndarray src/sndarray.c $(SDL) $(NUMERIC) $(MIXER)
-
-
-
-#these modules are required for pygame to run. they only require
-#SDL as a dependency. these should not be altered
-
-base src/base.c $(SDL)
-cdrom src/cdrom.c $(SDL)
-constants src/constants.c $(SDL)
-display src/display.c $(SDL)
-event src/event.c $(SDL)
-key src/key.c $(SDL)
-mouse src/mouse.c $(SDL)
-rect src/rect.c $(SDL)
-rwobject src/rwobject.c $(SDL)
-surface src/surface.c src/alphablit.c $(SDL)
-surflock src/surflock.c $(SDL)
-time src/time.c $(SDL)
-joystick src/joystick.c $(SDL)
-draw src/draw.c $(SDL)
-image src/image.c $(SDL)
-transform src/transform.c src/rotozoom.c src/scale2x.c $(SDL)
-
-
-#the following are placeholders. setup.py can use them to help
-#auto-copy needed DLLs into the pygame installation folder.
-#you can simply ignore these lines under non-windows, no need to
-#comment out.
-COPYLIB_smpeg $(SDL) $(SMPEG)
diff --git a/packages/python/python-pygame-1.7.1/.mtn2git_empty b/packages/python/python-pygame-1.8.1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-pygame-1.7.1/.mtn2git_empty
+++ b/packages/python/python-pygame-1.8.1/.mtn2git_empty
diff --git a/packages/python/python-pygame-1.8.1/Setup b/packages/python/python-pygame-1.8.1/Setup
new file mode 100644
index 0000000000..cb8085530a
--- /dev/null
+++ b/packages/python/python-pygame-1.8.1/Setup
@@ -0,0 +1,64 @@
+#This Setup file is used by the setup.py script to configure the
+#python extensions. You will likely use the "config.py" which will
+#build a correct Setup file for you based on your system settings.
+#If not, the format is simple enough to edit by hand. First change
+#the needed commandline flags for each dependency, then comment out
+#any unavailable optional modules in the first optional section.
+
+
+SDL = -D_REENTRANT -Xlinker -lSDL -lpthread 
+FONT = -lSDL_ttf
+IMAGE = -lSDL_image
+MIXER = -lSDL_mixer
+SMPEG = -lsmpeg 
+PNG = -lpng
+JPEG = ljpeg
+SCRAP = -lX11
+
+#DEBUG = -C-W -C-Wall
+DEBUG = 
+
+#the following modules are optional. you will want to compile
+#everything you can, but you can ignore ones you don't have
+#dependencies for, just comment them out
+
+imageext src/imageext.c $(SDL) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
+font src/font.c $(SDL) $(FONT) $(DEBUG)
+mixer src/mixer.c $(SDL) $(MIXER) $(DEBUG)
+mixer_music src/music.c $(SDL) $(MIXER) $(DEBUG)
+_numericsurfarray src/_numericsurfarray.c $(SDL) $(DEBUG)
+_numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+
+#experimental new movie movie. requires libavcodec and libavformat.
+#add any necessary compile flags to this line and uncomment.
+#movieext src/movie.c  src/ffmovie.c $(SDL) -lavcodec -lavformat
+
+
+#these modules are required for pygame to run. they only require
+#SDL as a dependency. these should not be altered
+
+base src/base.c $(SDL) $(DEBUG)
+cdrom src/cdrom.c $(SDL) $(DEBUG)
+color src/color.c $(SDL) $(DEBUG)
+constants src/constants.c $(SDL) $(DEBUG)
+display src/display.c $(SDL) $(DEBUG)
+event src/event.c $(SDL) $(DEBUG)
+fastevent src/fastevent.c src/fastevents.c $(SDL) $(DEBUG)
+key src/key.c $(SDL) $(DEBUG)
+mouse src/mouse.c $(SDL) $(DEBUG)
+rect src/rect.c $(SDL) $(DEBUG)
+rwobject src/rwobject.c $(SDL) $(DEBUG)
+surface src/surface.c src/alphablit.c src/surface_fill.c $(SDL) $(DEBUG)
+surflock src/surflock.c $(SDL) $(DEBUG)
+time src/time.c $(SDL) $(DEBUG)
+joystick src/joystick.c $(SDL) $(DEBUG)
+draw src/draw.c $(SDL) $(DEBUG)
+image src/image.c $(SDL) $(DEBUG)
+overlay src/overlay.c $(SDL) $(DEBUG)
+transform src/transform.c src/rotozoom.c src/scale2x.c $(SDL) $(DEBUG)
+mask src/mask.c src/bitmask.c $(SDL) $(DEBUG)
+bufferproxy src/bufferproxy.c $(SDL) $(DEBUG)
+pixelarray src/pixelarray.c $(SDL) $(DEBUG)
+
diff --git a/packages/python/python-pygame_1.7.1.bb b/packages/python/python-pygame_1.8.1.bb
index 37b73148e6..2debc950ea 100644
--- a/packages/python/python-pygame_1.7.1.bb
+++ b/packages/python/python-pygame_1.8.1.bb
@@ -1,19 +1,26 @@
 DESCRIPTION = "Python libSDL Bindings"
 SECTION = "devel/python"
+HOMEPAGE = "http://www.pygame.org"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-RDEPENDS = "python-numeric"
 DEPENDS = "libsdl-x11 libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg python-numeric"
 SRCNAME = "pygame"
-PR = "ml2"
+PR = "ml0"
 
-SRC_URI = "http://www.pygame.org/ftp/${SRCNAME}-${PV}release.tar.gz \
-           file://Setup"
+SRC_URI = "\
+  ftp://ftp.pyganem.org/pygame/${SRCNAME}-${PV}release.tar.gz \
+  file://Setup"
 S = "${WORKDIR}/${SRCNAME}-${PV}release"
 
 inherit distutils
 
 do_configure_prepend() {
+	cat ${WORKDIR}/Setup >Setup
 	SDL="`sdl-config --cflags` `sdl-config --libs`"; echo "SDL=$SDL" >Setup
-	cat ${WORKDIR}/Setup >>Setup
 }
+
+do_stage() {
+	distutils_stage_all
+}
+
+RDEPENDS = "python-numeric"
diff --git a/packages/sysstat/.mtn2git_empty b/packages/sysstat/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sysstat/.mtn2git_empty
diff --git a/packages/sysstat/sysstat_8.1.5.bb b/packages/sysstat/sysstat_8.1.5.bb
new file mode 100644
index 0000000000..0f394ed259
--- /dev/null
+++ b/packages/sysstat/sysstat_8.1.5.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux."
+HOMEPAGE = "http://pagesperso-orange.fr/sebastien.godard/"
+LICENSE = "GPL"
+SECTION = "console/utils"
+
+SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz"
+
+inherit autotools
+
+do_configure_prepend() {
+	sed -i s,'-g $(MAN_GROUP)','', Makefile.in
+}
+
+FILES_${PN} += "${libdir}/sa"
+