bump & drop old, fix bug 530726, 541532, thanks pavel

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 638a2fb037aa7937f6be1a5d02b75bf8c5ad7144..32a3fd42685bc26b2581756e6a232be4db68f0f6 100644 (file)
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/lyx
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.328 2014/12/06 16:38:26 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.329 2015/02/28 14:59:13 dlan Exp $
+
+*lyx-2.1.3 (28 Feb 2015)
+
+  28 Feb 2015; Yixun Lan <dlan@gentoo.org> -lyx-2.0.6.ebuild,
+  -lyx-2.0.7.1-r2.ebuild, -lyx-2.1.1.ebuild, +lyx-2.1.3.ebuild:
+  bump & drop old, fix bug 530726, 541532, thanks pavel
 
   06 Dec 2014; Agostino Sarubbo <ago@gentoo.org> lyx-2.1.2.ebuild:
   Stable for ia64, wrt bug #529102

diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 72c2916d938d5dedbdea53f92468a19b0a3deba8..08044b8bddb073289f9a4b29a24a5a4a97bd8b96 100644 (file)
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -7,33 +7,29 @@ AUX 2.0-python.patch 1036 SHA256 954f96dab553024fb128924c7ba3d70a91946f6909d203e
 AUX 2.0.8-python.patch 1019 SHA256 a8f93b41bf55f823caec23487aee432bad6e7b55187c6f115decdda855380010 SHA512 039d3521bc1d646669fcccb43d04354dfe7ed32477a338c27a576c77e5ffcf15fcf0419c14df43aa37d727431cce6ab0327aa04199d09ce1749051ab12686df8 WHIRLPOOL 74ad7056a5e74a95b7150fd14d2aac410c367a1bf98d7d8e2d68b5102059951e8ec40a877b534effc9b3fea04a38acdbadc2d1ce819272cb7d5e4d63bc172404
 AUX 2.1-python.patch 1019 SHA256 a8f93b41bf55f823caec23487aee432bad6e7b55187c6f115decdda855380010 SHA512 039d3521bc1d646669fcccb43d04354dfe7ed32477a338c27a576c77e5ffcf15fcf0419c14df43aa37d727431cce6ab0327aa04199d09ce1749051ab12686df8 WHIRLPOOL 74ad7056a5e74a95b7150fd14d2aac410c367a1bf98d7d8e2d68b5102059951e8ec40a877b534effc9b3fea04a38acdbadc2d1ce819272cb7d5e4d63bc172404
 DIST lyx-1.6.10.tar.bz2 12559454 SHA256 dcfb6fc0f6880e706d45ea16459ed2206265179f3882b4685e4955c18adaf569 SHA512 c6d3f18f555e45ef86e22f42f7c8727ad0e1ad2cc4cbf87557f3ef235d894d46c5a87fc5923e2c02a5d9ba342389bf213af156a12c17e3b5f2308b9602b182dc WHIRLPOOL 0543590df1cc353fee939fee83db55aa146418c36c9422faa07cf9a1723002b83deb92f7ff89d49abb4144fe62d0fcf917257c07aaeb0d6e016b39393a8ab542
