USE=static and USE=ocamlopt

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 93 insertions, 68 deletions

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 11023b35e8f4..53bafbb44ca8 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -2,20 +2,20 @@
 Hash: SHA256
 
 AUX llpp-11-WM_CLASS.patch 872 SHA256 efcbfc78ab6bcc1af0d4c6eafc737b55ef8ec0b1866f9cc9c95435a1e7d79bcc SHA512 15b25daeb9ef3d3845687c84287f477df10ca826f3909a204f20fe448c875e83741158f429c9c10c08000f481901bbf4f74c301c45c55db9dc8eaa6632e56f47 WHIRLPOOL d019176ea03c57c56d96d9dc652975edf7d024f941d0bccacef1bec6244a2a5544ae1e364786258c0de5686ee3fb6d9cbb3efdc89488ff890a0df1faa355036b
-AUX llpp-9999-mupdf-trailer.patch 380 SHA256 33937962fb9fc02a1ac5143fd7e93cc654549e1d1187ac9cfe47fbc77d78966e SHA512 72c0a9d302e830536e5da34f5ae427d642a7d375f64ff794c2e86b6779ad73a62c438ab66bff68a936dc32df08bbf02f4e6abc704246864ce60833f8ade06cf2 WHIRLPOOL 1d97d948edb97d544dda66b3851663a123cd4518fb9b5264199b6fdd1642feb0c4e1c548ab174adb1fea98cdf34c0c95801c48058d1731606c2c13c5f2340a9d
+AUX llpp-9999-mupdf_trailer.patch 380 SHA256 33937962fb9fc02a1ac5143fd7e93cc654549e1d1187ac9cfe47fbc77d78966e SHA512 72c0a9d302e830536e5da34f5ae427d642a7d375f64ff794c2e86b6779ad73a62c438ab66bff68a936dc32df08bbf02f4e6abc704246864ce60833f8ade06cf2 WHIRLPOOL 1d97d948edb97d544dda66b3851663a123cd4518fb9b5264199b6fdd1642feb0c4e1c548ab174adb1fea98cdf34c0c95801c48058d1731606c2c13c5f2340a9d
 DIST llpp-12.tar.gz 100362 SHA256 30c66684a1b2892bd1125afb99583abad5cc433dee2c623ec0cdefb0ec4c6fe4 SHA512 c6c298bf0fdf8eb10aa1e1812d386022fae26271084b014a3a512fc1c8cf7c8ca5768c3587e7c83e34210354e4219b74cee22fb51edc1fe467de4c11b631416c WHIRLPOOL f2ffe1005b2f0d89dda865c3d0f0a306e311cad6ef45070a702eefe2c44e59ca5067e95de182fb4673526dea801b8969d44260fb32d1fd57549777f95194dfde
 DIST llpp-13_p20121123.tar.gz 110436 SHA256 367c01e14478b18c39a34bc515f495b980789e536744e7b698d1639e6935eb35 SHA512 2c8f47adb619416743eb2ee9f43df38989af4e255626810bc9ac34020e37d5e6637589a4e20324184184c1da21d2ed9c3f6083d02cc98a8364946091831edc60 WHIRLPOOL e8ccfbf7a6c782913ea8ba4851b42f30eba171f0c03a14946697e0763f4b95c0f56e629d0d1747f169b6bb138cedbe0bb2487012d9e1b76a902722aaf6866c59
 DIST llpp-15.tar.gz 109546 SHA256 cc415775a62144f8e4185f5d550952b6d2d573072b5b7d91bc8c09c564ce156c SHA512 96f4720f2ee0d9d2d5903ed452e7314e08d14a5806b13d439e01bfd4121fe714f5146e0cb6b33bced3c9c4b652ed8c9334070643e66276f07ea9e9b50d8b5b93 WHIRLPOOL 097871bcb121807eb1d5211254e8670c0cc08eb79787d9255217d10841a0e2436ee50194f038023efa052a4db4e5ac251dd88215ef44ae966689ff03cf79252a
 EBUILD llpp-12.ebuild 1559 SHA256 e15fc5a5b91a1eee38fcfa3216160a8963e920cc589016d66e653cd08f42adf2 SHA512 e94186cca5f32895cf820e90fc0b2f63a9b5fe483ffac466c4b685da41fdc6909b0fca9587810628c29630a5bf4d41d41010645d4a63f9ad061e8c17e87da09c WHIRLPOOL 0c1ac21d15e5aa16346bd91f893ac7141374c804dc527f0b52c13f6b2f7cc4fd8d4f8d126548b38b0f89a970f521eb3dab0156b5ca1bda6fbf51a753b48a0231
 EBUILD llpp-13_p20121123.ebuild 1555 SHA256 f2d4dfb81f9b3d0be05880ccef12072ba8d3c0d417300dd69d1035efe33cd229 SHA512 e291901481a1c7aa0b1cda952b4aa0294a644117b276d88724d2bb6b8fd19b59ac0030301043e1d1b0f6a1004737c1e4bf7280994e30c71ddb07a60457a3d0fe WHIRLPOOL 4219794f7828dfe93ef954d3fab48c59e0e28000415ba7e1cf91caad2349fd023fc036d1639da6666cd3b37ccbd5b43b014b0eee75e647e0801b9c68b6b571bf
