From 732b601c68a55fdcde6dd38583cf2673bded2030 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sat, 21 Mar 2015 10:30:37 +0000 Subject: [PATCH] Use ecvs_clean; make man packe symlinks work correctly; modernize ebuild style Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- app-text/sgmltools-lite/ChangeLog | 8 +++- app-text/sgmltools-lite/Manifest | 40 ++++++++-------- app-text/sgmltools-lite/metadata.xml | 6 ++- ...ebuild => sgmltools-lite-3.0.3-r14.ebuild} | 47 ++++++++----------- 4 files changed, 51 insertions(+), 50 deletions(-) rename app-text/sgmltools-lite/{sgmltools-lite-3.0.3-r13.ebuild => sgmltools-lite-3.0.3-r14.ebuild} (67%) diff --git a/app-text/sgmltools-lite/ChangeLog b/app-text/sgmltools-lite/ChangeLog index 39573f4a5153..880ada6c8fcc 100644 --- a/app-text/sgmltools-lite/ChangeLog +++ b/app-text/sgmltools-lite/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-text/sgmltools-lite # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/ChangeLog,v 1.64 2015/01/01 23:27:23 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/ChangeLog,v 1.65 2015/03/21 10:30:32 jlec Exp $ + +*sgmltools-lite-3.0.3-r14 (21 Mar 2015) + + 21 Mar 2015; Justin Lecher +sgmltools-lite-3.0.3-r14.ebuild, + -sgmltools-lite-3.0.3-r13.ebuild, metadata.xml: + Use ecvs_clean; make man packe symlinks work correctly; modernize ebuild style *sgmltools-lite-3.0.3-r13 (01 Jan 2015) diff --git a/app-text/sgmltools-lite/Manifest b/app-text/sgmltools-lite/Manifest index c06d0e312d6d..883d14c76ee4 100644 --- a/app-text/sgmltools-lite/Manifest +++ b/app-text/sgmltools-lite/Manifest @@ -1,28 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 DIST nw-eps-icons-0.0.1.tar.gz 8733 SHA256 15295129f1ddd3bc1d09775296bf0aacef722799394189b0755acb3d1725c012 SHA512 597062e9882bb9bb73144bbdb056c3ccc2a6d99efc7da836f483ccd6f3799705bcbb897099cb1a580c8e22d936d281d95c3a875694f8e15b6989faf437f6cc7a WHIRLPOOL 8aba320641c652e38ad4e87a48ac5f5454ded681ec1d9fc4a2430e272e3a6b9d6f230c4ede9e02d8df2f4f711bee33b2e7929f96871a685d17aa52a5ef3cdbf5 DIST sgmltools-lite-3.0.3.tar.gz 61342 SHA256 eb9d2270f9ac5f17b8bd2d27f53ae700937365079413843fe5089c9568d0f1d8 SHA512 36709ba726859b734a7402c533ba7d2abc0546007bc97dba76ac824bc42f6f8ac7ef263b3740d0be51749cbc0982d010ba938646fca2006fa2c5094a296b3c81 WHIRLPOOL 46a94114a04c54a19f1d6a37a35bfb30804b1fde8defc931b9464980600b2707ca9ea970632d5d793dee1bbd0a388ef3e64a8be2806093e33dca4eb7bfd4c7d3 EBUILD sgmltools-lite-3.0.3-r11.ebuild 2551 SHA256 493051b4614c76ab8f2319c1f4c3e9c265fef56c55c9c63732e92d82f762242b SHA512 5856ff3acc42037e757008a701057fe157553d2e368438936b1df596ef9259b4fb8bf1c8a175eb1d8cc0548c175276e3cbd830ef6bd42b39f1340d4b79853c1a WHIRLPOOL e0baff81c22ea145151528e1c84209da864c3633aadf2ead62afd4c0f0c63c4a14ae30cbbc3fe51487f8223f5b11803f0a074ff23e0899b94c46d639f0927e23 -EBUILD sgmltools-lite-3.0.3-r13.ebuild 2556 SHA256 c4bd0033aa5eb2fa32ab3448071eba4be0e378f76c1ece475bc5df48cfb0e604 SHA512 19024581b87d2f7572625f98459f4be2f6d35cf5c264761d2efc7b1de6c9cbecafbe2aa0342e4ef3facc9567b13bfbdfff30713e41a832bf9d41205445e6754a WHIRLPOOL fd10d7fad22479973ab1d1667e0dd86f5e86d7a17c90c5c0443aa85830fb6bcd3dc5792af92026323a205630ff238b1a996e25b3c9d109ba320ca25ba19bf9da -MISC ChangeLog 10486 SHA256 8c92143fdd2b6a7789838372ef06b8ecac6ffd5a0522b02d9a53c9884b30a3b1 SHA512 54cf961d18172a60e258e81fb88446880a6b6206f1aadfdabf5de2d4e7aa9c5037e564fc9c9f4ebbf2a7302fe446a05b07e51e68af2bef5a09b39e7cc3fae2d6 WHIRLPOOL cffbedb6b15ad9b91bd5820a5ca3b1125d90620f793d5a9d0930aa57c15b1cf37428a727ed15cb98ced17b382b94c8cb18ebe77cfbf870fe89cce0d59c789098 -MISC metadata.xml 372 SHA256 bc533cac542ec9044e407ebf6c0263834b7c77c341f50797e8fac0642591dd15 SHA512 8e0fd6a82de62a42176097127e0bd4db154b866ecdf6f3aa093465d55577865d94eef8f2f183292ef9e27871a6fa4caedc3e652029ae1088f7ed90a5b7f63c60 WHIRLPOOL e0c9bf69cc8308691d57964378bd577be94ac8dc0c025dff6e5be7b19945614a58d4dc0aa15090dc823793ab2f0313c53f357c24f439ac134acbfbe98221b914 +EBUILD sgmltools-lite-3.0.3-r14.ebuild 2342 SHA256 7fac81750251d11853cbafd707a927c19212d7d290cbf9c10a75cebaeaf7c05d SHA512 aa065dcf857df01ef8e9f08df0a2a0495d61b47687e7223524d330dadf40e8c736f322ac00f57f8d6ea556e1f129381d21d6c957789aaf140b3b5310801b6a43 WHIRLPOOL 755f0cc723a4ef26a06c2c130442c3c93c1c4fa8876b09e8588f5d413f6f7f37bc9e04a69c8d449d200f6ca39ee70d0aaca3f1a8e8e005017f8247ce7cabfef8 +MISC ChangeLog 10738 SHA256 d4bd4cd4f879f217aa4df9fea02329b0babfcc9da6e6a0e1bee937070128265f SHA512 a3e66e141646163563538e00c765e4a69d09673b818bfde27171647206072ac5958adcb53c09fab678a358625712eae592bc209f63b8795e6f1190765854d33f WHIRLPOOL cfb0c23788d4e79f2f54aadd2879d0fc52d58011b2da1fe246a98b5e09603a0c4add053c56b6f783c4dcda596d4c47717d8dfda79c17747a781eff76059890c5 +MISC metadata.xml 382 SHA256 cdd1dfc069b336063f5a0bb44dc2f041628793ce976038700d037707e3e8cfe3 SHA512 1f05853ad9997f49b8d1b320e0936a1043841f0e1f2e4239dc739a3b7be570e04ec9593acbad3b15d997ee94a5134c7ad5e00108921b77adc7e6a94b91497f65 WHIRLPOOL b3ecf9f5a4037ca5b0da194a3201701b1eef7985b5c929e0d1ff9d907136c0b1dddee12413ccbac8a36a39e7b89df7e33951c598144c9adf9e6807d3b808c111 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUpdfcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOA+EQAJ3ZP3WssddWiPLAu9ER+1V0 -nIfSepJmTZtiWZI5/GQhgdjefm2gzSdEdFXnwuxYl+Z9M+k1T7aFwGTi+5VKikUY -ahIxBLqZPsmgJJTj7a9FcHD10anNnlQN8NtcOoBn4Gu9GtLbyz8lLNXLzAP6ow2l -swdZ8lpPPcnmnDjkJaWuOD9q1+QrtSXgFAbo+ik2xnwJSxUi/WFcrbg7lXFeBSMM -AGxBUH6PZ5bJg3ZoMWTkQz1huGwA7D9TBgZAaAQx85blUnnOeyP+MAiuNQ8cCvb/ -ng5TshGQnGpVIGRdVtAtxFsEjgeqiBzpnZa0636e/KNGRoCHq3NnxBJy5+iMO5fG -cGQe5pLJgah88Ih2Jo2oXhGRgM+w/1N/hBvu/y6B4D3NuzlLxivCrSKyzPwZE6dM -oMnSQxTPsL5X1iCFhzPCi4OimcEZP37swXuxNn+3GAqD0CnKTt7SyYKbj2Ejw0lw -Z0WqwZyEnktjDgtQmtAbsS4vI5ouS2vAqGyRfHFHI3c11wvtsgVRvQG9s0TtMYSQ -Dshh4vI2Mop7C55pYC/TF0GjbzpYaqzPgtDWFL4H4hgNIa8+Zi/y5Wkl9IOaj6zG -6MvHPYm2lLRk1mKs7KVVrG9eX2oGChKFdeszZIjAhCw0Zjsa7i17S//fJP6vY8mr -FV4BeFr+bMisPGBEPyuT -=DI9z +iQJ8BAEBCgBmBQJVDUhNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirSqcP/0t241QXPdEE/0G6nR3v3O7v +bxVRAodS17QPxeRQ/3IrtTTjqzBhp7BgecHvpEZcAD6J0YBuXjZBDyvVGjM2+gGf +a0ZGMKU1Yaor9QKLhTl3nhGawule3XDh+Mwl2cXSjWwsAx+c2SsOjAg/o2XVIf73 +V7CCX6Ltag3IQn/nYWKPDS1jiHkUcpkWN4beEzcY1OAkuxi1m+YvBx8jCrA+Zzoi +0Ho1c0fDVnMaE6Wd189snZOf1EuzGvsF4i+XV/JAMrEoXDGdaE0Wzk1nGaVOgwgV +nSHGaa72pVCpiz1cbhyplXQYRXzFWW2/GL3vLAavRLKmPDkWP+MRshx2mC76fbGe +R1m8UqLhjF3t4hE0shKah6bSPyxMGvWIVJjoHIOC9qnI+tIXmXz7a1oCNHQXzk7F ++6dIipv7fKRGfG1uPVeCIjtRaS7o3BLoj028iCbHDhSQMeciYY3Xb27wz2v8CyAr +BO3VkY0qPri/O84PcmfsHkzg0KdyOsC3BiFlyDDZuWiG+17yVSje7gROZoEL2WXA +L4sw5phfgKpjAdj3C/4bzfVw9s6cZ1oUIU9Bnl19AC/GzhDNS+0Gpm9LmWuL4isn +E0rY0Wm0yhKqEwGiwA6FO1aUdnHF3xCA4et/8MmcypIiQQXxP20vxx7UH3dlL7VA +x0f2MuRSRzc/nGl2hhJ9 +=BYPk -----END PGP SIGNATURE----- diff --git a/app-text/sgmltools-lite/metadata.xml b/app-text/sgmltools-lite/metadata.xml index 506295e08cd2..4c9101437104 100644 --- a/app-text/sgmltools-lite/metadata.xml +++ b/app-text/sgmltools-lite/metadata.xml @@ -1,9 +1,11 @@ -maintainer-needed@gentoo.org + + maintainer-needed@gentoo.org + - Add support for app-text/jadetex + Add support for app-text/jadetex (for processing tex files produced by the TeX backend of Jade) diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r13.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild similarity index 67% rename from app-text/sgmltools-lite/sgmltools-lite-3.0.3-r13.ebuild rename to app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild index b264c10c2e6d..f72f7114f48a 100644 --- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r13.ebuild +++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r13.ebuild,v 1.1 2015/01/01 23:27:23 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild,v 1.1 2015/03/21 10:30:32 jlec Exp $ EAPI=5 @@ -10,7 +10,8 @@ inherit python-single-r1 sgml-catalog DESCRIPTION="Python interface to SGML software in a DocBook/OpenJade env" HOMEPAGE="http://sgmltools-lite.sourceforge.net/" -SRC_URI="mirror://sourceforge/sgmltools-lite/${P}.tar.gz +SRC_URI=" + mirror://sourceforge/sgmltools-lite/${P}.tar.gz mirror://sourceforge/sgmltools-lite/nw-eps-icons-0.0.1.tar.gz" LICENSE="GPL-2" @@ -26,7 +27,8 @@ RDEPEND="${PYTHON_DEPS} jadetex? ( app-text/jadetex ) || ( www-client/w3m - www-client/lynx )" + www-client/lynx + )" DEPEND=${RDEPEND} REQUIRED_USE=${PYTHON_REQUIRED_USE} @@ -35,8 +37,7 @@ sgml-catalog_cat_include "/etc/sgml/sgml-lite.cat" \ "/usr/share/sgml/stylesheets/sgmltools/sgmltools.cat" src_prepare() { - # Remove CVS directories from the tree - find . -name CVS -exec rm -rf {} + || die + ecvs_clean } src_compile() { @@ -44,47 +45,39 @@ src_compile() { } src_install() { - einstall etcdir="${D}"/etc/sgml || die + einstall etcdir="${D}"/etc/sgml dodoc ChangeLog POSTINSTALL README* dohtml -r . - cd "${WORKDIR}"/nw-eps-icons-0.0.1/images - insinto /usr/share/sgml/docbook/dsssl-stylesheets/images - doins *.eps + insinto /usr/share/sgml/docbook/dsssl-stylesheets/ + doins -r "${WORKDIR}"/nw-eps-icons-0.0.1/images - cd callouts - insinto /usr/share/sgml/docbook/dsssl-stylesheets/images/callouts - doins *.eps - - rm "${D}"/etc/sgml/catalog.{suse,rh62} + rm "${ED}"/etc/sgml/catalog.{suse,rh62} || die # Remove file provided by sgml-common - rm "${D}"/usr/bin/sgmlwhich - - # Remove the backends that require jadetex - use jadetex || \ - rm "${D}"/usr/share/sgml/misc/sgmltools/python/backends/{Dvi,Ps,Pdf,JadeTeX}.py + rm "${ED}"/usr/bin/sgmlwhich || die # List of backends to alias with sgml2* # Do not provide sgml2{txt,rtf,html} anymore, they are part of # linuxdoc-tools local BACKENDS="" - use jadetex && BACKENDS="ps dvi pdf" + if use jadetex; then + BACKENDS="ps dvi pdf" + else + # Remove the backends that require jadetex + rm "${D}"/usr/share/sgml/misc/sgmltools/python/backends/{Dvi,Ps,Pdf,JadeTeX}.py || die + fi # Create simple alias scripts that people are used to # And make the manpages for those link to the sgmltools-lite manpage mandir="${D}"/usr/share/man/man1 ScripTEXT="#!/bin/sh\n/usr/bin/sgmltools --backend=" - for back in ${BACKENDS} - do + for back in ${BACKENDS}; do echo -e ${ScripTEXT}${back} '$*' > sgml2${back} - exeinto /usr/bin - doexe sgml2${back} + dobin sgml2${back} - cd ${mandir} || die - ln -sf sgmltools-lite.1.gz sgml2${back}.1.gz || die - cd "${S}" || die + ln -sf sgmltools-lite.1 "${mandir}/sgml2${back}.1" || die done python_fix_shebang "${D}" -- 2.26.2