media-libs/sk1libs: Fix problems with double prefixes reported by Johan Hattne

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

3 files changed, 66 insertions, 5 deletions

diff --git a/media-libs/sk1libs/ChangeLog b/media-libs/sk1libs/ChangeLog
index bf1d9f2375ab..becb873a8009 100644
--- a/media-libs/sk1libs/ChangeLog
+++ b/media-libs/sk1libs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/sk1libs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sk1libs/ChangeLog,v 1.19 2013/04/18 06:35:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sk1libs/ChangeLog,v 1.20 2013/04/24 12:07:21 jlec Exp $
+
+*sk1libs-0.9.1-r3 (24 Apr 2013)
+
+  24 Apr 2013; Justin Lecher <jlec@gentoo.org> +sk1libs-0.9.1-r3.ebuild:
+  Fix problems with double prefixes reported by Johan Hattne
 
 *sk1libs-0.9.1-r2 (18 Apr 2013)
 
diff --git a/media-libs/sk1libs/Manifest b/media-libs/sk1libs/Manifest
index 95ffae7885bb..641cc09c2566 100644
--- a/media-libs/sk1libs/Manifest
+++ b/media-libs/sk1libs/Manifest
@@ -4,13 +4,14 @@ Hash: SHA512
 DIST sk1libs-0.9.1.tar.gz 1019443 SHA256 bb44520a5fab2998a8013a91874ff109f25bbd8e01bbddafe0b6e7db0631719a SHA512 dfb1880d5bb043395e4ec6e0c9dc373f97d43458c20c95a152a1cadacbd41ac9b3cee30dc55544ee67f7c5747c8be38ca2da816c458bb993069d9f29d72f35be WHIRLPOOL d08b8d94c8c30ba6d58281128b71092b0687c51c22fe1b3fbd149cdd753a6a4a1df7a780d4371824a7b64a7c198c58eefd5d327be927ad7cafef3735842fc64f
 EBUILD sk1libs-0.9.1-r1.ebuild 1309 SHA256 6aec98ef99259a9dd88cf48256a50d444651b5495adc1adb43c60e82b002cbc7 SHA512 934e061bcf8de278791e769fa0378a7b040f9c22aace045d5b28cd7459d0a5d69cfb4c241182c3dca816d249f2427765e02f6106f9bcf5b1f47acc2a17813f4c WHIRLPOOL 81ac2f6261f3efb775794ff8abc84f47d278fa36e457d35feda7197cb8b8246e610c532e734746066d8476fc14720371fddf66873ac936bcbf9e9111ff55dc2c
 EBUILD sk1libs-0.9.1-r2.ebuild 1382 SHA256 711a59276eb5f66e9a02a54195d3dcbef0b49d273aa0f283804e87568d52d46d SHA512 95b9727395800dace31e9ba668781563504c90796465f53101a045a5d721846de85053b53c068d98965fcae159403e6279932cbdc1c6009718d888a4189747a4 WHIRLPOOL 921a0f7482db1bff80dc874b1af10439708b41c9b18f7ba83ad9da9ee8b64a3271aebe79d4593852f5c8363db457dd79063c3e2c615927799d16098689202c35
+EBUILD sk1libs-0.9.1-r3.ebuild 1408 SHA256 56dc9636e42fc3aaf315009e6b19f8114bf7ab896c5ef116e312cdf57bc89bcd SHA512 ff74213ca424e1711ab2809617a9243c1e1452c1f4f2be3d2999f18aa9419e03ca307c1dd924846a4522a482065b353c84133da125c544932f5e65bca0d2a2c3 WHIRLPOOL 88d740131a78cc411d687df65fd5977dc8c7ff6f14ae9d6ba3ae9f4758a7057454c3a5caf5cfd02650e6ab0cad097ddfe0990cd06d980be43c015fbb363e02d5
 EBUILD sk1libs-0.9.1.ebuild 884 SHA256 b94c65c8d905e2ffc1a959028b37f0240c33539f550bc0001e02ee4974f52dfc SHA512 79f2adb4ce650a2f0dda78b251e7386034233c89edceff3ed3475e2bc32918df44bba60cb8779201541f065bbbf35a6b69871286c945e28423778efd64a81342 WHIRLPOOL ae49392dc4942ae9e3310b7594ab26bbd7d70628d4c71ac115c57f43d706131921f14b478b1969d10c83cff2bc781aef7768947eda7039162ffef51dac345568
