From 21d8f6d92e7ed913910eafbfe560a2524215c6cd Mon Sep 17 00:00:00 2001
From: Ben Chan <benchan@chromium.org>
Date: Mon, 16 Jul 2012 13:43:48 -0700
Subject: [PATCH] app-arch/unrar: Upgrade to unrar 4.2.4

This CL imports unrar 4.2.4 from upstream Gentoo and modifies the ebuild
to unmask amd64, arm, and x86.

BUG=none
TEST=Tested the following:
1. `emerge-{x86,amd64,arm}-generic unrar` and verify that unrar 4.2.4 is
   built.
2. Open RAR files via CrOS File Manager.

Change-Id: I413479d13cd0131e6682494ff2cb1f86ff382101
Reviewed-on: https://gerrit.chromium.org/gerrit/27550
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
---
 .../portage-stable/app-arch/unrar/Manifest    |  2 +-
 .../app-arch/unrar/unrar-4.0.7.ebuild         | 33 ------------
 .../app-arch/unrar/unrar-4.2.4.ebuild         | 52 +++++++++++++++++++
 3 files changed, 53 insertions(+), 34 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/unrar/unrar-4.0.7.ebuild
 create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/unrar/unrar-4.2.4.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/app-arch/unrar/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/unrar/Manifest
index b1cf54ec93..f0f772d8fa 100644
--- a/sdk_container/src/third_party/portage-stable/app-arch/unrar/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-arch/unrar/Manifest
@@ -1 +1 @@
-DIST unrarsrc-4.0.7.tar.gz 152853 RMD160 0629f8600e9ddb298f59fc05b9569bd40703acaf SHA1 e4c8b0d47278475f3dfb77e8497f5818eca3d4a0 SHA256 eac9ed7493870ca7f67b23e9208aef1db701c381123ac462e97f703777a33071
+DIST unrarsrc-4.2.4.tar.gz 164641 SHA256 9432bf798e5f7123f3060f37b75b7c07f36f0091305f46473dcae9154f8cd686 SHA512 54bdc16c940deb6e5759ddec9739381f0e1b5e2279548ac367eb32c4ff79cd496712692feaf46f4ce3b2ccfa8d622b7c45fb8070420b16315226627c45fef850 WHIRLPOOL 197310c41725280d6a5c4fa3da9d8411e419f20e41f6c645534b37d206ce67474c8b320811a7c7f2acbc375ef0341ec57adfe82a6be7f6bdabe2871841669739
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/unrar/unrar-4.0.7.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/unrar/unrar-4.0.7.ebuild
deleted file mode 100644
index 2ac5007985..0000000000
--- a/sdk_container/src/third_party/portage-stable/app-arch/unrar/unrar-4.0.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.0.7.ebuild,v 1.8 2011/12/18 20:02:37 halcy0n Exp $
-
-inherit toolchain-funcs flag-o-matic
-
-MY_PN=${PN}src
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="http://www.rarlab.com/rar_add.htm"
-SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="unRAR"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S=${WORKDIR}/unrar
-
-src_compile() {
-	append-lfs-flags #356155
-	emake \
-		-f makefile.unix \
-		CXXFLAGS="${CXXFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		STRIP="true" || die "emake failed"
-}
-
-src_install() {
-	dobin unrar || die
-	dodoc readme.txt
-}
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/unrar/unrar-4.2.4.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/unrar/unrar-4.2.4.ebuild
new file mode 100644
index 0000000000..7b1e9f3b77
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/app-arch/unrar/unrar-4.2.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.2.4.ebuild,v 1.1 2012/06/14 20:55:16 ssuominen Exp $
+
+EAPI=4
+inherit flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="http://www.rarlab.com/rar_add.htm"
+SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="unRAR"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+src_prepare() {
+	sed -i \
+		-e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
+		-e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" \
+		makefile.unix || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake -f makefile.unix CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname)
+	ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname ${PV})
+
+	unrar_make clean
+	unrar_make
+}
+
+src_install() {
+	dobin unrar
+	dodoc readme.txt
+
+	dolib.so libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}