merge of b1410ede664e298061d74b36181c097dd76a0b22

     and f43c0bbb64e7f30530654a0eb2acb35a6b82ce97

9 files changed, 94 insertions, 9 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 56008e66cc..c0741a86aa 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -513,7 +513,8 @@ python base_eventhandler() {
 	if name.startswith("BuildStarted"):
 		bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
 		path_to_bbfiles = bb.data.getVar( 'BBFILES', e.data, 1 )
-		path_to_packages = path_to_bbfiles[:path_to_bbfiles.index( "packages" )]
+		print "path_to_bbfiles = ", path_to_bbfiles
+		path_to_packages = path_to_bbfiles[:path_to_bbfiles.rindex( "packages" )]
 		monotone_revision = "<unknown>"
 		try:
 			monotone_revision = file( "%s/MT/revision" % path_to_packages ).read().strip()
diff --git a/packages/albumshaper/.mtn2git_empty b/packages/albumshaper/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/albumshaper/.mtn2git_empty
diff --git a/packages/albumshaper/albumshaper_2.1.bb b/packages/albumshaper/albumshaper_2.1.bb
new file mode 100644
index 0000000000..6bfd7e6812
--- /dev/null
+++ b/packages/albumshaper/albumshaper_2.1.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Album Shaper strives to be the most friendly, easy to use, open source application for \
+organizing, annotating, framing, enhancing, stylizing, and sharing your digital photos. \
+Album Shaper embraces open formats like XML, JPEG, and XSLT, while supporting Windows, Mac OS X, and Unix \ 
+users who speak a multitude of languages around the world."
+HOMEPAGE = "http://albumshaper.sourceforge.net"
+AUTHOR = "Will Stokes"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "libxml2 libxslt jpeg"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/albumshaper/albumshaper_${PV}.tar.bz2 \
+           file://fixpaths.patch;patch=1"
+S = "${WORKDIR}/albumshaper_2.1_src"
+
+inherit qmake qt3x11
+
+do_install() {
+	oe_runmake install INSTALL_ROOT="${D}"
+}
diff --git a/packages/albumshaper/files/.mtn2git_empty b/packages/albumshaper/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/albumshaper/files/.mtn2git_empty
diff --git a/packages/albumshaper/files/fixpaths.patch b/packages/albumshaper/files/fixpaths.patch
new file mode 100644
index 0000000000..34ca2e3804
--- /dev/null
+++ b/packages/albumshaper/files/fixpaths.patch
@@ -0,0 +1,53 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- albumshaper_2.1_src/Makefile~fixpaths
++++ albumshaper_2.1_src/Makefile
+@@ -1,6 +1,6 @@
+ #############################################################################
+ # Makefile for building: bin/AlbumShaper.bin
+-# Generated by qmake (1.07a) (Qt 3.3.5) on: Tue May  9 12:09:27 2006
++# Generated by qmake (1.07a) (Qt 3.3.5) on: Tue May  9 13:58:45 2006
+ # Project:  AlbumShaper.pro
+ # Template: app
+ # Command: $(QMAKE) -spec /local/pkg/oe/c7x0/tmp/staging/i686-linux/share/qmake/linux-oe-g++ -after  "CONFIG+=thread" -o Makefile AlbumShaper.pro
+@@ -12,14 +12,14 @@
+ CXX      = $(OE_QMAKE_CXX)
+ LEX      = flex
+ YACC     = yacc
+-CFLAGS   = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/usr/include/libxml2 -I/usr/include/libxml2 -Os -D_REENTRANT  -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
+-CXXFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/usr/include/libxml2 -I/usr/include/libxml2 -Os -D_REENTRANT  -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
++CFLAGS   = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -Os -D_REENTRANT  -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
++CXXFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -Os -D_REENTRANT  -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
+ LEXFLAGS = 
+ YACCFLAGS= -d
+ INCPATH  = -I/local/pkg/oe/c7x0/tmp/staging/i686-linux/share/qmake/linux-oe-g++ -I. -I$(OE_QMAKE_INCDIR_QT) -Itmp/
+ LINK     = $(OE_QMAKE_LINK)
+ LFLAGS   = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA) -s  -Wl,-rpath-link,$(OE_QMAKE_LIBDIR_QT)
+-LIBS     = $(SUBLIBS) -L$(OE_QMAKE_LIBDIR_QT) $(LIBS_EXTRA) -ljpeg -L/usr/lib -lxslt -lxml2 -lz -lm -lxml2 -lz -lm -lxslt -lxml2 -ljpeg -l$(OE_QMAKE_LIBS_QT)-mt $(OE_QMAKE_LIBS_X11) -lpthread
++LIBS     = $(SUBLIBS) -L$(OE_QMAKE_LIBDIR_QT) $(LIBS_EXTRA) -ljpeg -L/local/pkg/oe/c7x0/tmp/staging/arm-linux/lib -lxslt -lxml2 -lz -lm -L/local/pkg/oe/c7x0/tmp/staging/arm-linux/lib -lxml2 -lz -lm -lxslt -lxml2 -ljpeg -l$(OE_QMAKE_LIBS_QT)-mt $(OE_QMAKE_LIBS_X11) -lpthread
+ AR       = $(OE_QMAKE_AR) cqs
+ RANLIB   = 
+ MOC      = $(OE_QMAKE_MOC)
+@@ -1377,7 +1377,7 @@
+ 
+ install_scripts: all 
+ 	@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/bin/" || $(MKDIR) "$(INSTALL_ROOT)/usr/bin/"
+-	cp -f bin/AlbumShaper /usr/bin/AlbumShaper;
++	cp -f bin/AlbumShaper $(INSTALL_ROOT)//usr/bin/AlbumShaper;
+ 
+ 
+ install: install_target install_images install_text install_themes install_translations install_xmlConversion install_scripts  
+--- albumshaper_2.1_src/AlbumShaper.pro~fixpaths
++++ albumshaper_2.1_src/AlbumShaper.pro
+@@ -272,7 +272,7 @@
+ 
+ #--------- Launcher Script (Linux/FreeBSD) ------------
+ !mac:unix:scripts.path = $${BIN_DIR}
+-!mac:unix:scripts.commands = cp -f bin/AlbumShaper $${BIN_DIR}/AlbumShaper;
++!mac:unix:scripts.commands = cp -f bin/AlbumShaper $(INSTALL_ROOT)/$${BIN_DIR}/AlbumShaper;
+ 
+ 
+ #===========================================================================================
diff --git a/packages/apr/apr-util_0.9.7.bb b/packages/apr/apr-util_0.9.12.bb
index 597c0ee93d..e88298fafe 100644
--- a/packages/apr/apr-util_0.9.7.bb
+++ b/packages/apr/apr-util_0.9.12.bb
@@ -4,7 +4,6 @@ DEPENDS = "apr expat gdbm"
 MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
 LICENSE = "Apache"
 HOMEPAGE = "http://apr.apache.org"
