Import upstream patch for missing header, fixes bugs alike #402255. Thanks to slepnoga

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 44 insertions, 13 deletions

diff --git a/dev-libs/liblognorm/ChangeLog b/dev-libs/liblognorm/ChangeLog
index b815398c1401..4f26d02d4bc8 100644
--- a/dev-libs/liblognorm/ChangeLog
+++ b/dev-libs/liblognorm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/liblognorm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/ChangeLog,v 1.7 2012/02/05 12:36:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/ChangeLog,v 1.8 2012/02/07 13:15:10 maksbotan Exp $
+
+  07 Feb 2012; Maxim Koltsov <maksbotan@gentoo.org> liblognorm-0.3.2-r1.ebuild,
+  +files/do-not-include-private-in-public-headers.patch:
+  Import upstream patch for missing header, fixes bugs alike #402255. Thanks to 
+  slepnoga.
 
   05 Feb 2012; Agostino Sarubbo <ago@gentoo.org> liblognorm-0.3.2-r1.ebuild:
   Stable for amd64, wrt bug #402163
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index a04ce857523f..41cedd0f0428 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -1,21 +1,36 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+- -----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX do-not-include-private-in-public-headers.patch 234 RMD160 fda08e77ad56b869da444e19727a8d37dcdd9acf SHA1 2be01a4afeec8d66517ab03559cf6a20d5e4e02a SHA256 ca08a0ed23e1fdf3e8df9987df7d436cdd45875352d6c962d900de92ca5ea3fa
 DIST liblognorm-0.3.1.tar.gz 321516 RMD160 bf4ac1a7a3721ea44defa9c1ae536632faff2475 SHA1 6ca9a87964aeb1b602cbec8b2ef7172965c9155a SHA256 e48820023061d578d578583eedcaab1cf832077b10ed3f51fbefb3b638f5b0bb
 DIST liblognorm-0.3.2.tar.gz 326149 RMD160 6f1cd3f99d68d634309daa18a9694c3877d27d88 SHA1 8ff7c1c34dcb2703b9724abc5d4079f9e7e29e93 SHA256 aa7952f8a5256c68d1c77f26dd9ee504ff5f3da8e24f4817c50c9ddde0f3c4d3
 EBUILD liblognorm-0.3.1.ebuild 731 RMD160 7000b9305704935b6f1f38e0bf31fa716f3db500 SHA1 6b5303d94456c5da4361880a8058a0ac6b247590 SHA256 df4026dade675530e41d91bf4d380c3d55433006e78289942bafc3ffed6a584c
-EBUILD liblognorm-0.3.2-r1.ebuild 752 RMD160 ad7880affd24d0fb290e827256fad3590a918c1e SHA1 85550ba678ad77248a5caaa09286454cb7451fe3 SHA256 0344e9abc8513d360547af05ea59f310cea0f643780a91dafc8af9e53e48c489
+EBUILD liblognorm-0.3.2-r1.ebuild 855 RMD160 faefca05eff9af9e2ba6440ada1ec5b0ae32a8b7 SHA1 44bb76315456f08fb4887b045ee0f5dd547590b3 SHA256 e6ad9acdb9e6efb6848d74c5b1934c3509a376893911a484c4ad45dca3e677fc
 EBUILD liblognorm-0.3.2.ebuild 734 RMD160 af66f619dd60b374d397de6714f3d024e7bfaaba SHA1 7eb8c8ad08d546dab78013b6ad4d7cce24d9f264 SHA256 7ccea7b074884fd8323751be3966ed3f80afbc32f1f8b7dbb6bad07be353d1d0
-MISC ChangeLog 1249 RMD160 49d71dd2db6c85827bef54f62cf035cc09847075 SHA1 cb8a4b286b5b1aad7453265d019d310a5d31ce8f SHA256 4a0ab8c420e1b3d4021179acd73372d07f7838dc0e237cc2d6f31bde3c1669f8
+MISC ChangeLog 1486 RMD160 8a158c6d49ae916f69288e11f1f6fb0876ff9548 SHA1 b03ac7fa5dbd369b259322dcb1e3554bf65088fe SHA256 a3fc8573ed6b0bd17bea76ac5d7f51899ea84da36b9d10869d2baad01901ccb3
 MISC metadata.xml 307 RMD160 e16fe585f320ddedd5953a8c5e64229387dbe114 SHA1 8766e043951ac27f40017253c85ec3f462e327af SHA256 1c986d470983173b751b4e065b2b369aeab7952c31e9b419e9f8b0de307924ca