-DIST lyx-2.0.6.tar.xz 10390452 SHA256 a5cb2bedee6e154b50881acd2316cf9d79162d6754e3aa159a6d579f5a828ad2 SHA512 644b69ad591a244ca7ebf4107c2a8dfd58757f7acc942b11e3f9ce253a775f5a713f47f5e430612d3a9e91cb202ad6da17aafbca012d66bdf9bdbb875a26de35 WHIRLPOOL 2ac79a6ec7b9a460ffd84644e6ae3da014028677555678b23c8925b8faccf39166e62ee52907212ee0082dad03c358804290b10b4092a276a0dd7fe30509aaa0
-DIST lyx-2.0.7.1.tar.xz 10449732 SHA256 ad77914a96692b4dbbf7bebaddd5f5cea0f1b729458b7475ce55965eb09e4777 SHA512 0314400c13d0a6b02d57521a9ceecfdd7aa0d8d89c527d8b48d36dcc807c6142fb225f4ba2c03ddd83a34b41ecf6ed185a8425b58e9e143973a639044e33f520 WHIRLPOOL dcdc98004120dfb37e68729027d2c8a21fcf9579e5254f1e56447afc43369e2efc8d7a1b769a4c6e9b9938e78e0fe4f1e66a761206c2f21f83cb4a76e6903bbf
 DIST lyx-2.0.8.1.tar.xz 10481988 SHA256 fa0a9c6070554e0d12d24e9b3c4a1e5fc2ee853b3fbe83e2a415635cdc973c59 SHA512 17e313d3118dfe439f5251384f2fffdb45ffef5ec515953b7af0762d35c8e156a9338de698cea91cf8b3cedca1fc08364d8f3c50c9345f304d57004af695f901 WHIRLPOOL 6a9ef2df39861d373e1c6288f5443f910632a09ed4d84e409efe06459f2f39d3c30462b3a26aafe37c5216b765882e7ab5189e7d164b71def97f50877784754c
-DIST lyx-2.1.1.tar.xz 10638872 SHA256 ca5bf218bc86deadc9eca22030a96e911b0642b3fa0e359c14891dff7f0b39ba SHA512 72a8b6c4fc1435541aef659ded44fee2f42862c3b02ec168cc5d989e3caa94f277341ede859e37f523e09c36915405cb753d8d8b0cf82d4663473a427f82ba74 WHIRLPOOL adf65c269a062913f64da156796778768849ffa67f325fbb97fba5fedb2374f32fb535ba77e868e150d3dac92fdd1895f56904044d3526b40b97c5a2d712a158
 DIST lyx-2.1.2.tar.xz 10669264 SHA256 c8783822341e95cc2a6b5da1b0e838542fd875017d8775f237b17c1790b1bba5 SHA512 3e7234673e302343e26f70a11d0f078436f89929749e6c9b8a5ba74fe32d6c0b7418142783715abd8115d014f146db8115ffdd0bcd77cacb38fce23f3c0844cc WHIRLPOOL 83915cfa3dc8fc6b51d8ed2ebcb7b56ac9a5f2d8d7acb12dba8457838a3e57d4f50b161ee964562c068acf02129fff38f8ae75d377e4c0928f9f17f0d7a6ac2b
+DIST lyx-2.1.3.tar.xz 10778624 SHA256 2fd52e7e5ee372983eb6b0a7f04765cb0df6f8c1f3420081d9f7761acfc75682 SHA512 c2930d0ff1dfb7dc23e07be7141cd50c4fa023f32fc3653745b4f5031460c6fe5acfc955c0af5b3bf9505d7958b0d1e301eefd0a894bd02bb4c3f966f54332db WHIRLPOOL 818bba837ed7e63609c1067e94f3281a9d9ef2049ba1792a010372cb544e6ead8bab0ec1906f083e8fa27f8ae8145c1cf7a4772cf3952caccf5bbd2a2c1026be
 EBUILD lyx-1.6.10.ebuild 4120 SHA256 445c2becd493409edac0a36d3d9d55a6e82cb2cd3a68fe426f19960cfe3ed94c SHA512 b644de0190a2c85dc139ed08bbd47da8428821eee2c4997741301b8a2380927d9eda01d998245b5598db4685c168d9083e45de0adf9f94a285b627035c84ce92 WHIRLPOOL 4c37840e9ba6d643c9271b0148f63f25d1aacf7fb3d5d76c4ca20aa9abb46f10cb6072306c51b213907732e864d5bcef6f74e91a96e344678bf0727b6755de90
