merge of 0a527a883f902e45560614ecaddc3e42e790c62f

     and 3e210bb0fa7fb81d3595767cca49ed749b921f1d

8 files changed, 62 insertions, 27 deletions

diff --git a/packages/lyx/.mtn2git_empty b/packages/lyx/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lyx/.mtn2git_empty
diff --git a/packages/lyx/lyx_1.3.6.bb b/packages/lyx/lyx_1.3.6.bb
new file mode 100644
index 0000000000..6e2309623a
--- /dev/null
+++ b/packages/lyx/lyx_1.3.6.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "LyX is an advanced type setting processor - a frontend for LaTeX"
+SECTION = "x11/office"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.lyx.org"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "boost qt-x11-free"
+RRECOMMENDS = "tetex"
+
+SRC_URI = "ftp://ftp.lyx.org/pub/lyx/stable/lyx-${PV}.tar.bz2"
+
+inherit autotools qt3x11
+
+EXTRA_OECONF = "--with-frontend=qt --with-qt-dir=${QTDIR}"
+
+export UIC="${OE_QMAKE_UIC}"
+export MOC="${OE_QMAKE_MOC}"
+
+do_configure() {
+	oe_runconf
+}
+
+do_install_append() {
+	for i in noweb2lyx lyx reLyX
+	do
+		ln -sf ./${TARGET_PREFIX}$i ${D}/${bindir}/$i
+	done
+}
+
diff --git a/packages/qt/qt-x11-free_3.3.3.bb b/packages/qt/qt-x11-free_3.3.3.bb
index b6bb926eea..8304de1461 100644
--- a/packages/qt/qt-x11-free_3.3.3.bb
+++ b/packages/qt/qt-x11-free_3.3.3.bb
@@ -4,16 +4,13 @@ PRIORITY = "optional"
 LICENSE = "GPL QPL"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "uicmoc3-native freetype x11 xft xext libxrender libxrandr libxcursor mysql"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
 	   file://no-examples.patch;patch=1"
 S = "${WORKDIR}/qt-x11-free-${PV}"
 
-PACKAGES += "qt-x11-plugins"
-FILES_qt-x11-plugins = "${prefix}/plugins"
-
 inherit qmake-base qt3x11
 
 export QTDIR = "${S}"
@@ -24,6 +21,11 @@ EXTRA_OEMAKE = "-e"
 QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \
                    -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -plugin-sql-mysql -verbose"
 
+EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \
+             INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
+             QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
+             MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e"'
+
 do_configure() {
 	echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \
 		-L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql
@@ -38,18 +40,8 @@ do_configure() {
 do_compile() {
 	unset CFLAGS
 	unset CXXFLAGS
-#	cd src && oe_runmake QMAKESPEC="${QMAKESPEC}" QMAKE="${STAGING_BINDIR}/qmake" MOC="moc3" UIC="uic3" MAKE="make -e"
-	oe_runmake -C src \
-		QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \
-		INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
-		QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
-		MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e"
-	oe_runmake -C plugins/src \
-		QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \
-		INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR} \
-		QMAKE_LIBS_QT=-lqt QMAKE_LIBS_QT_THREAD=-lqt-mt" \
-		QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
-		MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e"
+	oe_runmake -C src ${EXTRA_ENV}
+	oe_runmake -C plugins/src ${EXTRA_ENV}
 }
 
 do_stage() {
@@ -62,18 +54,16 @@ do_stage() {
 	done
 	for f in include/private/*.h
 	do
-	        install -m 0644 $f ${STAGING_QT_DIR}/include/private
+		install -m 0644 $f ${STAGING_QT_DIR}/include/private
 	done
 }
 
 do_install() {
 	install -d ${D}${libdir}/
 	oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
-	oe_runmake -C plugins/src INSTALL_ROOT="${D}" \
-		QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \
-		INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR} \
-		QMAKE_LIBS_QT=-lqt QMAKE_LIBS_QT_THREAD=-lqt-mt" \
-		QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
-		MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e" \
-		install
+	oe_runmake -C plugins/src INSTALL_ROOT="${D}" ${EXTRA_ENV} install
 }
+
+PACKAGES += "qt-x11-plugins"
+FILES_qt-x11-plugins = "${prefix}/plugins"
+
diff --git a/packages/unionfs/unionfs-modules.inc b/packages/unionfs/unionfs-modules.inc
index ceada47454..5e87288e48 100644
--- a/packages/unionfs/unionfs-modules.inc
+++ b/packages/unionfs/unionfs-modules.inc
@@ -3,6 +3,8 @@ unionutils = "unionctl uniondbg"
 include unionfs.inc
 inherit module
 
+SECTION = "kernel/modules"
+
 EXTRA_OEMAKE = "'CC=${KERNEL_CC}' 'LD=${KERNEL_LD}' \
 		'KERNELVER=${KERNEL_VERSION}' \
 		'LINUXSRC=${STAGING_KERNEL_DIR}' \
@@ -13,6 +15,7 @@ EXTRA_OEMAKE = "'CC=${KERNEL_CC}' 'LD=${KERNEL_LD}' \
 KCFLAGS = "-D__KERNEL__ -DMODULE -DFISTGEN \
 	   -DUNIONFS_UNSUPPORTED -DNODEBUG \
 	   -I. -I${STAGING_KERNEL_DIR}/include \
+           -DUNIONFS_VERSION=\"${PV}\" \
 	   ${CFLAGS}"
 
 def get_flags(d, bb):
diff --git a/packages/unionfs/unionfs-modules_1.0.13.bb b/packages/unionfs/unionfs-modules_1.0.13.bb
new file mode 100644
index 0000000000..2ff8ff588c
--- /dev/null
+++ b/packages/unionfs/unionfs-modules_1.0.13.bb
@@ -0,0 +1,9 @@
+PARALLEL_MAKE = ""
+
+include unionfs-modules.inc
+
+KERNEL_MAJMIN = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')[:3]}"
+
+do_compile() {
+	oe_runmake unionfs${KERNEL_MAJMIN}
+}
diff --git a/packages/unionfs/unionfs-utils.inc b/packages/unionfs/unionfs-utils.inc
index 18b3bc29cd..6620e91613 100644
--- a/packages/unionfs/unionfs-utils.inc
+++ b/packages/unionfs/unionfs-utils.inc
@@ -2,8 +2,7 @@ unionutils = "unionctl uniondbg"
 
 include unionfs.inc
 
-FILES_${PN} = "${sbindir}/unionctl"
-FILES_${PN}-dev = "${sbindir}/uniondbg"
+SECTION = "kernel/userland"
 
 do_compile () {
 	oe_runmake ${unionutils}
@@ -18,3 +17,7 @@ do_install () {
 		install -m 0644 man/$m.8 ${D}${mandir}/man8/ || exit 1
 	done
 }
+
+FILES_${PN} = "${sbindir}/unionctl"
+FILES_${PN}-dev = "${sbindir}/uniondbg"
+
diff --git a/packages/unionfs/unionfs-utils_1.0.13.bb b/packages/unionfs/unionfs-utils_1.0.13.bb
new file mode 100644
index 0000000000..be08882810
--- /dev/null
+++ b/packages/unionfs/unionfs-utils_1.0.13.bb
@@ -0,0 +1,2 @@
+include unionfs-utils.inc
+
diff --git a/packages/unionfs/unionfs.inc b/packages/unionfs/unionfs.inc
index 392a1cdaf5..72d4ed1fca 100644
--- a/packages/unionfs/unionfs.inc
+++ b/packages/unionfs/unionfs.inc
@@ -10,5 +10,5 @@ SRC_URI = "ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-${PV}.tar.gz \
 S = "${WORKDIR}/unionfs-${PV}"
 FILESPATH = "${FILE_DIRNAME}/unionfs-${PV}:${FILE_DIRNAME}/unionfs:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
-export UCFLAGS := "${CFLAGS} -DNODEBUG"
+export UCFLAGS = '${CFLAGS} -DNODEBUG -DUNIONFS_VERSION=\\"${PV}\\"'
 CFLAGS = "${BUILD_OPTIMIZATION}"