Patch Makefile.am not to include $(includedir). Patch-By: John Keeping #430476; Patch configure.in to fix invalid test statement; Add new USE flags to configure some options.

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

5 files changed, 122 insertions, 4 deletions

diff --git a/dev-libs/oniguruma/ChangeLog b/dev-libs/oniguruma/ChangeLog
index 448cf3600151..2336ac768b04 100644
--- a/dev-libs/oniguruma/ChangeLog
+++ b/dev-libs/oniguruma/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/oniguruma
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/oniguruma/ChangeLog,v 1.51 2012/05/04 14:35:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/oniguruma/ChangeLog,v 1.52 2012/08/17 14:41:06 naota Exp $
+
+*oniguruma-5.9.2-r1 (17 Aug 2012)
+
+  17 Aug 2012; Naohiro Aota <naota@gentoo.org>
+  +files/oniguruma-5.9.2-makefile.patch, +oniguruma-5.9.2-r1.ebuild,
+  metadata.xml, oniguruma-5.9.2.ebuild:
+  Patch Makefile.am not to include $(includedir). Patch-By: John Keeping
+  #430476; Patch configure.in to fix invalid test statement; Add new USE flags
+  to configure some options.
 
   04 May 2012; Alexis Ballier <aballier@gentoo.org> oniguruma-5.9.2.ebuild:
   keyword ~amd64-fbsd
@@ -197,4 +206,3 @@
 
   27 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> oniguruma-1.9.5.ebuild:
   Initial import
-
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 7f14d5944f48..d55818c101bc 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX oniguruma-5.9.2-makefile.patch 1347 SHA256 5aec37b86cbeb7ccdea98093876e151d4b7ce07d6d3761ea49d559498452b954 SHA512 72032f730492f501ccfa136b989814ee3d52f44ba62d89c29763af1bc94380f82a01a6fa89cc015afa9c0d8689d1095dbd475f519aaa64c47ee6b803b06cd1b1 WHIRLPOOL 1d760e617aaf18e970d6c6a6d6dc3d00df8424212c8e4465d4e4b46a7388e1146c13fdeaffa028f8b99edce9a096d66ad87ae2220b47502f4c788d48fa9ca2c7
 DIST onig-5.9.2.tar.gz 539739 SHA256 10e7b04ca0baaef2c26f32b37bb70d898b3642d38aefd5ad5062a20f86b751f6 SHA512 fedc9ed663e9970c1f44647431085093f792af1273d5fd25713545e6770652f959a78fb059e44ec348f201f40b2aaa9ef8d081721842f4fa7c486def2a73a8e7 WHIRLPOOL 4fcdd5fcde4ab670b2e7e672b2187a488d698fd6172f9b0c1b237d680dc5cfecac4e9262d7b78e32eb782596cdf92a13f554b45ee5566eabf39349c1c7d8884b
+EBUILD oniguruma-5.9.2-r1.ebuild 1234 SHA256 dd8a952cfdadb6caa4345758efb7fa4e5f775144a36f2bc48d6444ab48c64217 SHA512 982ff091df89747b83e3f2eceb3c5b1bd9978bd6cd12e86488628c0b42f596704e9527f74d0402306372407305bb9d95d08c574d1e946066f1bbba09feb1d8fc WHIRLPOOL 487d68eb501e4c988510dbc809d025bdbc306033bc583375eb315a0006a5683e1c00f5d2ea1a519e686d0e5fb56a3c7757482e464916a18ef6f87b184db78e27
 EBUILD oniguruma-5.9.2.ebuild 932 SHA256 ba46d4c9c108f4d265960828a19e6c8143d70f97706d298647212ebfd72a1780 SHA512 e2d2f88df50d1a2a307f6cb9683bde1e608940b96f2fd3943fd281e3d74e92a0d8f4b6fe59340c2bd5b3badd4d21f1d94b0a0e13baa8a0d4e2b6de0a2a30a574 WHIRLPOOL edfe401899dc18b6548693cc4f25bcbaa80e3eb984f77bcdcdd28ca1efdaa0f3d2765cf50c1cd7146ca96e52a6afba2e51b79db1042d0ebdbe874fe6605120c6
