Version bump, automake-1.13 patches.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

7 files changed, 102 insertions, 30 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/Manifest b/net-libs/libosmocore/Manifest
index 0ef4875604b6..e52950a3958f 100644
--- a/net-libs/libosmocore/Manifest
+++ b/net-libs/libosmocore/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX libosmocore-0.5.3-automake-1.13.patch 245 SHA256 2d40f6fdbc5d3a939992b27006c8d4672b4269062c73c9647a29fab8742b478d SHA512 ff806faba4629cfc23173f98470ef13a1871f738d3313912635be07ff91b50236b73e44ce328439798f9c01c5b3c3cf0d86d091f43195d6f77e35d0438ec2df1 WHIRLPOOL 086e57e12104eb275ed9380d1b6e1d57a5312f34d08d4ad1ecee470815e71d4a400b07a229bd65fe782b18dd2881eaa37d0272f3a1ba8e45b5803834fe874601
+AUX libosmocore-0.6.0-automake-1.13.patch 245 SHA256 a84fc6d01bb0ed7bcf7688d675f416050cd4066d8fdc2e6dde9527af8d9fee6f SHA512 be6ad33f91009e6a38d02deafcb69e4e6d88e7436531ddee822b461d95263609b9a6983d7f523cc6d7f97fb8794f32b1b15f9afe1f784bee907ad48535091e1f WHIRLPOOL 5a5941430ae83c423a4b451e7efdf110ee654df04c1cf8b9c7bcda562bd02c13ec49c63bebffb8426b47ac2a3174b16a2898b65c901b96e6ccc1530f99acb8db
 DIST libosmocore-0.5.3.tar.bz2 286005 SHA256 79a97464f06d2415b52712a9d96bdf263174febff674e6a18cbbbdf84f1fd1fa SHA512 f76dcd99b803f9230c1009770c6ace26c14f60f6f0ba7972be91a0519498e928fdc00fc4557b898dac220085230c5527ca8550dd4ab250c2afa05373316aaf0e WHIRLPOOL 8f33ce51761988b1e0fe1db4c3ed609b9b3b731047e09d2661fac2b93f4f2c4e332f6c4f606ff1250a07a38cc4a6195119d1bb9a1a02881bac76468a45075fdb
