# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1291007402 0
# Node ID aa2fafc43273041e8af5bf6e7cb37942586d5065
# Parent  f921c138b7421cceb72d5d93cff7e3b1404e0b3a# Parent  a36f0026ad7aefe30bde3df0acb8bdaa1d61e367
merge

diff -r f921c138b742 -r aa2fafc43273 linux-iscsi/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linux-iscsi/receipt	Mon Nov 29 05:10:02 2010 +0000
@@ -0,0 +1,38 @@
+# SliTaz package receipt.
+
+PACKAGE="linux-iscsi"
+VERSION="2.6.36"
+CATEGORY="base-system"
+SHORT_DESC="The Linux kernel iscsi modules."
+MAINTAINER="devel@slitaz.org"
+DEPENDS="linux"
+WANTED="linux"
+WEB_SITE="http://www.kernel.org/"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+    local path
+    path=lib/modules/$VERSION-slitaz/kernel
+    mkdir -p $fs/$path
+    export src
+    export _pkg
+    $src/slitaz/list_modules.sh drivers/scsi/iscsi_tcp.ko.gz \
+		drivers/scsi/scsi_transport_iscsi.ko.gz | while read module; do
+    	dir=$path/$(dirname $module)
+    	[ -d $fs/$dir ] || mkdir -p $fs/$dir
+        cp -a $_pkg/$path/$module $fs/$dir
+    done
+}
+
+# Post install/remove commands for Tazpkg.
+post_install()
+{
+	chroot "$1/" depmod -a $VERSION-slitaz
+}
+
+post_remove()
+{
+	depmod -a $VERSION-slitaz
+}
+
diff -r f921c138b742 -r aa2fafc43273 open-iscsi/receipt
--- a/open-iscsi/receipt	Mon Nov 29 05:08:22 2010 +0000
+++ b/open-iscsi/receipt	Mon Nov 29 05:10:02 2010 +0000
@@ -8,16 +8,15 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.open-iscsi.org/"
 WGET_URL="${WEB_SITE}bits/$TARBALL"
+DEPENDS="linux-iscsi"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
-	if [ ! -d $WOK/linux/taz ]; then
-		tazwok cook linux
-	fi
-	make KSRC=$(ls -d $WOK/linux/$(ls $WOK/linux/taz)/)
-	make KSRC=$(ls -d $WOK/linux/$(ls $WOK/linux/taz)/) DESTDIR=$PWD/_pkg install
+	sed -i 's/ install_kernel / /' Makefile
+	make user
+	make DESTDIR=$PWD/_pkg install
 
 }
 
diff -r f921c138b742 -r aa2fafc43273 python-pymedia/receipt
--- a/python-pymedia/receipt	Mon Nov 29 05:08:22 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="python-pymedia"
-SOURCE="pymedia"
-VERSION="1.3.7.3"
-CATEGORY="development"
-SHORT_DESC="Wav, mp3, ogg, avi, divx, dvd, cdda etc files manipulations."
-MAINTAINER="pascal.bellard@slitaz.org"
-TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://pymedia.org/"
-WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL"
-DEPENDS="python libvorbis libogg faad2 lame alsa-lib"
-BUILD_DEPENDS="python python-dev libvorbis libvorbis-dev libogg libogg-dev"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	echo | python setup.py build &&
-	echo | python setup.py install --root=$PWD/_pkg
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $_pkg/usr/lib $fs/usr
-}
diff -r f921c138b742 -r aa2fafc43273 pyvnc2swf/receipt
--- a/pyvnc2swf/receipt	Mon Nov 29 05:08:22 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="pyvnc2swf"
-VERSION="0.9.5"
-CATEGORY="network"
-SHORT_DESC="VNC recorder"
-MAINTAINER="pascal.bellard@slitaz.org"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.unixuser.org/~euske/vnc2swf/pyvnc2swf.html"
-WGET_URL="http://www.unixuser.org/~euske/vnc2swf/$TARBALL"
-DEPENDS="python tk python-pygame"
-SUGGESTED="python-pymedia"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	make
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share/$PACKAGE
-	cp -a $src/$PACKAGE/* $fs/usr/share/$PACKAGE
-}
diff -r f921c138b742 -r aa2fafc43273 vnc2flv/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vnc2flv/receipt	Mon Nov 29 05:10:02 2010 +0000
@@ -0,0 +1,26 @@
+# SliTaz package receipt.
+
+PACKAGE="vnc2flv"
+VERSION="20100207"
+CATEGORY="network"
+SHORT_DESC="VNC recorder"
+MAINTAINER="pascal.bellard@slitaz.org"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WEB_SITE="http://www.unixuser.org/~euske/python/vnc2flv"
+WGET_URL="http://pypi.python;org/packages/sources/v/vnc2flv/$TARBALL"
+DEPENDS="python"
+SUGGESTED="x11vnc"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	cd $src
+	make
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr/share/$PACKAGE
+	cp -a $src/$PACKAGE/* $fs/usr/share/$PACKAGE
+}