Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

17 files changed, 124 insertions, 68 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index da84277b85..24254a919b 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -4242,6 +4242,10 @@ sha256=9a8466b2293798441056bc279736af3a616baaba2f11940396cc60ff71924ea0
 md5=6831b8df3e4a530395e66c2889783752
 sha256=9a8466b2293798441056bc279736af3a616baaba2f11940396cc60ff71924ea0
 
+[ftp://ftp.gnu.org/gnu/emacs/emacs-22.3.tar.gz]
+md5=aa8ba34f548cd78b35914ae5a7bb87eb
+sha256=7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
+
 [http://enlightenment.freedesktop.org/files/embryo-0.9.1.037.tar.gz]
 md5=2a09c0355f33112e96ed253bd0bb308a
 sha256=0b46174c68b9cb19d0335f3f5194ee41e26865f4a9a62df9410f30693865e2d5
@@ -5938,26 +5942,58 @@ sha256=619d59b339e1be7687058460c105b8f2d4f00e6409e4450dee385e3086fdf6d7
 md5=e8d903d84515cc518e545b6f2e3d7a9d
 sha256=8e46a48d581f8b835f305bb17ffbb7776d53b9214113524819e96be842f9db98
 
+[http://geda.seul.org/release/v1.4/1.4.1/geda-docs-1.4.1.tar.gz]
+md5=44009c42e98943fbb868638032d5c8d6
+sha256=6b9c73f34f498b12851ac32e1225b72228e4ea629d321b0426d505ad18309e54
+
+[http://geda.seul.org/release/v1.4/1.4.1/geda-examples-1.4.1.tar.gz]
+md5=9d3daac1be22186784929b56ea181738
+sha256=29e3a1b65212b30847ac5c9f3d51a3add492a1597237085279b6ff82d1a1479f
+
+[http://geda.seul.org/release/v1.4/1.4.1/geda-gattrib-1.4.1.tar.gz]
+md5=0b8bc020cacda9c3fc21bb7f49332c85
+sha256=e6ab108a7ec3b4431ffa1831a6c23937baf8a7815243d4c145e68f5ee8b11105
+
 [http://www.geda.seul.org/devel/20050820/geda-gattrib-20050820.tar.gz]
 md5=6ff8e6343b621199dde7fcd9a7ff264a
 sha256=c3b2751303d18c5d685b2d2c380065a93dab17a233657a6d1a09d9f2da64800f
 
+[http://geda.seul.org/release/v1.4/1.4.1/geda-gnetlist-1.4.1.tar.gz]
+md5=b9b8dcb2818eb1fcc51002921f32b203
+sha256=66cff8c99bd0cd4d594b50c3d2cf7af35cc48adce23e6471f1926f3cc9b50d20
+
 [http://www.geda.seul.org/devel/20050820/geda-gnetlist-20050820.tar.gz]
 md5=94f2a666701e06438fda0a9ce00e5ae3
 sha256=3df3a23c73df7a9c2cc553836e6df797d01da094f6a947049f9fcc182110ef43
 
+[http://geda.seul.org/release/v1.4/1.4.1/geda-gschem-1.4.1.tar.gz]
+md5=065c22125b75269188321d315ccb64bc
+sha256=6929dd56d14cfcc9fcbdd4dfc056ef8f0bab5ef72a01055fe6cda7280e59748e
+
 [http://www.geda.seul.org/devel/20050820/geda-gschem-20050820.tar.gz]
 md5=8ac2387999ec98016c3b004c95fab424
 sha256=166abaa8b0c98e6c826a7c7273b7ddfb57f82be9929e4afbf00e0e3de5d45ef9
 
+[http://geda.seul.org/release/v1.4/1.4.1/geda-gsymcheck-1.4.1.tar.gz]
+md5=1dc7c628acc946731b1e67fb2b910e52
+sha256=15f99bb807dcf6116844847c72bcdde98c8c2232a0e0961cc2ff072a022ccfc6
+
 [http://www.geda.seul.org/devel/20050820/geda-gsymcheck-20050820.tar.gz]
 md5=c339abc4956987852b948c44118b2e2f
 sha256=3526fd4c30f351c3d548cb2632eda150eb632846b1273349aa2061d0400f9816
 
+[http://geda.seul.org/release/v1.4/1.4.1/geda-symbols-1.4.1.tar.gz]
+md5=a9dda9a87edefaac2a99b70a85d0fd1c
+sha256=188d398c8e7a19bf4492419bbb44754451ebfa9f1810b0eb8b6eb84f708bf0f4
+
 [http://www.geda.seul.org/devel/20050820/geda-symbols-20050820.tar.gz]
 md5=a05c9bb11a31c246be3c9a799685bb0e
 sha256=0534ccda5d9136a120abd18ebe3bccd3dbcc6414ec321ad2fd5f9258389ae13d
 
+[http://geda.seul.org/release/v1.4/1.4.1/geda-utils-1.4.1.tar.gz]
+md5=50d39c9af0577a42f3d769794930a74f
+sha256=dfe4d3d3033e92254aa5e00fa7ab6921589747604269bc7b01e59ba9b630e82c
+
 [http://www.geda.seul.org/devel/20050820/geda-utils-20050820.tar.gz]
 md5=6555466492f3273dbefb772bd4ffd486
 sha256=8140ff430e89c8564efabbc24da0d9b2858d5ac5e982dab9923eaf3b46a8aacb
@@ -10966,6 +11002,10 @@ sha256=14d457c3ed1d4751664f7196cbcd20e7db82532025f35634812f0cb7470fc43e
 md5=555488ddfc81a6e0df1fb5112e7eee13
 sha256=7562042a6210947363bd6a9bbcdd03f8d02470c0347970b507f689d25a907844
 
+[http://geda.seul.org/release/v1.4/1.4.1/libgeda-1.4.1.tar.gz]
+md5=16f2e3176eb489838bad57c8728c7388
+sha256=c0598428fc25e79b7ac1da35d44133e3fc50763b32fcdfffd5e6654f2f94682d
+
 [http://www.geda.seul.org/devel/20050820/libgeda-20050820.tar.gz]
 md5=356182f379af726045a70de3024c7e6d
 sha256=c2fdec2c186c11aac2f941dc238ee89f51412707bd7c952e02faefa70e38d700
diff --git a/packages/geda/files/bad-include.patch b/packages/geda/files/bad-include.patch
new file mode 100644
index 0000000000..b64f351950
--- /dev/null
+++ b/packages/geda/files/bad-include.patch
@@ -0,0 +1,13 @@
+Index: geda-gschem-1.4.1/src/Makefile.am
+===================================================================
+--- geda-gschem-1.4.1.orig/src/Makefile.am	2008-09-28 20:59:54.000000000 +0000
++++ geda-gschem-1.4.1/src/Makefile.am	2008-12-02 17:06:43.000000000 +0000
+@@ -30,7 +30,7 @@
+ AM_CFLAGS = -Wall
+ endif
+ 
+-INCLUDES = -I$(prefix)/include -I$(top_srcdir)/intl -I$(top_srcdir)/include @GSCHEM_CFLAGS@
++INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/include @GSCHEM_CFLAGS@
+ gschem_LDADD = -L$(prefix)/lib @GSCHEM_LDFLAGS@ @LIBINTL@
+ 
+ localedir = @datadir@/locale
diff --git a/packages/geda/files/gEDA.desktop b/packages/geda/files/gEDA.desktop
deleted file mode 100644
index 6f6f0c6e38..0000000000
--- a/packages/geda/files/gEDA.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=gEDA
-Comment=GPL suite of Electronic Design Automation tools
-Exec=geda
-Terminal=0
-Type=Application
-Icon=/usr/share/gEDA/bitmap/gschem-net.xpm
-Categories=Utility
diff --git a/packages/geda/geda-gnetlist_20050820.bb b/packages/geda/geda-docs_1.4.1.bb
index a0f7d60fb6..a35d41514b 100644
--- a/packages/geda/geda-gnetlist_20050820.bb
+++ b/packages/geda/geda-docs_1.4.1.bb
@@ -1,11 +1,8 @@
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
-PR = "r0"
-FILES_${PN} += "${datadir}/gEDA"
 
 DEPENDS = "gtk+ libgeda"
 
-SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz"
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz"
 
 inherit autotools pkgconfig
-
diff --git a/packages/geda/geda-gschem_20050820.bb b/packages/geda/geda-examples_1.4.1.bb
index 6ca5e4f77a..a35d41514b 100644
--- a/packages/geda/geda-gschem_20050820.bb
+++ b/packages/geda/geda-examples_1.4.1.bb
@@ -1,11 +1,8 @@
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
-PR = "r1"
-FILES_${PN} += "${datadir}/gEDA"
 
 DEPENDS = "gtk+ libgeda"
 
-SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz"
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz"
 
 inherit autotools pkgconfig
-
diff --git a/packages/geda/geda-gattrib_1.4.1.bb b/packages/geda/geda-gattrib_1.4.1.bb
new file mode 100644
index 0000000000..463da2de99
--- /dev/null
+++ b/packages/geda/geda-gattrib_1.4.1.bb
@@ -0,0 +1,9 @@
+LICENSE = "GPLv2"
+HOMEPAGE = "http://geda.seul.org"
+FILES_${PN} += "${datadir}/gEDA ${datadir}/icons"
+
+DEPENDS = "gtk+ libgeda"
+
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz"
+
+inherit autotools pkgconfig
diff --git a/packages/geda/geda-gattrib_20050820.bb b/packages/geda/geda-gnetlist_1.4.1.bb
index 74c19718f2..4f560d3d37 100644
--- a/packages/geda/geda-gattrib_20050820.bb
+++ b/packages/geda/geda-gnetlist_1.4.1.bb
@@ -4,7 +4,6 @@ FILES_${PN} += "${datadir}/gEDA"
 
 DEPENDS = "gtk+ libgeda"
 
-SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz"
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz"
 
 inherit autotools pkgconfig
-
diff --git a/packages/geda/geda-gschem_1.4.1.bb b/packages/geda/geda-gschem_1.4.1.bb
new file mode 100644
index 0000000000..2ed828c449
--- /dev/null
+++ b/packages/geda/geda-gschem_1.4.1.bb
@@ -0,0 +1,10 @@
+LICENSE = "GPLv2"
+HOMEPAGE = "http://geda.seul.org"
+FILES_${PN} += "${datadir}/gEDA ${datadir}/icons"
+
+DEPENDS = "gtk+ libgeda"
+
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz \
+	   file://bad-include.patch;patch=1"
+
+inherit autotools pkgconfig
diff --git a/packages/geda/geda-gsymcheck_1.4.1.bb b/packages/geda/geda-gsymcheck_1.4.1.bb
new file mode 100644
index 0000000000..463da2de99
--- /dev/null
+++ b/packages/geda/geda-gsymcheck_1.4.1.bb
@@ -0,0 +1,9 @@
+LICENSE = "GPLv2"
+HOMEPAGE = "http://geda.seul.org"
+FILES_${PN} += "${datadir}/gEDA ${datadir}/icons"
+
+DEPENDS = "gtk+ libgeda"
+
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz"
+
+inherit autotools pkgconfig
diff --git a/packages/geda/geda-gsymcheck_20050820.bb b/packages/geda/geda-symbols_1.4.1.bb
index a0f7d60fb6..4f560d3d37 100644
--- a/packages/geda/geda-gsymcheck_20050820.bb
+++ b/packages/geda/geda-symbols_1.4.1.bb
@@ -1,11 +1,9 @@
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
-PR = "r0"
 FILES_${PN} += "${datadir}/gEDA"
 
 DEPENDS = "gtk+ libgeda"
 
-SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz"
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz"
 
 inherit autotools pkgconfig
-
diff --git a/packages/geda/geda-symbols_20050820.bb b/packages/geda/geda-symbols_20050820.bb
deleted file mode 100644
index a0f7d60fb6..0000000000
--- a/packages/geda/geda-symbols_20050820.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-LICENSE = "GPLv2"
-HOMEPAGE = "http://geda.seul.org"
-PR = "r0"
-FILES_${PN} += "${datadir}/gEDA"
-
-DEPENDS = "gtk+ libgeda"
-
-SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
diff --git a/packages/geda/geda-utils_20050820.bb b/packages/geda/geda-utils_1.4.1.bb
index d5b71b3cf7..ea61665d9d 100644
--- a/packages/geda/geda-utils_20050820.bb
+++ b/packages/geda/geda-utils_1.4.1.bb
@@ -2,10 +2,9 @@ DESCRIPTION = "gEDA/gaf's Utilities"
 LICENSE = "GPLv2"
 HOMEPAGE = "http://geda.seul.org"
 FILES_${PN} += "${datadir}/gEDA"
-PR = "r1"
 
 DEPENDS = "libgeda"
 
-SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz"
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz"
 
 inherit autotools pkgconfig
diff --git a/packages/geda/geda_1.4.1.bb b/packages/geda/geda_1.4.1.bb
new file mode 100644
index 0000000000..b3c0e994b4
--- /dev/null
+++ b/packages/geda/geda_1.4.1.bb
@@ -0,0 +1,6 @@
+DESCRIPTION = "GUI/Project Manager for teh gEDA suite"
+LICENSE = "GPLv2"
+HOMEPAGE = "http://geda.seul.org"
+
+DEPENDS = "libgeda gtk+"
+RRECOMMENDS = "geda-utils geda-gattrib geda-gnetlist geda-gschem geda-gsymcheck geda-symbols geda-docs geda-examples"
diff --git a/packages/geda/geda_20050820.bb b/packages/geda/geda_20050820.bb
deleted file mode 100644
index 0ca490a664..0000000000
--- a/packages/geda/geda_20050820.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "GUI/Project Manager for teh gEDA suite"
-LICENSE = "GPLv2"
-HOMEPAGE = "http://geda.seul.org"
-FILES_${PN} += "${datadir}/gEDA"
-PR ="r2"
-
-DEPENDS = "libgeda gtk+"
-RRECOMMENDS = "geda-utils geda-gattrib geda-gnetlist geda-gschem geda-gsymcheck geda-symbols"
-
-SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz \
-	   file://gEDA.desktop"
-
-inherit autotools pkgconfig
-
-do_install_append() {
-install -d ${D}${datadir}/applications/
-install -m 644 ${WORKDIR}/gEDA.desktop ${D}${datadir}/applications/
-}
diff --git a/packages/geda/libgeda_1.4.1.bb b/packages/geda/libgeda_1.4.1.bb
new file mode 100644
index 0000000000..f438f54553
--- /dev/null
+++ b/packages/geda/libgeda_1.4.1.bb
@@ -0,0 +1,20 @@
+LICENSE = "GPLv2"
+HOMEPAGE = "http://geda.seul.org"
+FILES_${PN} += "${datadir}/gEDA ${datadir}/icons ${datadir}/mime"
+# NOTE: Old KDE integration ${datadir}/mimelnk/application/*.desktop are ignored intentionally (utx)
+
+DEPENDS = "zlib gtk+ guile libpng"
+
+SRC_URI = "http://geda.seul.org/release/v1.4/${PV}/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-update-mime-database"
+
+do_install_prepend() {
+	sed -i 's:${STAGING_DIR_HOST}::g' libgeda.pc
+}
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/geda/libgeda_20050820.bb b/packages/geda/libgeda_20050820.bb
deleted file mode 100644
index e27e6f65ae..0000000000
--- a/packages/geda/libgeda_20050820.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-LICENSE = "GPLv2"
-HOMEPAGE = "http://geda.seul.org"
-PR = "r1"
-
-DEPENDS = "zlib gtk+ guile libpng"
-
-SRC_URI = "http://www.geda.seul.org/devel/${PV}/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/guile/guile_1.8.5.bb b/packages/guile/guile_1.8.5.bb
index fe5ebbc154..6d320d8158 100644
--- a/packages/guile/guile_1.8.5.bb
+++ b/packages/guile/guile_1.8.5.bb
@@ -4,13 +4,16 @@ HOMEPAGE = "http://www.gnu.org/software/guile/guile.html"
 SECTION = "devel/scheme"
 DEPENDS = "guile-native gmp libtool"
 LICENSE = "GPL"
+PACKAGES =+ "${PN}-el"
+FILES_${PN}-el = "${datadir}/emacs"
+DESCRIPTION_${PN}-el = "Emacs lisp files for Guile"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
            file://configure-fix.patch;patch=1 "
 
-inherit autotools binconfig
+inherit autotools
 
 acpaths = "-I ${S}/guile-config"
 
@@ -33,5 +36,11 @@ do_compile() {
 
 do_stage() {
 	autotools_stage_all
+	# Create guile-config returning target values instead of native values
+	install -d ${STAGING_BINDIR_CROSS}
+	echo '#!'`which guile`$' \\\n-e main -s\n!#\n(define %guile-build-info '\'\( >guile-config.cross
+	sed -n $'s:-isystem[^ ]* ::;s:-Wl,-rpath-link,[^ ]* ::;s:^[ \t]*{[ \t]*":  (:;s:",[ \t]*": . ":;s:" *}, *\\\\:"):;/^  (/p' <libguile/libpath.h >>guile-config.cross
+	echo '))' >>guile-config.cross
+	cat guile-config/guile-config >>guile-config.cross
+	install guile-config.cross ${STAGING_BINDIR_CROSS}/guile-config
 }
-