-EBUILD llpp-15.ebuild 1612 SHA256 1a35a7930c97990d4ba25f96393519a4e7d4db2dc0733306262e6421118b9016 SHA512 660f6915efc3744f920ccb8fa19510668e8e4cf7c9add206fae8d64ea05e2a0d9d8b7af4aee774b6fd5257509e46bcd8942e5bd68b6af834a4053f7095c4258c WHIRLPOOL 75b80b6311c12e267f7faa07f4846467d60d3c5765f2191a492282ca5f40c908fe3c76314061dcd81f2ee58d1eeab131b4d695a4f010d6aa282212d235ed10f5
-EBUILD llpp-9999.ebuild 1675 SHA256 99879264776ba7bdd7739874cec312eec44c304d4711577254c1b3b50fec78c6 SHA512 fa3945e889ef9ce9e89a990e17beb076277d280790f9713d76932293e7464fc805f8c4b8eeef8df4cd559222de711f7dc98d71c8e33d1fefa1a53e11240408bb WHIRLPOOL 31668b3ef6914c9acf4454a08b58cb1ce71354e141c65e3aa172edd4f92ad075e9871df09ec653ae60a82f609138e937d38dfee9b8196cb42b4cd9ca47b153e4
+EBUILD llpp-15.ebuild 2295 SHA256 b09a86534dd87e41fb10dc9827c2faca0edec83389ad12284265a59e34af3b42 SHA512 9a60a4ccec70524761cb3196fb14a8e7d0f3a760b6e4dae0c65502edd764860b37f6040a935484572edbda47b92fb029a20599b505f7ddf1b2f226600769bd35 WHIRLPOOL 22d51577e8df1bf3a7de87159bd86708e90f41555f5a5c426ee477585dbf12967e47d792503c62895f03b5f46dd31c058fae9cf74a49ffa47e8bbd0c7143dc1e
+EBUILD llpp-9999.ebuild 2287 SHA256 3a30ed0bfa1924bd35d900a9a1523ff1d603497c56a67d5c5443517b348a2606 SHA512 2b045f94e2b302c34bb73f1afcfc3a49ca91f3fdaf5135d50efbfe29c43fd368f313c2f6653d9fc121c324e107d02d9c2db7d7a2b4a80945e8e6e69c667e00f5 WHIRLPOOL bfa5e4318ac0ad95bf2ca459fef7656d13badb1c8f520a90077d604dedda886327049121b5fcfdd7c9f23a4c9d5a31a401a3abeda1963e292181fc6e28a825d8
 MISC ChangeLog 5720 SHA256 654f5d7067544ba7ea45685eeba25e6351dac10181710242d434908a00dd4f95 SHA512 04d34f5dbb1e472a560a815f0e8cb236ca5a84b694544e831eac7ab6f6e11f5c79592878da3bef1563ebc808b94f576f7d08bf95834fa5636b97438353e57cb3 WHIRLPOOL 4a55bc6afe20e30a4c862ccf99eaf9ee83463b748342935bb8ab41a8887483674eeed5b0fcdb3999a6c1a057770be4745c52f92812e053fa73ed4714046678f0
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlGxJfYACgkQknrdDGLu8JAh2gD9H8w6PyqPwfs0x9J6hVOB/ndB
-3QB1bDtDCvmnH7HoxwYA/0uSA4AgEQnzd89MBhZ2gLqPTOKeo1kv0I1FRxDTiSbZ
-=KuLI
+iF4EAREIAAYFAlGzPlsACgkQknrdDGLu8JCmRAEAk1JrKYv/k5yAN0M4p//q+/I0
+bt7EIraZIOsQMDUyvhYA/2dVCVfGv1ybB0VfMXvLhAU3a+GL+yJdo8f4bU6arenk
+=vRfA
 -----END PGP SIGNATURE-----
