Non-maintainer commit! Version bump to add needed dependency for app-admin/rsyslog security bump (bug #524058). Removed very old versions

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

7 files changed, 30 insertions, 135 deletions

diff --git a/dev-libs/liblognorm/ChangeLog b/dev-libs/liblognorm/ChangeLog
index 7b5522355cdb..cfff8288da27 100644
--- a/dev-libs/liblognorm/ChangeLog
+++ b/dev-libs/liblognorm/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/liblognorm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/ChangeLog,v 1.26 2014/06/30 12:16:36 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/ChangeLog,v 1.27 2014/09/30 12:36:50 polynomial-c Exp $
+
+*liblognorm-1.0.1 (30 Sep 2014)
+
+  30 Sep 2014; Lars Wendler <polynomial-c@gentoo.org>
+  -liblognorm-0.3.2-r1.ebuild, -liblognorm-0.3.3.ebuild,
+  -liblognorm-0.3.4.ebuild, -liblognorm-0.3.5.ebuild,
+  -liblognorm-0.3.6-r1.ebuild, +liblognorm-1.0.1.ebuild,
+  -files/do-not-include-private-in-public-headers.patch:
+  Non-maintainer commit! Version bump to add needed dependency for
+  app-admin/rsyslog security bump (bug #524058). Removed very old versions.
 
 *liblognorm-0.3.7 (30 Jun 2014)
 
diff --git a/dev-libs/liblognorm/files/do-not-include-private-in-public-headers.patch b/dev-libs/liblognorm/files/do-not-include-private-in-public-headers.patch
deleted file mode 100644
index e985bcd92a01..000000000000
--- a/dev-libs/liblognorm/files/do-not-include-private-in-public-headers.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -32,4 +32,4 @@ EXTRA_DIST = \
-        annot.h \
-        samp.h
- 
--include_HEADERS = liblognorm.h samp.h lognorm.h ptree.h
-+include_HEADERS = liblognorm.h samp.h lognorm.h ptree.h annot.h
diff --git a/dev-libs/liblognorm/liblognorm-0.3.2-r1.ebuild b/dev-libs/liblognorm/liblognorm-0.3.2-r1.ebuild
deleted file mode 100644
index ce43781e33e6..000000000000
--- a/dev-libs/liblognorm/liblognorm-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/liblognorm-0.3.2-r1.ebuild,v 1.4 2012/03/09 09:48:56 phajdan.jr Exp $
-
-EAPI=4
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
-SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="debug static-libs"
-
-DEPEND="
-	dev-libs/libestr
-	dev-libs/libee"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/do-not-include-private-in-public-headers.patch" )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile -j1
-}
diff --git a/dev-libs/liblognorm/liblognorm-0.3.3.ebuild b/dev-libs/liblognorm/liblognorm-0.3.3.ebuild
deleted file mode 100644
index b6af759e1dfa..000000000000
--- a/dev-libs/liblognorm/liblognorm-0.3.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/liblognorm-0.3.3.ebuild,v 1.1 2012/02/24 20:02:00 maksbotan Exp $
-
-EAPI=4
-
-inherit  autotools-utils
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
-SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="debug static-libs"
-
-DEPEND="
-	dev-libs/libestr
-	dev-libs/libee"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	autotools-utils_src_compile -j1
-}
diff --git a/dev-libs/liblognorm/liblognorm-0.3.4.ebuild b/dev-libs/liblognorm/liblognorm-0.3.4.ebuild
deleted file mode 100644
index 107dd459a40a..000000000000
--- a/dev-libs/liblognorm/liblognorm-0.3.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/liblognorm-0.3.4.ebuild,v 1.6 2012/07/23 20:53:18 maekke Exp $
-
-EAPI=4
-
-inherit  autotools-utils
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
-SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa x86 ~amd64-linux"
-IUSE="debug static-libs"
-
-DEPEND="
-	dev-libs/libestr
-	dev-libs/libee"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	autotools-utils_src_compile -j1
-}
diff --git a/dev-libs/liblognorm/liblognorm-0.3.5.ebuild b/dev-libs/liblognorm/liblognorm-0.3.5.ebuild
deleted file mode 100644
index eddf0b5cc4db..000000000000
--- a/dev-libs/liblognorm/liblognorm-0.3.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/liblognorm-0.3.5.ebuild,v 1.3 2013/02/17 17:39:56 ago Exp $
-
-EAPI=4
-
-inherit  autotools-utils
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
-SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa x86 ~amd64-linux"
-IUSE="debug static-libs"
-
-DEPEND="
-	dev-libs/libestr
-	dev-libs/libee"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	autotools-utils_src_compile -j1
-}
diff --git a/dev-libs/liblognorm/liblognorm-0.3.6-r1.ebuild b/dev-libs/liblognorm/liblognorm-1.0.1.ebuild
index f3bb767e5503..ebf31dba5cfa 100644
--- a/dev-libs/liblognorm/liblognorm-0.3.6-r1.ebuild
+++ b/dev-libs/liblognorm/liblognorm-1.0.1.ebuild
@@ -1,34 +1,40 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/liblognorm-0.3.6-r1.ebuild,v 1.1 2014/03/20 14:19:00 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/liblognorm-1.0.1.ebuild,v 1.1 2014/09/30 12:36:50 polynomial-c Exp $
 
 EAPI=5
 
-AUTOTOOLS_AUTORECONF="yes"
-
-inherit  autotools-utils
+inherit autotools-utils
 
 DESCRIPTION="Fast samples-based log normalization library"
 HOMEPAGE="http://www.liblognorm.com"
 SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="0/1"
 KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
-IUSE="debug static-libs"
+#IUSE="debug static-libs" - "debug" USE flag disabled due to https://github.com/rsyslog/liblognorm/issues/5
+IUSE="static-libs"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
 
 RDEPEND="
 	>=dev-libs/libestr-0.1.3
-	>=dev-libs/libee-0.3.2
-	"
+	>=dev-libs/json-c-0.11:=
+"
 
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	virtual/pkgconfig
-	"
+"
+
 DOCS=( ChangeLog )
 
-PATCHES=( "${FILESDIR}"/respect_CFLAGS.patch )
+src_configure() {
+	local myeconfargs=(
+		--disable-docs
+		#$(use_enable debug)
+	)
 
-src_compile() {
-	autotools-utils_src_compile -j1
+	autotools-utils_src_configure
 }