merge of '76e1e69496801009ea0aa69c84f76e858978ab99'

     and 'db976a98427dd6a195e2cf167e225de2d0206aea'

4 files changed, 28 insertions, 69 deletions

diff --git a/packages/elfutils/elfutils-0.108/.mtn2git_empty b/packages/elfutils/elfutils-0.127/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/elfutils/elfutils-0.108/.mtn2git_empty
+++ b/packages/elfutils/elfutils-0.127/.mtn2git_empty
diff --git a/packages/elfutils/elfutils-0.108/warnings.patch b/packages/elfutils/elfutils-0.127/warnings.patch
index 9de027ee26..c2e7fc2f3d 100644
--- a/packages/elfutils/elfutils-0.108/warnings.patch
+++ b/packages/elfutils/elfutils-0.127/warnings.patch
@@ -2,7 +2,7 @@ Index: elfutils-0.108/configure.ac
 ===================================================================
 --- elfutils-0.108.orig/configure.ac	2006-04-10 19:18:34.000000000 +0100
 +++ elfutils-0.108/configure.ac	2006-04-10 19:19:33.000000000 +0100
-@@ -49,6 +49,10 @@
+@@ -55,6 +55,10 @@
  dnl Add all the languages for which translations are available.
  ALL_LINGUAS=
  
@@ -17,7 +17,7 @@ Index: elfutils-0.108/lib/Makefile.am
 ===================================================================
 --- elfutils-0.108.orig/lib/Makefile.am	2006-04-10 19:18:34.000000000 +0100
 +++ elfutils-0.108/lib/Makefile.am	2006-04-10 19:19:33.000000000 +0100
-@@ -21,7 +21,7 @@
+@@ -30,7 +30,7 @@
  else
  AM_CFLAGS =
  endif
@@ -28,15 +28,16 @@ Index: elfutils-0.108/lib/Makefile.am
  noinst_LIBRARIES = libeu.a
 Index: elfutils-0.108/libasm/Makefile.am
 ===================================================================
---- elfutils-0.108.orig/libasm/Makefile.am	2006-04-10 19:18:34.000000000 +0100
-+++ elfutils-0.108/libasm/Makefile.am	2006-04-10 19:19:33.000000000 +0100
-@@ -18,7 +18,7 @@
+--- elfutils-0.127.orig/libasm/Makefile.am	2006-04-10 19:18:34.000000000 +0100
++++ elfutils-0.127/libasm/Makefile.am	2006-04-10 19:19:33.000000000 +0100
+@@ -30,7 +30,7 @@
  else
  AM_CFLAGS =
  endif
--AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2
-+AM_CFLAGS += -Wshadow -Wunused -Wformat=2
- INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \
+-AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2
++AM_CFLAGS += -std=gnu99 -Wshadow -Wunused -Wformat=2
+ INCLUDES = -I. -I$(srcdir) -I.. \
+            -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\
  	   -I$(top_srcdir)/lib
  GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 Index: elfutils-0.108/libcpu/Makefile.am
@@ -91,28 +92,6 @@ Index: elfutils-0.108/libelf/Makefile.am
  	     $($(*F)_CFLAGS)
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I..
  GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
-Index: elfutils-0.108/src/Makefile.am
-===================================================================
---- elfutils-0.108.orig/src/Makefile.am	2006-04-10 19:18:34.000000000 +0100
-+++ elfutils-0.108/src/Makefile.am	2006-04-10 19:20:19.000000000 +0100
-@@ -15,14 +15,12 @@
- DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \
-        -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\"
- if MUDFLAP
--AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 -fmudflap \
-+AM_CFLAGS = -Wshadow -Wunused -std=gnu99 -fmudflap \
- 	    $(native_ld_cflags) $(if $($(*F)_no_Wunused),,-Wunused) \
- 	    $(if $($(*F)_no_Wformat),,-Wformat=2)
- else
--AM_CFLAGS = -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \
--	    $(if $($(*F)_no_Werror),,-Werror) \
--	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
--	    $(if $($(*F)_no_Wformat),,-Wformat=2)
-+AM_CFLAGS = -Wshadow -std=gnu99 $(native_ld_cflags) \
-+	    $(if $($(*F)_no_Werror),,-Werror)	    
- endif
- if MUDFLAP
- libmudflap = -lmudflap
 Index: elfutils-0.108/tests/Makefile.am
 ===================================================================
 --- elfutils-0.108.orig/tests/Makefile.am	2006-04-10 19:18:34.000000000 +0100