-MISC ChangeLog 2461 SHA256 453a213e4b990514f3669fca0e95ccee695f4c54625777a0ecfc91975010b46e SHA512 ac45dd08c111aa456c343ea4785e3aed89b4294b235d70c1f57f9afe3205c14fc4774c81e51529eab095372c58f50a316b1be5c8e17115d2f46063954781d26d WHIRLPOOL 3ab78cac0d3cb7f64747f81908110b3902493310c80a869e87d6a3358e5fea365143f6d4a1e9ddb18e6bf4d87a0d5553e9c183213fed04b3ef0dcba085f6dabc
+MISC ChangeLog 2629 SHA256 e2326d5070c81552689c5fb11a01fedbaafe0a94c3b4629058afbd97911d7e16 SHA512 85597c8d2d82dee8f9d850d7a7e1ef4228cea442abd715437951a5f622ba660e83a497a22c58a175d38f932c1adf8814144b9d1bbd750ba231f6a38559630922 WHIRLPOOL 039cbd0d1a9bc6cf8cdc2cee60c1fe3c3533ab74350ea38e32de5fa18e0ce1ec92df9c73c17c23238a17324ae3106a5578ebbf21f31b0c31e12a9eeddc50c6bd
 MISC metadata.xml 360 SHA256 21e4a8e8f8294265f2277f640ec4a60adb995404a5a1dda8d7c4e502df28b200 SHA512 2de604046fed652f3fbdc8e3a50516124017b198f7e0bb0f3e162091f9792009e9b6097945e4e5788bafb25e73a8354ae576e37589d29f41c1985949c5ca03df WHIRLPOOL 12447244ab4db1fd923ac6824a9f6496559934e850e4ad3c03ba99efa67024b902b386f863bd3ee7fa273b58d9381507f4a7b704f325880abc56c08747d77957
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlFvlDkACgkQgAnW8HDreRYKfgCdEnNOBwDdefh4Ud1hX5B8xKXI
-IPgAn1S33rYiAT3h3Lt4rVvKQWzO/N0V
-=pg+1
+iEYEAREKAAYFAlF3yvoACgkQgAnW8HDreRY64wCgoNdWbvaMBtsvxGjAFl1OkKXr
+8dUAn22TCcP5HCm0As0QzJPcK69s+eet
+=1weq
 -----END PGP SIGNATURE-----
diff --git a/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild b/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild
new file mode 100644
index 000000000000..60eb27da16c1
--- /dev/null
+++ b/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild,v 1.1 2013/04/24 12:07:21 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_8,1_9} )
+
+inherit distutils-r1 python-r1
+
+DESCRIPTION="sk1 vector graphics lib"
+HOMEPAGE="http://sk1project.org"
+SRC_URI="http://uniconvertor.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	media-fonts/ttf-bitstream-vera
+	media-libs/freetype:2
+	virtual/jpeg
+	>=media-libs/lcms-1.15:0[python]
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+	app-arch/bzip2
+	app-arch/gzip
+	app-text/ghostscript-gpl
+	media-libs/netpbm
+"
+
+python_prepare_all() {
+	sed \
+		-e "/include_dirs/s:\(/usr/include/freetype2\):${EPREFIX}\1:" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	font-fixation() {
+		local ttf
+		local sitedir=$(python_get_sitedir)
+		for ttf in "${ED}"/${sitedir#${EPREFIX}}/sk1libs/ft2engine/fallback_fonts/*.ttf; do
+			rm -f "${ttf}" || die
+			dosym \
+				/usr/share/fonts/ttf-bitstream-vera/$(basename "${ttf}") \
+				${sitedir#${EPREFIX}}/sk1libs/ft2engine/fallback_fonts/$(basename "${ttf}")
+		done
+	}
+	python_foreach_impl font-fixation
+
+	distutils-r1_python_install_all
+}