-EBUILD lyx-2.0.6.ebuild 4453 SHA256 bfff68cf081d1e2a7b47f6074cd30fe8fbd5b3c9d15b87c139e74f1cf50a8c60 SHA512 75d5c6886265dd6463186ca2a1a407c0e5994ea38cb6b7734c34d686f6cf41c26b109e308eaa0d4a16c3256546a259c8ee38fecd332bf377dff33a5d12cc2892 WHIRLPOOL c75712601b5d15c8a5e7be86247790de9a22d01eab68ecde8ff0c4e2ba7d2fc7b91fa69895b40d954676afd76a37bcfe8b4fac3e3455c7f38801c3a967a8fb7f
-EBUILD lyx-2.0.7.1-r2.ebuild 4425 SHA256 445047b716fe3b2075f5f50c2269855501d8defb1033c72243d9f212ea6161f9 SHA512 0837f93db164f57d80c930d9c7411ee4418655f82317a070e0b305a4bf2218cdadab2b038a2cbc41665cb3046edc2d42b7cb052320b344bbbb1b1cc8ba86940e WHIRLPOOL dddbfcf311605f0cfd41ebb13eeaa4ae0f2fc36824ef98d7abff3630c5d4a16926bbc4a3e94e96afbc8f5f6b2ded164fd1c7c908ffd79ac5c8e5f2142918d8c5
 EBUILD lyx-2.0.8.1.ebuild 4480 SHA256 ebf1dcf624d499120448755ab7292ed09b6923a329453ba46e7826af254ac38b SHA512 821780b9def776ea63f0d7cf52784cf8d734b3244eb06074508d617d627a1c62c764a731d9f9e6e468d5a1d5d2ca420f6669e96bbec3f5704329f68ffc8637b3 WHIRLPOOL ba4b45dc62331a4eab5670387875a7eeb10b4f9eb0b305d8cb7e81693d81559ac2543a68e46425bca0ff8dd4acee198c1c45329ef25b5fc1072854ca856bcf6e
-EBUILD lyx-2.1.1.ebuild 4480 SHA256 616dcbfe05bcaee3914a0dbf88dcd9ebe8964a6b73934e668b548f976ad75b2a SHA512 539214607a15d590530ce90aaa138dc6c2118476f5961422ad9947516a6c9ce1b34ec20cea12be991fcc0add58baccbcb7e17aba14030f0cd4c017176492acc0 WHIRLPOOL f1f88c87ccfea59508ab4a3fed5bbab1742982dbe305226d89177c1d64bbee453c406707788cbc352072f2ab3ed3fa401370e37d00979d5d8b6dba862f0c44e3
 EBUILD lyx-2.1.2.ebuild 4471 SHA256 0a3645e7ed3502c4116bc63f9f1f936399baa0bc59e0bc06bbe123c4c4baa012 SHA512 d609a8d270fce5c2e28bf40bcb604a0f820368ab64e70af6f9edb89277f08456072fd6fcd1d7296820317fcb3b9a20d2562974acd29956305b8daa1609d5c6ec WHIRLPOOL 606425f56c681ea8aef4afb2904e7a307ae7a09dfd7739e36778001333cf98886611985ed104a7c02d20c5b44145b4e8ec0420d9eb1404a2108ebc83a9354f38