@@ -121,12 +100,13 @@ Index: elfutils-0.108/tests/Makefile.am
  ##
  DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE
  if MUDFLAP
--AM_CFLAGS = -Wall -Werror -std=gnu99 -fmudflap\
+-AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\
 +AM_CFLAGS = -std=gnu99 -fmudflap\
  	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
+ BUILD_RPATH = \$$ORIGIN/../backends
  else
--AM_CFLAGS = -Wall -Werror -std=gnu99 \
+-AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
 +AM_CFLAGS = -std=gnu99 \
  	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
- AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../libebl:\$$ORIGIN/../libelf
+ BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf
  endif
diff --git a/packages/elfutils/elfutils_0.108.bb b/packages/elfutils/elfutils_0.108.bb
deleted file mode 100644
index 83acc7dccb..0000000000
--- a/packages/elfutils/elfutils_0.108.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-SECTION = "base"
-LICENSE = "OSL"
-DESCRIPTION = "A collection of utilities and DSOs to handle compiled objects."
-DEPENDS = "libtool"
-
-SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-${PV}.tar.gz \
-	   file://warnings.patch;patch=1"
-
-inherit autotools
-
-SOV = "${PV}"
-do_stage () {
-	install -m 0644 libelf/libelf.a ${STAGING_LIBDIR}/libelf.a
-	install -m 0755 libelf/libelf.so.1 ${STAGING_LIBDIR}/libelf-${SOV}.so
-	ln -sf libelf-${SOV}.so ${STAGING_LIBDIR}/libelf.so.1
-	ln -sf libelf.so.1 ${STAGING_LIBDIR}/libelf.so
-	install -m 0644 libasm/libasm.a ${STAGING_LIBDIR}/libasm.a
-	install -m 0755 libasm/libasm.so.1 ${STAGING_LIBDIR}/libasm-${SOV}.so
-	ln -sf libasm-${SOV}.so ${STAGING_LIBDIR}/libasm.so.1
-	ln -sf libasm.so.1 ${STAGING_LIBDIR}/libasm.so
-	install -m 0644 libdw/libdw.a ${STAGING_LIBDIR}/libdw.a
-	install -m 0755 libdw/libdw.so.1 ${STAGING_LIBDIR}/libdw-${SOV}.so
-	ln -sf libdw-${SOV}.so ${STAGING_LIBDIR}/libdw.so.1
-	ln -sf libdw.so.1 ${STAGING_LIBDIR}/libdw.so
-	install -m 0644 libebl/libebl.a ${STAGING_LIBDIR}/libebl.a
-	install -d ${STAGING_LIBDIR}/elfutils/
-	install -m 0755 libebl/libebl_*.so ${STAGING_LIBDIR}/elfutils/
-
-	install -m 0644 ${S}/libelf/libelf.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/libelf/gelf.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/libelf/nlist.h ${STAGING_INCDIR}/
-	install -d ${STAGING_INCDIR}/elfutils
-	install -m 0644 ${S}/libebl/libebl.h ${STAGING_INCDIR}/elfutils/
-	install -m 0644 ${S}/libdw/libdw.h ${STAGING_INCDIR}/elfutils/
-	install -m 0644 ${S}/libasm/libasm.h ${STAGING_INCDIR}/elfutils/
-}
diff --git a/packages/elfutils/elfutils_0.127.bb b/packages/elfutils/elfutils_0.127.bb
new file mode 100644
index 0000000000..22f3b0ae46
--- /dev/null
+++ b/packages/elfutils/elfutils_0.127.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "A collection of utilities and DSOs to handle compiled objects."
+SECTION = "base"
+LICENSE = "OSL"
+DEPENDS = "libtool"
+
+SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-${PV}.tar.gz \
+	   file://warnings.patch;patch=1"
+
+inherit autotools
+
+do_stage () {
+	autotools_stage_all
+}
+
+