diff --git a/app-text/llpp/files/llpp-9999-mupdf-trailer.patch b/app-text/llpp/files/llpp-9999-mupdf_trailer.patch
index b119aa437f15..b119aa437f15 100644
--- a/app-text/llpp/files/llpp-9999-mupdf-trailer.patch
+++ b/app-text/llpp/files/llpp-9999-mupdf_trailer.patch
diff --git a/app-text/llpp/llpp-15.ebuild b/app-text/llpp/llpp-15.ebuild
index f3c41c8eb452..f2512d81dad1 100644
--- a/app-text/llpp/llpp-15.ebuild
+++ b/app-text/llpp/llpp-15.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-15.ebuild,v 1.3 2013/06/07 00:14:24 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-15.ebuild,v 1.4 2013/06/08 14:23:15 xmw Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils toolchain-funcs vcs-snapshot
 
@@ -13,40 +13,54 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="media-libs/freetype
-	media-libs/jbig2dec
-	media-libs/openjpeg:0
-	virtual/jpeg
-	x11-libs/libX11
-	x11-misc/xsel"
+IUSE="+ocamlopt static"
+
+LIB_DEPEND=">=app-text/mupdf-1.2:=[static-libs]
+	<=app-text/mupdf-9999[static-libs]
+	media-libs/openjpeg:0[static-libs]
+	media-libs/freetype:2[static-libs]
+	media-libs/jbig2dec[static-libs]
+	sys-libs/zlib[static-libs]
+	virtual/jpeg:0[static-libs]
+	x11-libs/libX11[static-libs]"
+RDEPEND="x11-misc/xsel
+	!static? ( ${LIB_DEPEND//\[static-libs]} )"
 DEPEND="${RDEPEND}
-	>=app-text/mupdf-1.2
-	dev-lang/ocaml[ocamlopt]
-	dev-ml/lablgl[glut]"
+	static? ( ${LIB_DEPEND} )
+	dev-lang/ocaml[ocamlopt?]
+	dev-ml/lablgl[glut,ocamlopt?]"
+
+RESTRICT="!ocamlopt? ( strip )"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
 }
 
 src_compile() {
-	ocaml str.cma keystoml.ml KEYS > help.ml || die
-	printf 'let version ="%s";;\n' ${PV} >> help.ml || die
-
-	local myccopt="$(freetype-config --cflags) -O -include ft2build.h -D_GNU_SOURCE"
-	local mycclib="-lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype -lX11 -lpthread"
-	ocamlopt.opt -c -o link.o -ccopt "${myccopt}" link.c || die
-	ocamlopt.opt -c -o help.cmx help.ml || die
-	ocamlopt.opt -c -o utils.cmx utils.ml || die
-	ocamlopt.opt -c -o wsi.cmi wsi.mli || die
-	ocamlopt.opt -c -o wsi.cmx wsi.ml || die
-	ocamlopt.opt -c -o parser.cmx parser.ml || die
-	ocamlopt.opt -c -o main.cmx -I +lablGL main.ml || die
-	ocamlopt.opt -o llpp -I +lablGL \
-		str.cmxa unix.cmxa lablgl.cmxa link.o \
-	    -cclib "${mycclib}" help.cmx utils.cmx parser.cmx wsi.cmx main.cmx \
-		|| die
+	local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
+	local cmo=$(usex ocamlopt cmx cmo)
+	local cma=$(usex ocamlopt cmxa cma)
+	local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE"
+	if use static ; then
+		local cclib="-Wl,-Bstatic $($(tc-getPKG_CONFIG) --libs --static mupdf x11 | sed 's: -l\(m\|pthread\) : :g') -Wl,-Bdynamic -lm -lpthread"
+	else
+		local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 freetype2 libopenjpeg1) -ljbig2dec -ljpeg"
+	fi
+
+	verbose() { echo "$@" >&2 ; "$@" || die ; }
+	verbose ocaml str.cma keystoml.ml KEYS > help.ml
+	verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
+	verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
+	verbose ${ocaml} -c -o help.${cmo} help.ml
+	verbose ${ocaml} -c -o utils.${cmo} utils.ml
+	verbose ${ocaml} -c -o wsi.cmi wsi.mli
+	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
+	verbose ${ocaml} -c -o parser.${cmo} parser.ml
+	verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
+	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
+		str.${cma} unix.${cma} lablgl.${cma} link.o \
+	    -cclib "${cclib}" \
+		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo}
 }
 
 src_install() {
diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-9999.ebuild
index 24505face132..023e81407e07 100644
--- a/app-text/llpp/llpp-9999.ebuild
+++ b/app-text/llpp/llpp-9999.ebuild
@@ -1,55 +1,66 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v 1.18 2013/06/06 23:08:04 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v 1.19 2013/06/08 14:23:15 xmw Exp $
 
-EAPI=4
-
-EGIT_REPO_URI="git://repo.or.cz/llpp.git"
+EAPI=5
 
 inherit eutils git-2 toolchain-funcs
 
 DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
 HOMEPAGE="http://repo.or.cz/w/llpp.git"
-SRC_URI=""
+EGIT_REPO_URI="git://repo.or.cz/llpp.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
-
-RDEPEND="media-libs/freetype
-	media-libs/jbig2dec
-	media-libs/openjpeg:2
-	virtual/jpeg
-	x11-libs/libX11
-	x11-misc/xsel"
+IUSE="+ocamlopt static"
+
+LIB_DEPEND=">=app-text/mupdf-9999:=[static-libs]
+	media-libs/openjpeg:0[static-libs]
+	media-libs/freetype:2[static-libs]
+	media-libs/jbig2dec[static-libs]
+	sys-libs/zlib[static-libs]
+	virtual/jpeg:0[static-libs]
+	x11-libs/libX11[static-libs]"
+RDEPEND="x11-misc/xsel
+	!static? ( ${LIB_DEPEND//\[static-libs]} )"
 DEPEND="${RDEPEND}
-	=app-text/mupdf-9999
-	dev-lang/ocaml[ocamlopt]
-	dev-ml/lablgl[glut]"
+	static? ( ${LIB_DEPEND} )
+	dev-lang/ocaml[ocamlopt?]
+	dev-ml/lablgl[glut,ocamlopt?]"
+
+RESTRICT="!ocamlopt? ( strip )"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch \
-		"${FILESDIR}"/${P}-mupdf-trailer.patch
+		"${FILESDIR}"/${P}-mupdf_trailer.patch
 }
 
 src_compile() {
-	ocaml str.cma keystoml.ml KEYS > help.ml || die
-	printf 'let version ="%s";;\n' $(git describe --tags --dirty) >> help.ml || die
-
-	local myccopt="$(freetype-config --cflags) -O -include ft2build.h -D_GNU_SOURCE"
-	local mycclib="-lfitz -lz -ljpeg -lopenjp2 -ljbig2dec -lfreetype -lX11 -lpthread"
-	ocamlopt.opt -c -o link.o -ccopt "${myccopt}" link.c || die
-	ocamlopt.opt -c -o help.cmx help.ml || die
-	ocamlopt.opt -c -o utils.cmx utils.ml || die
-	ocamlopt.opt -c -o wsi.cmi wsi.mli || die
-	ocamlopt.opt -c -o wsi.cmx wsi.ml || die
-	ocamlopt.opt -c -o parser.cmx parser.ml || die
-	ocamlopt.opt -c -o main.cmx -I +lablGL main.ml || die
-	ocamlopt.opt -o llpp -I +lablGL \
-		str.cmxa unix.cmxa lablgl.cmxa link.o \
-	    -cclib "${mycclib}" help.cmx utils.cmx parser.cmx wsi.cmx main.cmx \
-		|| die
+	local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
+	local cmo=$(usex ocamlopt cmx cmo)
+	local cma=$(usex ocamlopt cmxa cma)
+	local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE"
+	if use static ; then
+		local cclib="-Wl,-Bstatic $($(tc-getPKG_CONFIG) --libs --static mupdf x11 | sed 's: -l\(m\|pthread\) : :g') -Wl,-Bdynamic -lm -lpthread"
+	else
+		local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 freetype2 libopenjpeg1) -ljbig2dec -ljpeg"
+	fi
+
+	verbose() { echo "$@" >&2 ; "$@" || die ; }
+	verbose ocaml str.cma keystoml.ml KEYS > help.ml
+	verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
+	verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
+	verbose ${ocaml} -c -o help.${cmo} help.ml
+	verbose ${ocaml} -c -o utils.${cmo} utils.ml
+	verbose ${ocaml} -c -o wsi.cmi wsi.mli
+	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
+	verbose ${ocaml} -c -o parser.${cmo} parser.ml
+	verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
+	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
+		str.${cma} unix.${cma} lablgl.${cma} link.o \
+	    -cclib "${cclib}" \
+		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo}
 }
 
 src_install() {