-MISC ChangeLog 6460 SHA256 06a7526c0a28ce2eac29f99f7007f774a7927cf8ccce40201d330b001f1331e3 SHA512 59bb43fc7851bb6edb8bb2eabb7d2d008ffd6da40aca0758d84b6c81d26170349a9cd9627698ac155ee4269a81596e822c6b4690ae356ea91eb298b7ebd4639d WHIRLPOOL ce2bf0faa90bb64dd773a4c91d7f7a1f8399affc30cb8a18e518a6b3f453aa7e1b726dd4f8c860e7e807753649327c4b38d449e722122055c382e8240f638812
-MISC metadata.xml 430 SHA256 3e75dbb9889ef3f831d30a8b07a5598905dad66729ff175ac60c62878b040e13 SHA512 000ec5a79f01526003d26ef5d6e662e2a0f903001dc8af6b3d4bd014f0fc83b25022987dd4205f651a4e158e6a173823bf18ec742ebf050b87c8f5a46a1be970 WHIRLPOOL f55d580618676ae2973dfd6452ef541ff31307d8f50d190491bdef086162765792f586082998b2ae52707116ebc5357b64aced2c4ef598940b5b79fc21d21ff3
+MISC ChangeLog 6829 SHA256 9aaa5afc7c21058b817fab1251836798928f3a6ae2f6ada262e45d79bf815c03 SHA512 0108b675533b5b7c20b3ccccef4b08661bb3eb01a9250415261aaa3daba1679496d8c9101f0dbb1a0c2a32c195a14d84a748d8f122d395106e891bb31f6f5916 WHIRLPOOL ff76517a11e069d693c7e2cd53eb381783d5e020629e23c0b2c0d20264f9182976d658ddd423d80869e0cbb0f559c0279717c731c23cd07cebdeaaa6899dd561
+MISC metadata.xml 622 SHA256 4b811412b70d8dff7e8f665b555cddd12eaf175a03b2b74e2ea598b0c30fc33e SHA512 3bde5659444181fe43bcdbec656e844324f6d7fc3084d3ed1711829d3185906577fa7a81e5666aa368d9dae98bf7265f171cab6d55fe5ed375f8349fdde5465b WHIRLPOOL 3cb1270f4959292908f51b10524a058165c4a91c900818f08e762e26ab59dcef0f0bb87305ef13e85f22da725e0aa85f783373436e51f83de7806e1f3bdaa31b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQLlf4AAoJEDYO1FT4VRUUjBYP/jrGmljnVeMHRrQIaKVUULD9
+w9goA6GmpWgqLS0bxp3cMzw39SK+aTwlbo0GlmGX10PeM1Tz1c7pwjrGYrNpIPRh
+SF1am1btJEVxJEJ3CrNtXYEndcj2wm3edeKMfcjw6boSV72xJmfl+h9YQeTd9RYD
+9yD/Se/lqkbJdHBo/E82JSDHJwhWkwCTzSCK9qIvW9ZDKSW+Gqh6sjt5dfeLvD52
+r7eFoXc0UCWoSzcmGOg57M0sXeNbanDEYxeqlKjyof3fcKFAQFqp8uMhT/H5IoHs
+IYenO8gI1gScvsb1Q3+D1MxRP+DyWUFva1hNlPyEasUajLu+em3QqC3dyI68uA28
+D1vchHwwOTpoHrMHB902yCxwpVrhN7y0pa0yJgcNNxGtiUfuQLYt4uFWlhCpudI6
+jSq5UBKjmBVOUWyP9kOE/j7AMfPwighXplDiqMnDE4mzIp4Y5gX6anRq9zz6J2y/
+VQy09uA6fGHYZQ0aFGf5aRXYr2vKpOUKhFjE5S1p+MhVvpUG4Vc/5SA3+gbqnVYp
+mPQrcZeFfLyiU+cCaIJN7Vxyf5rhIVLZZGTTnvtETEwR4NTmHyYMqIBRQadvgYUP
+gwDBXLrSGsgw5iro/w3MOsE4aaZcaGjkL51AECoEwYUesJtcSsOF2v2XyClUccSh
+trcOHxyH5kmdP3w1sn86
+=jD01
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/oniguruma/files/oniguruma-5.9.2-makefile.patch b/dev-libs/oniguruma/files/oniguruma-5.9.2-makefile.patch
new file mode 100644
index 000000000000..bd594e395631
--- /dev/null
+++ b/dev-libs/oniguruma/files/oniguruma-5.9.2-makefile.patch
@@ -0,0 +1,42 @@
+--- Makefile.am.orig	2012-08-08 10:29:20.313862377 +0100
++++ Makefile.am	2012-08-08 10:29:30.793762591 +0100
+@@ -5,7 +5,7 @@
+ 
+ #AM_CFLAGS = -DNOT_RUBY
+ AM_CFLAGS =
+-INCLUDES  = -I$(top_srcdir) -I$(includedir)
++INCLUDES  = -I$(top_srcdir)
+ 
+ SUBDIRS = . sample
+ 
+--- sample/Makefile.am.orig	2012-08-08 11:37:49.813512228 +0100
++++ sample/Makefile.am	2012-08-08 11:38:00.289410756 +0100
+@@ -2,7 +2,7 @@
+ 
+ libname = $(top_builddir)/libonig.la
+ LDADD   = $(libname)
+-INCLUDES  = -I$(top_srcdir) -I$(includedir)
++INCLUDES  = -I$(top_srcdir)
+ 
+ encode_SOURCES  = encode.c
+ listcap_SOURCES = listcap.c
+--- configure.in.orig
++++ configure.in
+@@ -23,7 +23,7 @@
+ AC_ARG_ENABLE(combination-explosion-check,
+ 	[  --enable-combination-explosion-check   enable combination explosion check],
+ 	[comb_expl_check=$enableval])
+-if test $comb_expl_check = yes; then
++if test "x$comb_expl_check" = xyes; then
+   AC_DEFINE(USE_COMBINATION_EXPLOSION_CHECK,1,[Define if combination explosion check])
+ fi
+ 
+@@ -31,7 +31,7 @@
+ AC_ARG_ENABLE(crnl-as-line-terminator,
+ 	[  --enable-crnl-as-line-terminator   enable CR+NL as line terminator],
+ 	[crnl_as_line_terminator=$enableval])
+-if test $crnl_as_line_terminator = yes; then
++if test "x$crnl_as_line_terminator" = xyes; then
+   AC_DEFINE(USE_CRNL_AS_LINE_TERMINATOR,1,[Define if enable CR+NL as line terminator])
+ fi
+ 
diff --git a/dev-libs/oniguruma/metadata.xml b/dev-libs/oniguruma/metadata.xml
index 5cdf38dd263b..cbabf9d6775f 100644
--- a/dev-libs/oniguruma/metadata.xml
+++ b/dev-libs/oniguruma/metadata.xml
@@ -8,4 +8,12 @@ this library is that different character encoding for every regular
 expression object can be specified.  (Supported character encodings:
 ASCII, UTF-8, EUC-JP, Shift_JIS)
 </longdescription>
+<use>
+  <flag name="combination-explosion-check">
+    enable combination explosion check
+  </flag>
+  <flag name="crnl-as-line-terminator">
+    enable CR+NL as line terminator
+  </flag>
+</use>
 </pkgmetadata>
diff --git a/dev-libs/oniguruma/oniguruma-5.9.2-r1.ebuild b/dev-libs/oniguruma/oniguruma-5.9.2-r1.ebuild
new file mode 100644
index 000000000000..a6cdfc1e2412
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-5.9.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/oniguruma/oniguruma-5.9.2-r1.ebuild,v 1.1 2012/08/17 14:41:06 naota Exp $
+
+EAPI=4
+
+inherit eutils autotools-utils
+
+MY_P=onig-${PV}
+
+DESCRIPTION="a regular expression library for different character encodings"
+HOMEPAGE="http://www.geocities.jp/kosako3/oniguruma"
+SRC_URI="http://www.geocities.jp/kosako3/oniguruma/archive/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+DOCS=( AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} )
+# Needed for a sane .so versionning on fbsd, please dont drop
+AUTOTOOLS_AUTORECONF=1
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable combination-explosion-check)
+		$(use_enable crnl-as-line-terminator)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	use static-libs || prune_libtool_files
+}