-MISC ChangeLog 43764 SHA256 fbc801a392e067bc36e28cdf9b893828a39b9411fe7dcb260e3ec4d579fa87b0 SHA512 7fc7fbfa15b04ece46c0c92f9aa0655c13e3351fd6b5728b3dfadbd3e4fa251a78082b55b6c289590839abb56b7366fff7abbd31472e6ab729ac01b4aa17583c WHIRLPOOL e1e7d92b80de70ccac65388310a621458b455649a8ad558c098582316ebba08bada5d38063715636ab76eec98b400e61e3ef822b4676b3d770870ce1b17d597c
+EBUILD lyx-2.1.3.ebuild 4401 SHA256 f4f463c3a2190bbe27ee5093491118bc9d55b4a57f2cc9dd6e9970b389f8ec9b SHA512 9536a0699777aaee57bf28afa97a86a99381ce51ea2c597c9b23de16595b7a8df9fc1575bda56c116bb76b00e639a7899a338eceda7c205f6b337fdb05cb956b WHIRLPOOL bb7f713f3d5dde2163f0f98bbbb0aa1e7d7881b496a30467e9b6e43b2c46a7d5f63304ec5c232986a4e76243a43400a1b5123a35763a9396406fe65295635e8b
+MISC ChangeLog 43974 SHA256 dfe1c2ca7310a65920e52297630ab8dcb71199475aeae7e094b4ba52c8ad6ed9 SHA512 add091768c22d3b34c4a9b660a2cac396cf961d305809e8877f71b1a4b795784e04aa8c74acbb25380f2187c6827f6c8b0354f35cccfd68bbb4c849b57cea0ed WHIRLPOOL 2a7ed20b185925b42818e462aea3ff1c5cc69ab2e7c1de99441698a58c158878fef6e2074714ddb08c908ce688ac64481075eba4e1770f52575406047f53ef81
 MISC metadata.xml 1593 SHA256 3e74c09403c8d71ae2b00d906fda9b9a1006ffe046f1a8f4f7e19fe84334cc65 SHA512 17fbf8f40fce9fceff58ce79abe827effd4e0822d4df584eeec9b0ee1989122bc0762f09d93a9f09334cc926e1b553f765325361cddddf2f071e0a848e280ab8 WHIRLPOOL db6ecebaa791225e7d918b90cc4998b4585d148426f9565b63fdff5472f5e472c7afbb2c7c7e82763d3501711741b9782a8878461c238f35f092cd3050cc98af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUgzEDAAoJELp701BxlEWflQkP/3lfpRqBGYnpIElGDg4C13LE
-0/CC4u8zKjgH+Dip8au8+f+rRGjMbYbwRhVNyfijOVnuTK2yxbvMn3htKkzqLkV0
-ZaKEGQy2JOqdDKCkuhwe5lK6VOjOkTxyUhvDBTLGUNbgiJteVn8TxhTBg8lhT/OS
-tqY8qYzMiZxdWvF6AEIMp0vE3Gc47UkoimdGctZmV1U4ldiew4fJ0YhNCKHNa3wW
-7SX50jh451I0PnhmefGMHjQ137HuX9Qe8GWcDpL92br1KUv2m9s6sVdRDmgCaEmA
-daiP0+fgXorRzLS9X509YfP97MIRf0hJJAO1M6vEE/5p/ngkwtOhGhBMeGxQxGVn
-D/uHSGZpN3iKCkQ52n/8Mo0ivnOM6opG5+lqmRElkXhLTVuC0DATscT9ZH09PlWz
-3PvSOzfG3xiMMCS/wjcmMOAdsdMRE7ivbLkZazcHIV606Y9UN2qbO4PZPums6MQP
-8nRG/7EfpNg2WctU4HCTrlFmGq7Jug2DlHcX5J38caHCAluf7SEf2J+VyTRiogiD
-arvM4griO+lXhegvBVm7AZycurfRzXn0W055enm779nppxESTby/L1Lv7ZfcNBJM
-Z56Yl1utgT8C1PROskPRJdNT8ak2CX/ef0HBGjR3txDwWIJz3KBqvBKyxzXbvSu+
-pYEFS551QhFDuOsiTyit
-=hkDZ
+iQIcBAEBCAAGBQJU8WcPAAoJEJIMDbyqvv1VoQUP/iDvw3tZOiL+hJSEQ1NkPk1q
+87ghbVitAylBiEL3Q5dcfrGEBV/USk0ZydgvHfXvHLHCpSpah8bLzN+NzJHG3CvI
+18xydlADLPpQt5+Rq0CzdtYECJMOzN6Uj15ZwrKdJTERBhBv++UPGsFJnWGOQJZt
+ExcrIFLj5cBdvVXMEIAFlGTIQMAxabJ1ix9BtnXhHDgZvY8kC7AIxGr4jFJx7uzj
+9fp4Q2fTRPHME04FhX9x5rBZ2ycgaActTf+CwaOYBJUGHHVpRUgHSgpQV4BUAIkH
+uQwOw/gTL7xaur/jf6Wb51lNVxOayhwT3QB/cXeLt1L1FyRvNyHbGYLMLXrycKpd
+grnKXno2OllXprSQP7xDmDvI+qgp1tsITC48aGZt+uUan/ehUv1C+xdjM29Q5JrQ
+rTY8FJmdedt6UyryVgL52oR7zfdSfs1UveOsG9nXYYZmGxq3LveYCk0eWE6y86/c
+zb6bOvMe7Y4ffgmePRtswB3GO1SDljKzHmPv2qH0Xlnnl8beslKDW2iisQdL10sk
+Bz1i+o78Wim1YOvkYOLzb9xyASaebha66jZQXgm8C70PT7VXUbMWZTnSJIR/Uvvd
+hYBI+YyGwVrWNP9JP6t4f+R05rUUoxhYFUSW4JdsBsZpTni1oJy5ZGDl0bMHnQ90
+fsXHaWCQplF8cpRpGszd
+=Z6iz
 -----END PGP SIGNATURE-----

