Version bump. Introduce unrar_make() function inside src_compile() to simplify building.

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

3 files changed, 70 insertions, 10 deletions

diff --git a/app-arch/unrar/ChangeLog b/app-arch/unrar/ChangeLog
index d1b999dcb263..37873060c032 100644
--- a/app-arch/unrar/ChangeLog
+++ b/app-arch/unrar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/unrar
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/ChangeLog,v 1.172 2012/03/19 19:35:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/ChangeLog,v 1.173 2012/05/05 12:20:06 ssuominen Exp $
+
+*unrar-4.2.1 (05 May 2012)
+
+  05 May 2012; Samuli Suominen <ssuominen@gentoo.org> +unrar-4.2.1.ebuild:
+  Version bump. Introduce unrar_make() function inside src_compile() to
+  simplify building.
 
   19 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> -unrar-4.0.7.ebuild:
   old
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 91b6dfd85929..e347ce4a8dea 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA1
 
 DIST unrarsrc-4.1.4.tar.gz 157135 RMD160 0bb200c01f665142b7581b1b40ef1047dca13c57 SHA1 ae4b1e2c99e96527c4a97f980daa547499f42a0f SHA256 705d93285fcd3b9c11f68e52d96395d942bf3c20172dcee14f0d78f1fee57361
+DIST unrarsrc-4.2.1.tar.gz 161564 RMD160 3909c1ad5849088d8d6b43f4cbd82063327ef3fd SHA1 10f48ec272f413c983032b2e0cbe4e94781c7b3b SHA256 d5b59d98a6604ac41916311bc3b5dce1b94858008fc381aa975311d9248542c0
 EBUILD unrar-4.1.4-r2.ebuild 1300 RMD160 cc39f8a0951958e3571b236a819515fdeca22078 SHA1 4b6a5677a06f6754a7cca748b1058ac0bbfec1a6 SHA256 25561cfa4bf08c64ee8f8e0926d93f7c5b5f94bdc01285dc73adb8ec12202fe8
-MISC ChangeLog 19871 RMD160 df3ecb885d4993daa6af4c568e4fb02ee03c7755 SHA1 80e1082007162604f1e7df83912e48b0d4143e95 SHA256 bbf91d0188a2700237ef0e085e98eca02b6ff3485e07c3e81b96347f3b34d556
+EBUILD unrar-4.2.1.ebuild 1294 RMD160 356dda2c3c24cdb511c140c9728b49c9b0fe37cb SHA1 bf91d044e504d54ada7f6d00b33b94b89360763d SHA256 e636978a0a68c3faedbc4887a1c96a519c3e98480e0342ab0486ba5c35bdd086
+MISC ChangeLog 20068 RMD160 4c1b9fe2baf14643d0fc5b74d466d86a9467db72 SHA1 8b376f8b89007b6e76a2e04a89349d30deb609af SHA256 91599b7b53c3f262bc482f3a1ab33e207b68458d5a40db7f2143bd6fa0efd756
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPZ4pyAAoJEEdUh39IaPFNuDgH/3EDkYZlNdXR3LHNmkW8oOkv
-/Z84rojxxN/sFeC4cqi6VfStLz+gryaBPKcm8BSuTxY9C5kAIfgkYRrRZrsw3zOU
-/s4xQMFsMFuSoK+1sk2CNJnD9JTqhnr1j0P0SLOtE/ZAr7IjEBdHpT25Ru7f6Qcw
-jD0VPurPtfCVISix9CGWnUB0RZGCXR1+A8o8eP/ozfMbsnowiudajeb9pxFZ9ehX
-z4+uJZrzOrw1Egen4LrsdGL+Wv/FKiJdcPvZD1OBiZUySq1X0I+TC1/oyNYbGSWX
-X0YMNwHsUC3nTakbO2Ci3vhvdZ2dmRyMXyLDyNOpdMLLLaP+RBrfrGhmPTyl7Dk=
-=OT4/
+iQEcBAEBAgAGBQJPpRpiAAoJEEdUh39IaPFNhbgIAI6D2pQTRh1zthGv6yrJGNY2
+2Ch/I9BbZF472DOxgcRHGtKTZMjOOu0HFeM9IHI3KXApaEX7dqs3Fui6xg7ISBQa
+e/oHeCUT6LqmF2YdF9NkxYUBsQjEj5XcnSHW+EDzPb5RrgzPxxAPu/HCNxeavHb6
+gpgqjOt07ugAs2MYzFVta6yxAqn7MhJzpLLRFKXQFU2eyu1tUAurNwFz+d5J/gAE
+LLW33IfEU3uz7m9zd0Xbf1TQywl5GIZnfvkJJSe4e8Hh6glpONpORp+n36tb4F+N
+vcR/btI9t0CiEATcjnW34JDizTHHpNVVm57u0pq4RIUpWKjR0QHRpoQ9/vZA3H8=
+=2weN
 -----END PGP SIGNATURE-----
diff --git a/app-arch/unrar/unrar-4.2.1.ebuild b/app-arch/unrar/unrar-4.2.1.ebuild
new file mode 100644
index 000000000000..a79751c2ec37
--- /dev/null
+++ b/app-arch/unrar/unrar-4.2.1.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.1.ebuild,v 1.1 2012/05/05 12:20:06 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
+}