Remove lyx use flag and clean up docs install (bug #451148).

Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 16 insertions, 26 deletions

diff --git a/dev-tex/latex-beamer/ChangeLog b/dev-tex/latex-beamer/ChangeLog
index f8997bc770da..c3f860aaf462 100644
--- a/dev-tex/latex-beamer/ChangeLog
+++ b/dev-tex/latex-beamer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-tex/latex-beamer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex-beamer/ChangeLog,v 1.124 2013/01/09 01:41:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex-beamer/ChangeLog,v 1.125 2013/01/13 04:49:22 radhermit Exp $
+
+  13 Jan 2013; Tim Harder <radhermit@gentoo.org> latex-beamer-3.26.ebuild:
+  Remove lyx use flag and clean up docs install (bug #451148).
 
 *latex-beamer-3.26 (09 Jan 2013)
 
diff --git a/dev-tex/latex-beamer/Manifest b/dev-tex/latex-beamer/Manifest
index 27f1bb5375ec..3eae295af46f 100644
--- a/dev-tex/latex-beamer/Manifest
+++ b/dev-tex/latex-beamer/Manifest
@@ -8,17 +8,17 @@ DIST latex-beamer-3.26.zip 4344322 SHA256 c61f5b8dc02ef2584ddba707de49f8e58b2533
 EBUILD latex-beamer-3.20.ebuild 1444 SHA256 e0679d867bc8c026d7fd932742ed3b55318a4a66e9c9bfdf6fa38e4469292dfd SHA512 afd060fa26218b40bce17e88a1d41fde9ec1d30ff8a87b3eab5d7d400e8790160fe112b697aba623c737913982358e6ea8280846174f3b03266b0387ec93b44f WHIRLPOOL a1f8c19daa182a94bb200d3e3e4dda5a091242d501971136f3b72bf79ed25e52053a6c28378ccb078c6279298c8f3a6358be87f30cf5bac6e004faaf14fdda70
 EBUILD latex-beamer-3.24.ebuild 1422 SHA256 31c0a52c98fe34b2f84d3f22b82607f775ff8991ed42995c3b9694035faf9cd8 SHA512 f7c3c599059096f789fcc3dd5ad9d682b6511c7ca28e6a778926069c32130386c3c909362f4315785488a31b7ec643e6ec1d90fab6189d030a2f2b6023b24cb2 WHIRLPOOL 9e2069f7c22ce1b5e19d9988c308589da8a73319d8af54f15909ff5472a9b67f9e739bcefe1e63d4a4ea2fd0cf262cfe1604e5421f19bbfca5cf6e32331de960
 EBUILD latex-beamer-3.25.ebuild 1457 SHA256 86ba71f76a5f564eafcf0c5dd35c323298f70730de6bbda6494e64828063a3c7 SHA512 efa9a352e44457e7daac81cba309dc6ce9f5331a8a388173eb133c7fa5606f3b0daeb97bbd52c2ce4985eac246879ad3851a94e850f1006bee89d803ead31dd3 WHIRLPOOL 0fa6d823a55c16aee8d33394b986fed102b653e3d5c7983e9daba05c46fdce641def6b0009a73f0e7114f5b595e9248d1418eac3a6b331a4055c07195f1ec975
-EBUILD latex-beamer-3.26.ebuild 1457 SHA256 0bde667a88556daa7817c6d66c85cfc8c7cf79552b2f83dac7026ae9d2753d1d SHA512 0501389292f99c5abe1d7b71b049af9a2db6090da436a185819191eb565a8f6165d49ac8d43ccc70a8d4657d5bca0e93816378e3a2b299a41fa7d9099dd22b15 WHIRLPOOL 0735e4cc29ee92be0504f2517064e5ef8dd2f66616cba6cc22540757b65196919334ea35268229b6b06674765f54407a0bf9f6acb8fc793e83d06c2d2583a2dd
-MISC ChangeLog 16389 SHA256 d383e63d8508127586fdd1578c2c52398250f31661f068e10196720b53ee6d7c SHA512 6fab928c3480be189c0370512852ed257ff884318826bab7389c399f20202293d08cc96b00771c297355171674d4fa37f26b2c4463805abbf96379076597fc62 WHIRLPOOL dd99d8a715a65b1b7a85d1b871304f00e14d192ab5184eacfa5e54fd39046572e806821c58327f1c699f39488104ef7e98402381df61009cefe5742181b57220
+EBUILD latex-beamer-3.26.ebuild 1113 SHA256 eb89a5f41ce825842ec1cf8945d6d88a565c638d337a2e45a07fc9c6b18981ee SHA512 d8a4150fe68cbb80f36dd10474efebefa47d7a9df63984271775e24879a52dbbf12dda0b31be388857e55c2537901018ea1719e7df12d019e58172f62bb9559d WHIRLPOOL ccf827554039fba073b594f1d395771b02ec68c4b722d75369f15406caca956c16b9055ace2d19708c52c7f6b0686b662a4dc6d94bdf8790bb7950f33ce66362
+MISC ChangeLog 16528 SHA256 004115b29cdd181c3e22fd52c9073f6c88251c550a74daed16f2c3b52d8a7d93 SHA512 7779c1664a70615d0b8d0b8d87ee30da65e4ddf8f9815c1c9c0699051b3eca409990b662199d826e46e6762e1f3d039214a03b78cb48bd9740bfdb50e7fd3919 WHIRLPOOL e0ef80103cac8a01b599194a14e17479b67a760d1f4a960bf51969e3d7d127684bb8e5f0658b4c3a3554b0ad3ee05c13a034b74356c87f66c09840ded402221c
 MISC metadata.xml 242 SHA256 fad92f2092b2b8064176e6c143151a4a14d12715fc7f9eb551d1decbdb35e21c SHA512 33d6f91fe4a7a358934dccbccad97b6a3b05db34a38fce655636f4bda309a7ef849384d1eee6209dbcce98ff729955b1dc141dd9ba9130f42949419153db1470 WHIRLPOOL 77b4cfe7161d4d5948ff6ead8dc71219e73bc699725132d95ef7b1b953549b9f2e018a98fc45616ca94861f86936dc161c5b4226a5a8e90ccf5b8a14bc3794dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ7MrOAAoJEEqz6FtPBkyj1wEH/Aw/gfm4Xx3qy3P2+imLylnl
-paImDT/QVQ1VvwA7YJhtAx3/eWy9wo6B1Ehb0DIY6stq8BrFPHhjZPKa0KBvJrj/
-LAwPFtW2dP0mgZUTW4VmaHxZOnAsKIwggrFTNWjhcjP636+T7SQ7gWIJiliwMyvS
-c/mkhcMuXyTv+joZdYdoPb6+H0DU1+qpN9cb5bRwXnUWqj7GhLSycUMBLqezF4ua
-Y3iH9A4EbtKAvQ7ZxWqWann4Qms5nQwHz956F9s1/IBkBgkxK54BpxUGs3RdXVFl
-ihAQu6bMn0xcz2lX7syKkg1Tb3fkH8FgYfXGwkMV+RksPx+2m9H08sFa0bFPLW0=
-=pmFJ
+iQEcBAEBCAAGBQJQ8jzWAAoJEEqz6FtPBkyjTnMIAJmUx9vXKUscH+XnwsUm3b+h
+rMrid7pW1V2SY+i6mGFS4TCquVREj8h0hHeOgQWt1FqpJiG3mpjrKKHwy/j1/3PP
+3YOvwuOXPuIYDHPmfsQOgKLlfCw2BpIhkCAbJga41CiNQG6hEFCaYX7sbDiR+Piv
+xp3n4/9QmjtEJYI1MrUuQHt8kgFbBeFk9BNEAlwx2xTbmLOR7dCRVh6fju1VWcb+
+1REuvbCW8Xi2QsCkMxj4KO1ZhmZoAKfBXgZRwIj5RO5KG1KW4r5ZaiiZwJLestlg
+uRXkK/HLyzPm81RUs1pvaIYAAzjGamXQ5WpTr5Y+I1uaNkVbxrdbFVDG32/mjDs=
+=YQiG
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/latex-beamer/latex-beamer-3.26.ebuild b/dev-tex/latex-beamer/latex-beamer-3.26.ebuild
index b3b55d193310..6098aae52a5a 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.26.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex-beamer/latex-beamer-3.26.ebuild,v 1.1 2013/01/09 01:41:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex-beamer/latex-beamer-3.26.ebuild,v 1.2 2013/01/13 04:49:22 radhermit Exp $
 
 EAPI=5
 
@@ -13,10 +13,9 @@ SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.zip"
 LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples lyx"
+IUSE="doc examples"
 
 DEPEND="app-arch/unzip
-	lyx? ( app-office/lyx )
 	dev-texlive/texlive-latex"
 RDEPEND=">=dev-tex/pgf-1.10
 	dev-tex/xcolor
@@ -28,11 +27,6 @@ src_install() {
 	insinto /usr/share/texmf-site/tex/latex/beamer
 	doins -r base
 
-	if use lyx ; then
-		insinto /usr/share/lyx/examples
-		doins examples/lyx-based-presentation/*
-	fi
-
 	dodoc AUTHORS ChangeLog README TODO doc/licenses/LICENSE
 
 	if use doc ; then
@@ -40,12 +34,5 @@ src_install() {
 		dodoc -r doc/*
 	fi
 
-	if use examples ; then
-		rm -f "${S}"/examples/a-lecture/{*.tex~,._beamerexample-lecture-pic*}
-		if ! use lyx ; then
-			einfo "Removing lyx examples as lyx useflag is not set"
-			find "${S}" -name "*.lyx" -print -delete
-		fi
-		dodoc -r examples solutions
-	fi
+	use examples && dodoc -r examples solutions
 }