+- -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPMSRZAAoJEAmJmMX429re3JMIALg/JrPQpqSlWifgFM51rEKS
+iAkb3ZceWMv/v4NfNn+O1Wd4pD4E3j/VfScJG2yfvIC1v4JIY8Sl8h2jDhmckVQa
+DsMn+hImjojcUoH3OqIHbj4lVLpW0rdvEJbvBYbhORnB3IQ8HuFveF2qyLWWJ/+h
+mK9gwl1AjMFWEAo2tfXYjzQlGY3+JK5jZ/Xx1+5k8HwxtdxBhZsbJlgRHTHqnLFu
+oFUnc9gNxAs8Pt/cx5hreSyzu/kKqNXn6+RT9KQbTb24K1hbamHOXBt3XIPVrOq8
+OGoMPGmZxurNAJ1MT8JF3CJED/i8loC/AtURmN08tJLStbI6uglcK/Xi4jMBm3E=
+=3y/R
+- -----END PGP SIGNATURE-----
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPLnfsAAoJEOTDgjZ80txdVJoH/ioLti7RtBCUcyR5IlSg4Yby
-WciHoNrVd7qamIvLi+TO77WUqdtC0gChSaD0dZeuMEBlPx+RpWyT00LIPVilRbGp
-MexyKM1unI8xF6NUwoR4VtTZIEecvWcdntW0UOOlCph2ejgMcl1pffooAXtjFAQG
-IvTqgQ+rtH1aQ7dw8eQHKkqwuCu/strQhZr+Ci01UF/GMVgrf5ss3G0sPvruejuh
-3VkvARjKkcPU7OG0fxrHhb+jBts+YD3KPGRjN73GwwuknQI0kwF79EXeOKS9NKEp
-mXL0AX8zCdJBW1BvpDOELTh2jX9fkgR/dnKbtFdm/Fb+GaYZ/1DD+zc2oH8dME0=
-=/Zj/
+iQEcBAEBAgAGBQJPMSTJAAoJEAmJmMX429reSGwIALCGBxkDCk9JBTt1IGYW0VIO
+vbRs9shRQInqVEQBwFgCWEBTtY1hmQIURtEbLdWur/of/8NpVXcM2w3fDLzsaO7s
+NOBz2OT8K2rALcIlCFJxWV/s1wBzY9OirrXsjlaH/lLQyyhegtKGIs07v1XV0/q9
+k3VJzvi8Ay8ERTb7b2taKvZFzssPbXT4MgEJt07AzKVSN76GwS2au/PUwsxlAa8/
+knx7thuAn3vxNgaR821DdcLbu/pMB012QCRpYBE8XYJIjkY9df62pLTgrbMtW5Jz
+eXxIbFnZ7H50Zw2kcCj2P1CCdkbY+6dfexAzERq86KYgx/8wBXbU9vKemnO9lDY=
+=X0aS
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..e985bcd92a01
--- /dev/null
+++ b/dev-libs/liblognorm/files/do-not-include-private-in-public-headers.patch
@@ -0,0 +1,8 @@
+--- 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
index c03c5174e943..93445cf1fe2b 100644
--- a/dev-libs/liblognorm/liblognorm-0.3.2-r1.ebuild
+++ b/dev-libs/liblognorm/liblognorm-0.3.2-r1.ebuild
@@ -1,10 +1,11 @@
 # 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.2 2012/02/05 12:36:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/liblognorm-0.3.2-r1.ebuild,v 1.3 2012/02/07 13:15:10 maksbotan Exp $
 
 EAPI=4
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=1
 
 inherit autotools-utils
 
@@ -22,6 +23,8 @@ DEPEND="
 	dev-libs/libee"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/do-not-include-private-in-public-headers.patch" )
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)