app-misc/regex-markup: Fix missing declerations, #240044; bump EAPI=4; add missing configure options

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 62 insertions, 19 deletions

diff --git a/app-misc/regex-markup/ChangeLog b/app-misc/regex-markup/ChangeLog
index 2e1ceb5d76ef..40d2428da798 100644
--- a/app-misc/regex-markup/ChangeLog
+++ b/app-misc/regex-markup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/regex-markup
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/regex-markup/ChangeLog,v 1.14 2008/05/11 14:01:15 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/regex-markup/ChangeLog,v 1.15 2012/06/20 12:23:18 jlec Exp $
+
+  20 Jun 2012; Justin Lecher <jlec@gentoo.org> regex-markup-0.10.0.ebuild,
+  +files/regex-markup-0.10.0-locale.patch:
+  Fix missing declerations, #240044; bump EAPI=4; add missing configure options
 
   11 May 2008; Markus Meier <maekke@gentoo.org> -regex-markup-0.9.0.ebuild:
   old
diff --git a/app-misc/regex-markup/Manifest b/app-misc/regex-markup/Manifest
index 8c97bdad51b7..64c3b4f69542 100644
--- a/app-misc/regex-markup/Manifest
+++ b/app-misc/regex-markup/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX regex-markup-0.10.0-locale.patch 646 RMD160 a04e64fba0932fcddcca0f1ffbf33fe0b32c053f SHA1 5a5e6474efdb2c2f76a89f271ea251c9148a7b4b SHA256 faad155bba38c6fbb5f49adbf1fc1aac20763da4f1909d42851d6bb6642bfd8d
 DIST regex-markup-0.10.0.tar.gz 424480 RMD160 ca9501cb7b1e7973e9d17bfaee33d49b674bdc61 SHA1 61b4af0b6ece3da5ef10b7ce1035bbfeb9167e44 SHA256 879f0af7622c1eb2d1b7c5f7d0ec53ea96fd48b05bc4f4c17542a2ea17fafba5
-EBUILD regex-markup-0.10.0.ebuild 665 RMD160 abf31be2662ee7705bae3611fa6a9e095eb79a7d SHA1 32344ccc9f7577ffb9a6c2df5b0db04da043f0e0 SHA256 4890803b15d8fd885c683d378851f16f67604bd260c2a86fc944df986ce86731
-MISC ChangeLog 1653 RMD160 45acb094ea1d4fce773dd31eddc806cbdcd06d50 SHA1 fd89069b10a368dac3742aa69205bc3bbb460fe1 SHA256 8ff77b4dce25880d6d82c328d04df3afdb6b9fd3274b6d85e46550967f345b78
+EBUILD regex-markup-0.10.0.ebuild 714 RMD160 201ac8562ff360bb0322e2982b77e8619e4415aa SHA1 2c4797fdd55b0082ceb28adaf903c105b635340c SHA256 527cae8f0e3274e9cbd86d351ca0183cfb5d5abcf7bd9c84ecf5f065667981c8
+MISC ChangeLog 1850 RMD160 5f777ed99fc1215fe2fde00e8375324f2c7be8a4 SHA1 69297579e28a811fc8305878e192ceb52158afd3 SHA256 609726d64fa3e29800aaa1fbab33373c09d82d00f3f96bd91b26e119db09d784
 MISC metadata.xml 268 RMD160 01696164cd82ae0617304a419940adecf5a9d222 SHA1 b52a9b90dd049bc8749bc0d25cdfddebd447860f SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iJwEAQEIAAYFAk58/5oACgkQfXuS5UK5QB31BAP/SmkC+MoKIWOYRQREUJbvWAsN
-XLk5Jjkq89cVfWxKI7fb5NaNfn0G6oHgjx3CLVfVAn4w7zIHxtseU7XAfbd+WKOU
-H3V1p1AfQQrxn3+XbYlYEptl5yLEV01DBABrgx+3o/v9FGmIoHKLHajmZPdlxYn6
-d07atEOo/QtwyqWLIVI=
-=/AiO
+iEYEAREKAAYFAk/hwLsACgkQgAnW8HDreRaJdgCaAkCsOWXoryAEytYhGHpz7/8l
+qUQAnizSqvBGPMoRQPoGNF0sBXb1+Vec
+=R4U6
 -----END PGP SIGNATURE-----
diff --git a/app-misc/regex-markup/files/regex-markup-0.10.0-locale.patch b/app-misc/regex-markup/files/regex-markup-0.10.0-locale.patch
new file mode 100644
index 000000000000..be9c74a66ceb
--- /dev/null
+++ b/app-misc/regex-markup/files/regex-markup-0.10.0-locale.patch
@@ -0,0 +1,29 @@
+ src/cacheline.c |    2 ++
+ src/remark.c    |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/cacheline.c b/src/cacheline.c
+index 8c6f97b..f395c60 100644
+--- a/src/cacheline.c
++++ b/src/cacheline.c
+@@ -27,6 +27,8 @@
+ #include "getline.h"		/* Gnulib/GNU Libc */
+ #include "version-etc.h"	/* Gnulib */
+ 
++#include <locale.h>
++
+ enum {
+     HELP_OPT = 256,
+     VERSION_OPT
+diff --git a/src/remark.c b/src/remark.c
+index dcf8327..8998112 100644
+--- a/src/remark.c
++++ b/src/remark.c
+@@ -44,6 +44,7 @@
+ #include "common/intutil.h"
+ /* regex-markup */
+ #include "remark.h"
++#include <locale.h>
+ 
+ #define PROGRAM "remark"
+ 
diff --git a/app-misc/regex-markup/regex-markup-0.10.0.ebuild b/app-misc/regex-markup/regex-markup-0.10.0.ebuild
index 7d187578ad6b..0c6f5bdf4df2 100644
--- a/app-misc/regex-markup/regex-markup-0.10.0.ebuild
+++ b/app-misc/regex-markup/regex-markup-0.10.0.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/regex-markup/regex-markup-0.10.0.ebuild,v 1.3 2008/05/11 14:00:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/regex-markup/regex-markup-0.10.0.ebuild,v 1.4 2012/06/20 12:23:18 jlec Exp $
+
+EAPI=4
+
+inherit eutils
 
 DESCRIPTION="A tool to color syslog files as well"
 HOMEPAGE="http://www.nongnu.org/regex-markup/"
@@ -9,16 +13,22 @@ SRC_URI="http://savannah.nongnu.org/download/regex-markup/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="examples"
+IUSE="examples nls"
 
-DEPEND=""
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-locale.patch
+}
+
+src_configure() {
+	econf \
+		--enable-largefile \
+		$(use_enable nls)
+}
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	default
 	if use examples; then
 		cd examples
-		make -f Makefile
-		cd ..
+		emake -f Makefile
 	fi
-	dodoc AUTHORS ChangeLog NEWS README TODO
 }