From 3f45f91de0a6998760c3dbb3e827bacd95f0d46f Mon Sep 17 00:00:00 2001
From: Ilya Tumaykin <itumaykin@gmail.com>
Date: Tue, 2 Feb 2016 05:28:00 +0300
Subject: dev-libs/uchardet: revbump to 0.0.5-r1 to fix return code on error

Package-Manager: portage-2.2.27
---
 .../uchardet-0.0.5-fix-return-code-on-error.patch  | 19 ++++++++++++
 dev-libs/uchardet/uchardet-0.0.5-r1.ebuild         | 34 ++++++++++++++++++++++
 dev-libs/uchardet/uchardet-0.0.5.ebuild            | 33 ---------------------
 3 files changed, 53 insertions(+), 33 deletions(-)
 create mode 100644 dev-libs/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch
 create mode 100644 dev-libs/uchardet/uchardet-0.0.5-r1.ebuild
 delete mode 100644 dev-libs/uchardet/uchardet-0.0.5.ebuild

(limited to 'dev-libs/uchardet')

diff --git a/dev-libs/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch b/dev-libs/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch
new file mode 100644
index 000000000000..3b943afea15d
--- /dev/null
+++ b/dev-libs/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch
@@ -0,0 +1,19 @@
+commit 248d6dbd351c22989090d318128cb38b11a89f98
+Author: Jehan <jehan@girinstud.io>
+Date:   Thu Jan 21 18:16:42 2016 +0100
+
+    tools: exit with non-zero value on uchardet error.
+
+diff --git a/src/tools/uchardet.cpp b/src/tools/uchardet.cpp
+index 91912a0..bcfa234 100644
+--- a/src/tools/uchardet.cpp
++++ b/src/tools/uchardet.cpp
+@@ -60,7 +60,7 @@ void detect(FILE * fp)
+         if (retval != 0)
+         {
+             fprintf(stderr, "Handle data error.\n");
+-            exit(0);
++            exit(1);
+         }
+     }
+     uchardet_data_end(handle);
diff --git a/dev-libs/uchardet/uchardet-0.0.5-r1.ebuild b/dev-libs/uchardet/uchardet-0.0.5-r1.ebuild
new file mode 100644
index 000000000000..0dd07643a822
--- /dev/null
+++ b/dev-libs/uchardet/uchardet-0.0.5-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="An encoding detector library ported from Mozilla"
+HOMEPAGE="https://github.com/BYVoid/uchardet"
+SRC_URI="https://github.com/BYVoid/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-ASCII-detection.patch"
+	"${FILESDIR}/${P}-use-proper-package-name.patch"
+	"${FILESDIR}/${P}-fix-return-code-on-error.patch"
+)
+
+src_prepare() {
+	use test || comment_add_subdirectory test
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build static-libs STATIC)
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/uchardet/uchardet-0.0.5.ebuild b/dev-libs/uchardet/uchardet-0.0.5.ebuild
deleted file mode 100644
index 1c0d57eb5393..000000000000
--- a/dev-libs/uchardet/uchardet-0.0.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="An encoding detector library ported from Mozilla"
-HOMEPAGE="https://github.com/BYVoid/uchardet"
-SRC_URI="https://github.com/BYVoid/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-ASCII-detection.patch"
-	"${FILESDIR}/${P}-use-proper-package-name.patch"
-)
-
-src_prepare() {
-	use test || comment_add_subdirectory test
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build static-libs STATIC)
-	)
-	cmake-utils_src_configure
-}
-- 
cgit v1.2.3-65-gdbad