maintenance for lyx ebuilds

5 files changed, 7 insertions, 48 deletions

diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 03cb215..805dbd9 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,7 +1,6 @@
 AUX 1.6.7-python.patch 906 RMD160 74a2f14445d6b011fe04d06f3bd6710d36ab6351 SHA1 a9bc180553105b61767a82280e211a2c187cfbd4 SHA256 ad4ebb8d3837536eea869e15b3759840a1153d64d74b744e956ce9bdf5e5651d
 AUX 2.0.3-python.patch 1036 RMD160 1fdf43487cb67e61b02387834402e9618de87082 SHA1 834ac9383503078c6e9d54610056704b7c9d23c0 SHA256 954f96dab553024fb128924c7ba3d70a91946f6909d203ee0902d6ec8740ded8
 AUX 2.0.patches 9724 RMD160 5d09905388941acd0fd91f4d20d04d83c8c49b0e SHA1 83cd1f6c15d6adfa922fcf2a104db46143df4733 SHA256 9bf26943ce4f27b4cdbfa924f3097aa1bfba6e23a10d8db494148066e9bf8a39
-AUX lyx-1.5.0-gentoo.patch 1298 RMD160 69b7ce68234e7f5c2fee708944267f1974aa10d0 SHA1 16c3e6f846c55c3eb5fd9d7da1247a3429efa7a4 SHA256 36be1ea2577cce270319a7a3b4bed92e5925c0e974edda8729bda2179ac8ffe2
-AUX lyx.desktop 215 RMD160 13192f0f4e84e870565a3daff7d46c56954ed0fe SHA1 f72f3ff17a3a1b84cbb0aaf12c9e75387879a420 SHA256 b0ffd201e0a2e0cb39a52aadb9921e86fbb31c8d3cac04526371d6606246898c
-EBUILD lyx-1.6.9999.ebuild 4197 RMD160 1fb05dc360e08c8033a3957d27c4db58b31901fe SHA1 895061e60ef59ac85f787fa5e4c1892588124276 SHA256 5c79ce22e68b93cc470f7c4aab4b35e2e5e9bb45db6ae3e10c12869c9f77262f
-EBUILD lyx-2.0.9999.ebuild 4407 RMD160 9c5abdf00b84ed9a06e9da8861eb1af8a9690c14 SHA1 f638dbf4c049b50c80cb69e43e064ccf60b8109b SHA256 320404cba43a20e5e9d8a0ef3114aba9a98c4b2096a4c09a70b7df9677568f8f
+EBUILD lyx-1.6.9999.ebuild 4211 RMD160 cdeec99fd209f64599892517255b0995c447c9fa SHA1 86465fa52e0070536619fbebb894a3a578a2ab79 SHA256 c00adbf2a557e9656125bf36ed6a5a2a7f8664a8c83b6e328068e5137043269f
+EBUILD lyx-2.0.9999.ebuild 4391 RMD160 199e709d9af54138c9a2d0f18e618823c1f28e8b SHA1 93312cfbeaa005009389f58d6c8edb36044faa5c SHA256 465a9a1ca33cd23570402abe766ad7f4b4d657a0a3cbdc7c1220f75ee4b574b3
+MISC lyx-2.0.9999.ebuild.orig 4407 RMD160 9c5abdf00b84ed9a06e9da8861eb1af8a9690c14 SHA1 f638dbf4c049b50c80cb69e43e064ccf60b8109b SHA256 320404cba43a20e5e9d8a0ef3114aba9a98c4b2096a4c09a70b7df9677568f8f
diff --git a/app-office/lyx/files/lyx-1.5.0-gentoo.patch b/app-office/lyx/files/lyx-1.5.0-gentoo.patch
deleted file mode 100644
index 07f397a..0000000
--- a/app-office/lyx/files/lyx-1.5.0-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur lyx-1.5.0.orig/lib/configure.py lyx-1.5.0/lib/configure.py
---- lyx-1.5.0.orig/lib/configure.py	2007-07-25 06:08:25.000000000 +0900
-+++ lyx-1.5.0/lib/configure.py	2007-07-27 08:05:53.000000000 +0900
-@@ -214,7 +214,7 @@
- \\@@end
- ''')
-         # run latex on chklatex.ltx and check result
--        if cmdOutput(LATEX + ' chklatex.ltx').find('ThisIsLaTeX2e') != -1:
-+        if cmdOutput(LATEX + ' --no-mktex=tfm chklatex.ltx').find('ThisIsLaTeX2e') != -1:
-             # valid latex2e
-             return LATEX
-         else:
-@@ -386,7 +386,7 @@
-     checkProg('a DVI to TXT converter', ['catdvi $$i > $$o'],
-         rc_entry = [ r'\converter dvi        text4      "%%"	""' ])
-     #
--    checkProg('a DVI to PS converter', ['dvips -o $$o $$i'],
-+    checkProg('a DVI to PS converter', ['dvips -R0 -o $$o $$i'],
-         rc_entry = [ r'\converter dvi        ps         "%%"	""' ])
-     #
-     checkProg('a DVI to PDF converter', ['dvipdfmx -o $$o $$i', 'dvipdfm -o $$o $$i'],
-@@ -650,7 +650,7 @@
-         cl.close()
-         #
-         # we have chklayouts.tex, then process it
--        fout = os.popen(LATEX + ' wrap_chkconfig.ltx')
-+        fout = os.popen(LATEX + ' --no-mktex=tfm wrap_chkconfig.ltx')
-         while True:
-             line = fout.readline()
-             if not line:
diff --git a/app-office/lyx/files/lyx.desktop b/app-office/lyx/files/lyx.desktop
deleted file mode 100644
index 3dfdd9c..0000000
--- a/app-office/lyx/files/lyx.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Lyx
-Comment=Latex WYSIWYM Editor
-Icon=/usr/share/lyx/images/lyx.xpm
-Exec=lyx
-Terminal=false
-Type=Application
-StartupNotify=false
-Categories=GNOME;Application;Office;
-MimeType=application/x-lyx;
diff --git a/app-office/lyx/lyx-1.6.9999.ebuild b/app-office/lyx/lyx-1.6.9999.ebuild
index cb85f53..53898c3 100644
--- a/app-office/lyx/lyx-1.6.9999.ebuild
+++ b/app-office/lyx/lyx-1.6.9999.ebuild
@@ -127,8 +127,8 @@ src_install() {
 		doins "${T}"/hebrew.bind || die
 	fi
 
-	doicon ${PN} "$S/development/Win32/packaging/icons/lyx_32x32.png"
-	make_desktop_entry ${PN} "LyX" "/usr/share/pixmaps/lyx_32x32.png" "Office"
+	newicon -s 32 "$S/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
+	make_desktop_entry ${PN} "LyX" "${PN}" "Office" "MimeType=application/x-lyx;"
 
 	# fix for bug 91108
 	if use latex ; then
diff --git a/app-office/lyx/lyx-2.0.9999.ebuild b/app-office/lyx/lyx-2.0.9999.ebuild
index 3ee3398..4e60fdf 100644
--- a/app-office/lyx/lyx-2.0.9999.ebuild
+++ b/app-office/lyx/lyx-2.0.9999.ebuild
@@ -128,8 +128,8 @@ src_install() {
 		doins "${T}"/hebrew.bind || die
 	fi
 
-	doicon ${PN} "$S/development/Win32/packaging/icons/lyx_32x32.png"
-	make_desktop_entry ${PN} "LyX" "/usr/share/pixmaps/lyx_32x32.png" "Office" "MimeType=application/x-lyx;"
+	newicon -s 32 "$S/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
+	make_desktop_entry ${PN} "LyX" "${PN}" "Office" "MimeType=application/x-lyx;"
 
 	# fix for bug 91108
 	if use latex ; then