-EBUILD libosmocore-0.5.3.ebuild 1036 SHA256 85ed0db83c00e3a4a6b7c471e06c5ec337ceed51df7510940a4def2037b1b748 SHA512 29f0d8615d003fba5d58fd2778a9a55372cbe4cf54f2efcab787fc42dc45d91bd9b1bd3bf46f9690f80a3fdcbbbbd0dd7dc0c2a07df45f16eebc0b6b5e460efc WHIRLPOOL 67fd44f5d6b09e4c527729142a1896f98f75e98a4d16f9c5babaf20d9d259244579f0a6b7a8cf964736d6a8fd75af1b3c52aa0c609b593de9ed4242e5cdd994a
-EBUILD libosmocore-9999.ebuild 1028 SHA256 1db2b5ef2840b293b42ba0ccaeba9da3118c2c4cefc808dc367545f725f5a920 SHA512 96d5338e45f84a171cdab6e3f5832a0fa6aa5b1ad6060d6b7ea4fe36dc43d472c8e4460693283eb2816b370d2c75f36a51f6ddca7af009a99d6eb4252596988b WHIRLPOOL f15d105e67be52fb053b93f6e447d2c774c710305d458ab42ef6721a186738ac906cf8bfd9e7a3f565445152e5d3f56d7e33848889c511c6df010786c51fb196
-MISC ChangeLog 1394 SHA256 bba0613d8ae6205fb22944260e9e60b2576a14991fdf4f0829697fb0c5d49dbd SHA512 ad9864e554354c264f230d24caceed7fab337c13e449c63e4d1f718bba5d20bddcded2f9e3c4d8126d9b7f21ea157ea4dde6c005cc6028f440a93289a3969995 WHIRLPOOL ada2db5d066b415a2fcd2d46724117bbf71f140cc58a7480b2bb9775790c7ac562e9bf2d3cd482a623b0582c8f429b1df58650e74dc76cdfff0df15ae18f7026
+DIST libosmocore-0.6.0.tar.bz2 301924 SHA256 9b480221d510f55fb3d02d22b50aa998e16e776ab1f2eeb4ede97c565d70d6f8 SHA512 1a03c602f3025fe87439dbedc00f2d65862f07585eea9db9f2753d7112c5347351ee237db313ac7c0f33eef424e57da89e893eac446bc86f20a3f366468d76f2 WHIRLPOOL d0f3e997b4d14bf87872941ed61f876c310e7bcb2dcb36c5ecb74822889947504d85701b51fd7f08a2716e24190262bf27cd61ffe2a7c6dd6ebeb245d780934b
+EBUILD libosmocore-0.5.3.ebuild 950 SHA256 0d2371c33f60f7304153740bfacaa518e6b4c85f42ddc68b362ad74caa46b65b SHA512 b932b722a1eae9239217b0dd8b23e9ebb651d2e9d0d0154bd0420db8cd8514b7dfa28795b18db817b6f3c520954feef98a9ff9bb752a26fbe377d6ed4b62092f WHIRLPOOL 2c148bfbc3188dd3f3c4bee5f1e636dc3c1baeacd60f75604b29a2fdf166e4bb69107b51c773b6891c7ca6e8ba8e199ebdb24d81185dc2967d5d1592c93609fd
+EBUILD libosmocore-0.6.0.ebuild 950 SHA256 650cbe84493e1160277b2bb5e2991b5375bf94e964d1425603eb91da6ceac1ef SHA512 7cc2c8e3cc8b7e7ecdb31848ccb00176d929f3f3b62f472c7ce2af393c3ec0af6473ba0ce480708f5295f3c09071d80ad97d9defeda931b4f785c8c734cffcc7 WHIRLPOOL 356bc9614269766a23a1e25c4a8f6b756f89271bad237794a30ddebc7dd44ac780a1be555932a65b2aadf0c841681e69063d652ab26c3aa91fe8364f33de98cf
+EBUILD libosmocore-9999.ebuild 926 SHA256 de518c74e7b0ece555d62e3f603cc2aa58613ecb7bdfafced4ffb3ccc068f7a1 SHA512 45ba6ecbe7d389b5cadebc370724cee1b5d36a841abff0bb5cf9787b066c20b7fb806c66fe5512c24bb2712ca0396bfe8813e84b11021c7c72451d59cb19c063 WHIRLPOOL 6d8751b12645ab36dd54a471324fdc00341a31a3b0a9e58c63a0138ae120cb0b089840335bf7e261de2a3ba1ebf9a3855ee8543493c0adc6e1de69263374b09f
+MISC ChangeLog 1685 SHA256 2ef9c1e9862c0dc21c45091f288c24c63f7e393ee97b0ad440eb4b1f4f966b4b SHA512 a47a66c73800ceb34077cb4bfea9fcd4d00f15505b8e6a4fef718736c7e0f9a8ab0f467ba7c53b637781d8761e3a1e5fe92d93cd48f2a51a538cdb2d27d230d9 WHIRLPOOL 527dd4d87f9492e58dc96aa2ccb44a4be2207729cca49d7a45078a4a43b476449463f71995231fd479ad671beba12505e2b89bde99ac3b90e0699b8d6d689d24
 MISC metadata.xml 262 SHA256 4fb22ce1a8144565f063476a3371a87c9533d50fcdc3ea223932398f9c3900d4 SHA512 59a43a6d12f7be35e904d887522660463df1a8cc216d6a0a6f569e63f03217737dad7a8c78e1a31d2816bd7c3f89519cae455feb7c43570d94aac266b2342cca WHIRLPOOL 2cc5f91fc3c54baac4961e2df77b47b05cb6bf7b7fe89f9848605bc014e03b05bcb787f277bce6936f1cc57347e13f0113ad4124f4d4e740890e02dfd6284984
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlGfHYkACgkQknrdDGLu8JDz2QD/UOrSXP9RbWkiLwp8g+s8wved
+3OKRYcUND0k0IRB3OMgA/0obk8tFh2ik5IMAiY5fqxe+gXzwWXh6rxT41yEtjE9z
+=4nZX
+-----END PGP SIGNATURE-----
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
 }