-
 PR = "r0"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
@@ -16,10 +15,10 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGI
 inherit autotools lib_package binconfig
 
 do_configure() {
-  cp ${S}/../uri_delims.h ${S}/uri/. 
-  oe_runconf
+	cp ${S}/../uri_delims.h ${S}/uri/. 
+	oe_runconf
 }
 
 do_stage() {
-  oe_libinstall -a -so -C .libs libaprutil-0 ${STAGING_LIBDIR}
+	autotools_stage_all
 }
diff --git a/packages/apr/apr_0.9.7.bb b/packages/apr/apr_0.9.12.bb
index 4c236109bb..5c287ace0f 100644
--- a/packages/apr/apr_0.9.7.bb
+++ b/packages/apr/apr_0.9.12.bb
@@ -3,17 +3,16 @@ SECTION = "libs"
 MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
 LICENSE = "Apache"
 HOMEPAGE = "http://apr.apache.org"
-
 PR = "r0"
 
-SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2"
+SRC_URI = "${APACHE_MIRROR}/apr/apr-${PV}.tar.bz2"
 
 inherit autotools lib_package binconfig
 
 do_configure() {
-  oe_runconf
+	oe_runconf
 }
 
 do_stage() {
-  oe_libinstall -a -so -C .libs libapr-0 ${STAGING_LIBDIR}
+	autotools_stage_all
 }
diff --git a/packages/mkbot/.mtn2git_empty b/packages/mkbot/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mkbot/.mtn2git_empty
diff --git a/packages/mkbot/mkbot_0.3.bb b/packages/mkbot/mkbot_0.3.bb
new file mode 100644
index 0000000000..dd75418fdb
--- /dev/null
+++ b/packages/mkbot/mkbot_0.3.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "MKbot is a modular IRC bot written in C++, using the Qt 4 toolkit. \
+It currently works on networks running hybrid-ircd such as Freenode, and the unreal3 ircd"
+HOMEPAGE = "http://fredemmott.co.uk/index.php?page=mkbot"
+AUTHOR = "Fred Emmott"
+LICENSE = "GPL"
+SECTION = "network"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+
+SRC_URI = "http://files.fredemmott.co.uk/mkbot-${PV}.tar.bz2"
+S = "${WORKDIR}/MKbot-0.3"
+
+inherit qmake qt4x11
+
+#FIXME: lacks packaging