Version bump, automake-1.13 patches.

(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

6 files changed, 85 insertions, 27 deletions

diff --git a/net-libs/libosmocore/ChangeLog b/net-libs/libosmocore/ChangeLog
index 55cf6b787588..b39748377907 100644
--- a/net-libs/libosmocore/ChangeLog
+++ b/net-libs/libosmocore/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libosmocore
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libosmocore/ChangeLog,v 1.6 2012/08/11 05:34:26 chithanh Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libosmocore/ChangeLog,v 1.7 2013/05/24 07:57:52 xmw Exp $
+
+*libosmocore-0.6.0 (24 May 2013)
+
+  24 May 2013; Michael Weber <xmw@gentoo.org>
+  +files/libosmocore-0.5.3-automake-1.13.patch,
+  +files/libosmocore-0.6.0-automake-1.13.patch, +libosmocore-0.6.0.ebuild,
+  libosmocore-0.5.3.ebuild, libosmocore-9999.ebuild:
+  Version bump, automake-1.13 patches.
 
   11 Aug 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   -files/libosmocore-0.5.2-gcc-4.6.patch:
diff --git a/net-libs/libosmocore/files/libosmocore-0.5.3-automake-1.13.patch b/net-libs/libosmocore/files/libosmocore-0.5.3-automake-1.13.patch
new file mode 100644
index 000000000000..857aecf345ec
--- /dev/null
+++ b/net-libs/libosmocore/files/libosmocore-0.5.3-automake-1.13.patch
@@ -0,0 +1,11 @@
+--- libosmocore-0.5.3/configure.ac
++++ libosmocore-0.5.3/configure.ac
+@@ -40,7 +40,7 @@
+ AC_SUBST(SYMBOL_VISIBILITY)
+ 
+ dnl Generate the output
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AC_ARG_ENABLE(talloc,
+ 	[AS_HELP_STRING(
diff --git a/net-libs/libosmocore/files/libosmocore-0.6.0-automake-1.13.patch b/net-libs/libosmocore/files/libosmocore-0.6.0-automake-1.13.patch
new file mode 100644
index 000000000000..c61ecac1f336
--- /dev/null
+++ b/net-libs/libosmocore/files/libosmocore-0.6.0-automake-1.13.patch
@@ -0,0 +1,11 @@
+--- libosmocore-0.6.0/configure.ac
++++ libosmocore-0.6.0/configure.ac
+@@ -77,7 +77,7 @@
+ CHECK_TM_INCLUDES_TM_GMTOFF
+ 
+ dnl Generate the output
+-AC_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AC_ARG_ENABLE(talloc,
+ 	[AS_HELP_STRING(
diff --git a/net-libs/libosmocore/libosmocore-0.5.3.ebuild b/net-libs/libosmocore/libosmocore-0.5.3.ebuild
index 6bc8b11d46a1..07316964c1fb 100644
--- a/net-libs/libosmocore/libosmocore-0.5.3.ebuild
+++ b/net-libs/libosmocore/libosmocore-0.5.3.ebuild
@@ -1,25 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libosmocore/libosmocore-0.5.3.ebuild,v 1.1 2012/08/11 04:59:50 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libosmocore/libosmocore-0.5.3.ebuild,v 1.2 2013/05/24 07:57:52 xmw Exp $
 
 EAPI="4"
-inherit autotools eutils
 
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
+inherit autotools eutils
 
 DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
 HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
+SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-3"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="embedded"
 
 RDEPEND=""
@@ -29,6 +22,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# set correct version in pkgconfig files
 	sed -i "s/UNKNOWN/${PV}/" git-version-gen || die
+
+	epatch "${FILESDIR}"/${P}-automake-1.13.patch
 	eautoreconf
 }
 
diff --git a/net-libs/libosmocore/libosmocore-0.6.0.ebuild b/net-libs/libosmocore/libosmocore-0.6.0.ebuild
new file mode 100644
index 000000000000..b2393d77bdc9
--- /dev/null
+++ b/net-libs/libosmocore/libosmocore-0.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libosmocore/libosmocore-0.6.0.ebuild,v 1.1 2013/05/24 07:57:52 xmw Exp $
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
+HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
+SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="embedded"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-doc/doxygen"
+
+src_prepare() {
+	# set correct version in pkgconfig files
+	sed -i "s/UNKNOWN/${PV}/" git-version-gen || die
+
+	epatch "${FILESDIR}"/${P}-automake-1.13.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable embedded)
+}
+
+src_install() {
+	default
+	# install to correct documentation directory
+	mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
+}
diff --git a/net-libs/libosmocore/libosmocore-9999.ebuild b/net-libs/libosmocore/libosmocore-9999.ebuild
index e47e8b7dbf1d..6eeedf5ac4a7 100644
--- a/net-libs/libosmocore/libosmocore-9999.ebuild
+++ b/net-libs/libosmocore/libosmocore-9999.ebuild
@@ -1,25 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libosmocore/libosmocore-9999.ebuild,v 1.3 2012/08/01 23:40:13 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libosmocore/libosmocore-9999.ebuild,v 1.4 2013/05/24 07:57:52 xmw Exp $
 
 EAPI="4"
-inherit autotools
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
+
+inherit autotools eutils git-2
 
 DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
 HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
+EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
 
 LICENSE="GPL-2 LGPL-3"
 SLOT="0"
+KEYWORDS=""
 IUSE="embedded"
 
 RDEPEND=""
@@ -29,6 +22,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# set correct version in pkgconfig files
 	sed -i "s/UNKNOWN/${PV}/" git-version-gen || die
+
+	epatch "${FILESDIR}"/${PN}-0.6.0-automake-1.13.patch
 	eautoreconf
 }