diff --git a/app-office/lyx/lyx-2.0.6.ebuild b/app-office/lyx/lyx-2.0.6.ebuild
deleted file mode 100644 (file)
index 1cfe52e..0000000
--- a/app-office/lyx/lyx-2.0.6.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.6.ebuild,v 1.11 2013/08/11 13:42:25 aballier Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit gnome2-utils qt4-r2 eutils flag-o-matic font python toolchain-funcs
-
-MY_P="${P/_}"
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="http://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${P}.tar.xz"
-#SRC_URI="ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/rc3/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant"
-
-LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW"
-
-for X in ${LANGS}; do
-       IUSE="${IUSE} linguas_${X}"
-done
-
-COMMONDEPEND="dev-qt/qtgui:4
-       dev-qt/qtcore:4
-       >=dev-libs/boost-1.34"
-
-RDEPEND="${COMMONDEPEND}
-       dev-texlive/texlive-fontsextra
-       || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
-       cups? ( net-print/cups )
-       latex? (
-               app-text/texlive
-               app-text/ghostscript-gpl
-               app-text/noweb
-               app-text/dvipng
-               dev-tex/dvipost
-               dev-tex/chktex
-               app-text/ps2eps
-               dev-texlive/texlive-latexextra
-               dev-texlive/texlive-pictures
-               dev-texlive/texlive-science
-               dev-texlive/texlive-genericextra
-               dev-texlive/texlive-fontsrecommended
-               || (
-                       dev-tex/latex2html
-                       dev-tex/tth
-                       dev-tex/hevea
-                       dev-tex/tex4ht
-               )
-       )
-       html? ( dev-tex/html2latex )
-       rtf? (
-                       dev-tex/latex2rtf
-                       app-text/unrtf
-                       dev-tex/html2latex
-               )
-       linguas_he? ( dev-tex/culmus-latex )
-       docbook? ( app-text/sgmltools-lite )
-       dot? ( media-gfx/graphviz )
-       dia? ( app-office/dia )
-       subversion? ( <dev-vcs/subversion-1.7.0 )
-       rcs? ( dev-vcs/rcs )
-       svg? (  || ( media-gfx/imagemagick[svg] media-gfx/graphicsmagick[svg] )
-                       || ( gnome-base/librsvg media-gfx/inkscape )
-               )
-       gnumeric? ( app-office/gnumeric )
-       hunspell? ( app-text/hunspell )
-       aspell? ( app-text/aspell )
-       enchant? ( app-text/enchant )"
-
-DEPEND="${COMMONDEPEND}
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-       python_set_active_version 2
-       font_pkg_setup
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/2.0-python.patch
-       echo "#!/bin/sh" > config/py-compile
-       sed "s:python -tt:$(PYTHON) -tt:g" -i lib/configure.py || die
-}
-
-src_configure() {
-       tc-export CXX
-       #bug 221921
-       export VARTEXFONTS=${T}/fonts
-
-       econf \
-               $(use_enable nls) \
-               $(use_enable debug) \
-               $(use_enable monolithic-build) \
-               $(use_with hunspell) \
-               $(use_with aspell) \
-               $(use_with enchant) \
-               --without-included-boost \
-               --disable-stdlib-debug \
-               --with-packaging=posix
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       dodoc ANNOUNCE NEWS README RELEASE-NOTES UPGRADING "${FONT_S}"/*.txt || die
-
-       if use linguas_he ; then
-               echo "\bind_file cua" > "${T}"/hebrew.bind
-               echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
-
-               insinto /usr/share/lyx/bind
-               doins "${T}"/hebrew.bind || die
-       fi
-
-       newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
-       doicon -s 48 "${S}/lib/images/lyx.png"
-       doicon -s scalable "${S}/lib/images/lyx.svg"
-       make_desktop_entry ${PN} "LyX" "${PN}" "Office" "MimeType=application/x-lyx;"
-
-       # fix for bug 91108
-       if use latex ; then
-               dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx || die
-       fi
-
-       # fonts needed for proper math display, see also bug #15629
-       font_src_install
-
-       python_convert_shebangs -r 2 "${ED}"/usr/share/${PN}
-
-       if use hunspell ; then
-               dosym /usr/share/myspell /usr/share/lyx/dicts
-               dosym /usr/share/myspell /usr/share/lyx/thes
-       fi
-}
-
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
-pkg_postinst() {
-       font_pkg_postinst
-       gnome2_icon_cache_update
-
-       # fix for bug 91108
-       if use latex ; then
-               texhash
-       fi
-
-       # instructions for RTL support. See also bug 168331.
-       if use linguas_he || use linguas_ar; then
-               elog
-               elog "Enabling RTL support in LyX:"
-               elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
-               elog "You must enable RTL support in LyX. To do so start LyX and go to"
-               elog "Tools->Preferences->Language settings->Language"
-               elog "and make sure the \"Right-to-left language support\" is checked"
-               elog
-       fi
-}
-
-pkg_postrm() {
-       gnome2_icon_cache_update
-
-       if use latex ; then
-               texhash
-       fi
-}

diff --git a/app-office/lyx/lyx-2.0.7.1-r2.ebuild b/app-office/lyx/lyx-2.0.7.1-r2.ebuild
deleted file mode 100644 (file)
index 0cb6642..0000000
--- a/app-office/lyx/lyx-2.0.7.1-r2.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.7.1-r2.ebuild,v 1.5 2014/08/02 17:59:04 armin76 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit gnome2-utils eutils fdo-mime flag-o-matic font python-single-r1 toolchain-funcs
-
-MY_P="${P/_}"
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="http://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~ppc ~ppc64 sparc x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant"
-
-LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW"
-
-for X in ${LANGS}; do
-       IUSE="${IUSE} linguas_${X}"
-done
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-
-COMMONDEPEND="dev-qt/qtgui:4
-       dev-qt/qtcore:4
-       >=dev-libs/boost-1.34
-       ${PYTHON_DEPS}"
-
-RDEPEND="${COMMONDEPEND}
-       dev-texlive/texlive-fontsextra
-       || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
-       cups? ( net-print/cups )
-       latex? (
-               app-text/texlive
-               app-text/ghostscript-gpl
-               app-text/noweb
-               app-text/dvipng
-               dev-tex/dvipost
-               dev-tex/chktex
-               app-text/ps2eps
-               dev-texlive/texlive-latexextra
-               dev-texlive/texlive-pictures
-               dev-texlive/texlive-science
-               dev-texlive/texlive-genericextra
-               dev-texlive/texlive-fontsrecommended
-               || (
-                       dev-tex/latex2html
-                       dev-tex/tth
-                       dev-tex/hevea
-                       dev-tex/tex4ht[java]
-               )
-       )
-       html? ( dev-tex/html2latex )
-       rtf? (
-                       dev-tex/latex2rtf
-                       app-text/unrtf
-                       dev-tex/html2latex
-               )
-       linguas_he? ( dev-tex/culmus-latex )
-       docbook? ( app-text/sgmltools-lite )
-       dot? ( media-gfx/graphviz )
-       dia? ( app-office/dia )
-       subversion? ( <dev-vcs/subversion-1.7.0 )
-       rcs? ( dev-vcs/rcs )
-       svg? (  || ( media-gfx/imagemagick[svg] media-gfx/graphicsmagick[svg] )
-                       || ( gnome-base/librsvg media-gfx/inkscape )
-               )
-       gnumeric? ( app-office/gnumeric )
-       hunspell? ( app-text/hunspell )
-       aspell? ( app-text/aspell )
-       enchant? ( app-text/enchant )"
-
-DEPEND="${COMMONDEPEND}
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-       font_pkg_setup
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/2.0-python.patch
-       sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
-}
-
-src_configure() {
-       tc-export CXX
-       #bug 221921
-       export VARTEXFONTS=${T}/fonts
-
-       econf \
-               $(use_enable nls) \
-               $(use_enable debug) \
-               $(use_enable monolithic-build) \
-               $(use_with hunspell) \
-               $(use_with aspell) \
-               $(use_with enchant) \
-               --without-included-boost \
-               --disable-stdlib-debug \
-               --with-packaging=posix
-}
-
-src_install() {
-       default
-
-       if use linguas_he ; then
-               echo "\bind_file cua" > "${T}"/hebrew.bind
-               echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
-
-               insinto /usr/share/lyx/bind
-               doins "${T}"/hebrew.bind || die
-       fi
-
-       newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
-       doicon -s 48 "${S}/lib/images/lyx.png"
-       doicon -s scalable "${S}/lib/images/lyx.svg"
-       make_desktop_entry ${PN} "LyX" "${PN}" "Office" "MimeType=application/x-lyx;"
-
-       # fix for bug 91108
-       if use latex ; then
-               dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx || die
-       fi
-
-       # fonts needed for proper math display, see also bug #15629
-       font_src_install
-
-       python_fix_shebang "${ED}"/usr/share/${PN}
-
-       if use hunspell ; then
-               dosym /usr/share/myspell /usr/share/lyx/dicts
-               dosym /usr/share/myspell /usr/share/lyx/thes
-       fi
-}
-
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
-pkg_postinst() {
-       font_pkg_postinst
-       gnome2_icon_cache_update
-       fdo-mime_desktop_database_update
-
-       # fix for bug 91108
-       if use latex ; then
-               texhash
-       fi
-
-       # instructions for RTL support. See also bug 168331.
-       if use linguas_he || use linguas_ar; then
-               elog
-               elog "Enabling RTL support in LyX:"
-               elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
-               elog "You must enable RTL support in LyX. To do so start LyX and go to"
-               elog "Tools->Preferences->Language settings->Language"
-               elog "and make sure the \"Right-to-left language support\" is checked"
-               elog
-       fi
-}
-
-pkg_postrm() {
-       gnome2_icon_cache_update
-       fdo-mime_desktop_database_update
-
-       if use latex ; then
-               texhash
-       fi
-}

diff --git a/app-office/lyx/lyx-2.1.1.ebuild b/app-office/lyx/lyx-2.1.3.ebuild
similarity index 95%
rename from app-office/lyx/lyx-2.1.1.ebuild
rename to app-office/lyx/lyx-2.1.3.ebuild
index e4ea83de2611d8d01060ade03e87c643fdf04b62..cd484f040f35a52fd5c63658390d6edf7e0c5a42 100644 (file)
--- a/app-office/lyx/lyx-2.1.1.ebuild
+++ b/app-office/lyx/lyx-2.1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.1.1.ebuild,v 1.1 2014/07/16 13:44:14 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.1.3.ebuild,v 1.1 2015/02/28 14:59:13 dlan Exp $
 
 EAPI=5
 
@@ -126,7 +126,6 @@ src_install() {
        newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
        doicon -s 48 "${S}/lib/images/lyx.png"
        doicon -s scalable "${S}/lib/images/lyx.svg"
-       make_desktop_entry ${PN} "LyX" "${PN}" "Office" "MimeType=application/x-lyx;"
 
        # fix for bug 91108
        if use latex ; then