diff options
Diffstat (limited to 'app-text')
40 files changed, 296 insertions, 360 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz Binary files differindex 475a37de04ad..7b6c3c6e7cc3 100644 --- a/app-text/Manifest.gz +++ b/app-text/Manifest.gz diff --git a/app-text/expander/Manifest b/app-text/expander/Manifest index 6e1bf1b59299..4b78ee16274e 100644 --- a/app-text/expander/Manifest +++ b/app-text/expander/Manifest @@ -1,4 +1,4 @@ AUX expander-2.0.5-gentoo.patch 1971 BLAKE2B 16459adb991e28472c569ef77bd4f688110e0d2a99970ed65e5332736a1a90a82afa6a04aaec38ba53b16b3303efbe8706324ffe1a37d6b00637550802d23960 SHA512 f81577c3ee11d2e13b59258a59e02a3ec26b265ee2206fde5585f75c21db015907835ade2db88a19ab1afd778a3a7d146d99d1dfb891237d04b2e6a052f49f57 DIST nedit_expander_kit_2.05.tar.gz 92571 BLAKE2B 0b77640b87372003e873a9e9146aeec82220dfc86b4f6d57220807443c007b6f4f99da8da505d7b6d2f1350150698deed84c8cb710297c6d8646ed192d3ee04a SHA512 a9d5e97db95eec9f98d71360c6af5a6908f31f59221ac1f509ae4f661b0614610b9591b9e2f58bba1175a6b609407d720369ba99cecb5496133d889bf93788ee -EBUILD expander-2.0.5-r2.ebuild 1094 BLAKE2B a9b380f0fa99cdd32c32423fcfb2fc7a0684e0b92093f39dfe0169093d4eb8ca672cf890841903ad128593a592ed0e4258155c6e984bf0cf6b83297de4970c5e SHA512 1c95a0838980dd94d03257eae7c3c405d3236e0af0b828860a1e9d428788d77beb0add8bbcb8cabed07e7839c164ff44137a189965cd42a0ca1c32fa0620ae01 +EBUILD expander-2.0.5-r2.ebuild 950 BLAKE2B 2e75ea39d52d7518fbb632422083e3f760f8bc5bd1a67a4476aef16c271128c9db793a55abe2999677f085ba236ece498e22fd7fdec526a02bcfa697ffc4d35c SHA512 f1e4f13b0e24ed43fe61eebb6cbd557c3bf369a8baf9a8aba4bb9b55c33052132722a31e9c2e0d94aee8c502ae4118d9aa803c9ce171786cdf4ed272df892b0a MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/app-text/expander/expander-2.0.5-r2.ebuild b/app-text/expander/expander-2.0.5-r2.ebuild index 1c4a5c12ffbd..c1ddd2ee423e 100644 --- a/app-text/expander/expander-2.0.5-r2.ebuild +++ b/app-text/expander/expander-2.0.5-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Expander is a utility that acts as a filter for text editors" HOMEPAGE="http://www.nedit.org" @@ -12,35 +12,25 @@ SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos" -IUSE="" -S=${WORKDIR}/${PN} +S="${WORKDIR}/${PN}" -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch -} +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_compile() { emake -C src CC=$(tc-getCC) } src_install() { - cd src - dobin expander boxcomment align_columns align_comments where_is + dobin src/{expander,boxcomment,align_columns,align_comments,where_is} dosym boxcomment /usr/bin/unboxcomment - insinto /usr/share/${P} - doins "${S}"/service - for x in defs macros misc templates ; do - insinto /usr/share/${P}/${x} - doins "${S}"/${x}/* - done - - cd "${S}"/docs - doman *.1 + einstalldocs + dodoc USAGE + doman docs/*.1 - cd "${S}" - dodoc ChangeLog INSTALL README USAGE + insinto /usr/share/${P} + doins -r service defs macros misc templates } pkg_postinst() { diff --git a/app-text/flpsed/Manifest b/app-text/flpsed/Manifest index 307a6b64e6bb..19a250017638 100644 --- a/app-text/flpsed/Manifest +++ b/app-text/flpsed/Manifest @@ -1,8 +1,4 @@ AUX flpsed-0.7.2-desktop.patch 247 BLAKE2B 2b1269b3c3ca1fb451db11f0a0b310ccea40612226227574dd4eab020aff348fcfd8c82f3908b253148a5e5135cd3a29a8306ac480c53e3410f19701290b79ca SHA512 b632a6b4948a12910916ef71a4710dcbabf91fdfbc302e3242d9101310101377023e58a12b24b6139d26fa37261a779db21773a8329e3f74d2e74c5cd1c6190f -DIST flpsed-0.7.0.tar.gz 119159 BLAKE2B 1a051651d3d4835abea7ef3237340140feba465d9d42009b10fa18ac5aa927efeced7418477e096a9a5722f0e9217ba0546e324402ef5b84892adbba3f258c32 SHA512 0d5112f4e4f4401a1942767d0de1b38cffbc37e0f798b59e9371c37892c6d2e2448146baff2737e416ab9ec5d96963728918d4a49fc059ac1119d8ac946db59e -DIST flpsed-0.7.2.tar.gz 146678 BLAKE2B 0e42f1e5653e9b372047216119fb7fdaab98ad3710c0ef717352ce23443e38fb23bd86e4c39663cb0fa51f80393d2f956658f825f3926dd12b28521bc2d1a7ba SHA512 d0e2f7d34e48555d74f58e9df16fa6d29e8fda1fb4c6e58ccdda512f25d7f7ee0e3657e11564cdb9dec483c14f42078636430e5ec987165cc7c6c5de8990984d DIST flpsed-0.7.3.tar.gz 146788 BLAKE2B 5721d973b1efe02c8c014104d1ed4991dd630a8da86bc191b58df4a7ed469065e37b80248c7a7ab4946e636f869ecbfbfe457ed15a6cc7c4243642a48790ab67 SHA512 b0a8bf2ea08630d280f83f7c32b4574ba4cf7fd989943492e77d1b73c8d83c81a5df40e64bfff744b5518de845eba21119242ff752e16b20816b225ccb7c3321 -EBUILD flpsed-0.7.0.ebuild 428 BLAKE2B 12afd70897560f028048ed7574b37553abc36ddddb1e061b7adb3cb15c661224745ea8e64ae81cf8acc99f53c9659e8d41caa404fdd501c9e7264d638bbfb2c1 SHA512 eff4dfaba72d90281a42f0d1f327ab78024099dcba5713d0c6b6cd52483d1b867e08f2f2a5630aaa2872cfff7fca3d599a5a079be12b1024eb152afa155525d7 -EBUILD flpsed-0.7.2.ebuild 604 BLAKE2B a49ee79aae0237e5aae0a62859004557438eb723ff20c704ba645ddcb6e534f22c51d7e361c6ea212294d492fd0479ed719507fe37950b506965cb6a88b9f4f0 SHA512 a09b7cbf10d1c4b5aed3fba5467fb79d420f61bc779fbf61241492c33b7579fa693113dba336c5a2e8d8f5d2415d2958cb6333f06fbe41e8b51010fa9867b8d5 -EBUILD flpsed-0.7.3.ebuild 611 BLAKE2B 0516ad6f8c37f7076b8c42a22ef53a5ff8d1930ceec0cd29766281ed8cca47f78895d08c195bbbe0a1f77e6cff53c2c255a484d8c0e0160b85f01625b365534e SHA512 5feb11a89d61f3fbb4d273681ac4c0d7fbd4c2fdfc47d0c665e2fda38bbd6bda26e2a7a0b0aae950c7a103ce1d9bbde961749214e291b3c31ce51c0c92b8fbb5 +EBUILD flpsed-0.7.3.ebuild 587 BLAKE2B b80e1ecdfc2850a3bff1c645140fdeb5170696419e646590e91c201191f7d3a07df76bd107af1117e92276529df877dbd01a8c75d9edfe1734fbe20ce50ab4e4 SHA512 4a302416b5cd54eb596199f0d612600fac0294b00a0da0083d3c22cff139f901e149f294e9635fa94da5f31a4c7237e6c48d1f2216e9f9ad1606f1523decdf12 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 diff --git a/app-text/flpsed/flpsed-0.7.0.ebuild b/app-text/flpsed/flpsed-0.7.0.ebuild deleted file mode 100644 index 671e2fb01d23..000000000000 --- a/app-text/flpsed/flpsed-0.7.0.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -DESCRIPTION="Pseudo PostScript editor" -HOMEPAGE="http://flpsed.org/flpsed.html" -SRC_URI="http://flpsed.org/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - >=x11-libs/fltk-1.3.0:1 - app-text/ghostscript-gpl[X]" - -DEPEND="${RDEPEND}" diff --git a/app-text/flpsed/flpsed-0.7.2.ebuild b/app-text/flpsed/flpsed-0.7.2.ebuild deleted file mode 100644 index 5e75d7154621..000000000000 --- a/app-text/flpsed/flpsed-0.7.2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="Pseudo PostScript editor" -HOMEPAGE="http://flpsed.org/flpsed.html" -SRC_URI="http://flpsed.org/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - >=x11-libs/fltk-1.3.0:1 - app-text/ghostscript-gpl[X]" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-desktop.patch -} - -src_install() { - default - - doicon ${PN}.png - doicon -s scalable ${PN}.svg - domenu ${PN}.desktop -} diff --git a/app-text/flpsed/flpsed-0.7.3.ebuild b/app-text/flpsed/flpsed-0.7.3.ebuild index 7e38407047ce..71ddce38048f 100644 --- a/app-text/flpsed/flpsed-0.7.3.ebuild +++ b/app-text/flpsed/flpsed-0.7.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils +inherit desktop DESCRIPTION="Pseudo PostScript editor" HOMEPAGE="http://flpsed.org/flpsed.html" @@ -11,19 +11,17 @@ SRC_URI="http://flpsed.org/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="amd64 x86" -RDEPEND="x11-libs/libX11 +RDEPEND=" + x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]" DEPEND="${RDEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.7.2-desktop.patch -} +PATCHES=( "${FILESDIR}"/${PN}-0.7.2-desktop.patch ) src_install() { default diff --git a/app-text/gocr/Manifest b/app-text/gocr/Manifest index 939ca357c8ce..71662c7d280f 100644 --- a/app-text/gocr/Manifest +++ b/app-text/gocr/Manifest @@ -1,3 +1,3 @@ DIST gocr-0.50.tar.gz 419209 BLAKE2B 232fe240d7a559cdd4408a3dba3768818aefbd8b2718c7ae40829d69ab79dd68293eb6adfc52e661f2f6cf1290ae9656c84d9d7a8fc20229c0942a8e18fb3b68 SHA512 36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9 -EBUILD gocr-0.50.ebuild 1199 BLAKE2B ab0670e4b0c0af277050a2cf59cdcc5aedae968f061943bde4c6aeebfc161336c1e83f397f20cb37a1adabccdaa4fe36f27c9dc0cc90dd2b2ac96ccd96e75a53 SHA512 d73b4c9f4ed68f3c1f09ed7f2fe45d296c0a4fc74a29fb728e40090367be214e030e3615e50c91c9bc156d26ea9403624790ab9d71d3a0dcbf4c046c0f410cfe +EBUILD gocr-0.50.ebuild 1197 BLAKE2B 1d40723a64c90656f5a333d9834824e0a9baa8222a24b2f4042f3497b65ab823d9dd276d3036febb9f6461f4f7d07e25443d6a285cb6f6c2f07b86484ab96c6e SHA512 ee96d72859d2e29ff6b5405f49b5e6c102bd4058d6a38e8f319634012b2b21f64ce3cf314deac831312a6fadde23e55ba88b2ce2868919677a1944ab802371ba MISC metadata.xml 323 BLAKE2B bb09f6949d6fdefdb0ff856c96a0ab766e9ef11559aed7bc424b6da8eb226f4f9090b708da8b4ab62a123530201bfe721e5e6b505b5a6f3d5cd40f48941a86d9 SHA512 5b38ff42ca62ce001e5041406a24ccd8bc1c7f33d7a9e1f84ca0d5d48a3ad2f80e74732a846ffb6768709748bd2dca5868f76ab4c1b00f1e75a6f622597858e1 diff --git a/app-text/gocr/gocr-0.50.ebuild b/app-text/gocr/gocr-0.50.ebuild index d117bc57f841..80528df1f6e7 100644 --- a/app-text/gocr/gocr-0.50.ebuild +++ b/app-text/gocr/gocr-0.50.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 DESCRIPTION="An OCR (Optical Character Recognition) reader" HOMEPAGE="http://jocr.sourceforge.net" @@ -12,8 +12,12 @@ SLOT="0" KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc scanner tk" -DEPEND=">=media-libs/netpbm-9.12 - doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl ) +DEPEND=" + >=media-libs/netpbm-9.12 + doc? ( + >=media-gfx/transfig-3.2 + app-text/ghostscript-gpl + ) tk? ( dev-lang/tk )" RDEPEND="${DEPEND} tk? ( @@ -22,24 +26,28 @@ RDEPEND="${DEPEND} )" src_compile() { - local mymakes="src man" + local targets=( src man ) + use doc && targets+=( doc examples ) - use doc && mymakes="${mymakes} doc examples" - - emake ${mymakes} + emake "${targets[@]}" } src_install() { emake DESTDIR="${D}" prefix="${EPREFIX}/usr" exec_prefix="${EPREFIX}/usr" install - dodoc AUTHORS BUGS CREDITS HISTORY RE* TODO + einstalldocs + dodoc HISTORY REMARK.txt REVIEW # remove the tk frontend if tk is not selected - use tk || rm "${ED}"/usr/bin/gocr.tcl + if ! use tk; then + rm "${ED}"/usr/bin/gocr.tcl || die + fi + # and install the documentation and examples - if use doc ; then + if use doc; then dodoc doc/gocr.html doc/examples.txt doc/unicode.txt - insinto /usr/share/doc/${PF}/examples - doins "${S}"/examples/*.{fig,tex,pcx} + + docinto examples + dodoc examples/*.{fig,tex,pcx} docompress -x /usr/share/doc/${PF}/examples fi } diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest index 2192325b307d..f141c8325ebf 100644 --- a/app-text/gv/Manifest +++ b/app-text/gv/Manifest @@ -3,5 +3,5 @@ AUX gv_icon.xpm 2837 BLAKE2B d4e15bbf39e183b0093c7f9effa2725e558b6f0fad3d44fc383 DIST gv-3.7.3.90.tar.gz 757506 BLAKE2B f856d23d3b9b9164db414534dec4b9a1c441a88d644011a46429b29127364fe429fc72ed3ce76d4142106d10c6a5305b81ec22ed353716df1c1a824907f7b191 SHA512 a80ff303fda1d6f13d66847f4b20aee4b364a05ec750bdb08267aa46470b201edf9762e16ad39dfe9da03118658598697f411dc8c32ab8bbad05a1161e816c50 DIST gv-3.7.3.tar.gz 754282 BLAKE2B cdc2133e9be41e420401d23ab7691ca27ccbcabbe5c4d2c892f5661b5c47afc1f5b90f9f240a735d33e66813dcdda0a7a5c78580719ad715048fcaf6a2991446 SHA512 0c0339f023896016212bb1b8ef0185689dd669855c060d0491e1ac59c76ca19f3006b1b00b421cb40bb0beba8e2d35dad1da7d856ac9d33440cfbb07ff1e33c3 EBUILD gv-3.7.3-r1.ebuild 1183 BLAKE2B dbefcf30dd0b7410eface0373aa1864c0589cd6c2c9a4c4bf3e9dd24ff1043cd3ab14191a7ea2fd96c473b0e2f1e858f637c6ac09dcda5cb844e2b448e3dfc40 SHA512 261e7c286d25790b2a1e8076182f2c021aefeb05d42be9302913047a0de78af93d11e362fb3bde4c801cc87f59a47173a08927eaf0b2815577ec44ab731e8234 -EBUILD gv-3.7.3.90.ebuild 1052 BLAKE2B a5dad483860dc130a75211e8febd41522cb7f9a6b3a4dd56eabfc6231683822a7e8829bf1eb5200df3209ed6a2e52f64c5ac93d02f0937c864943ec1f12aba85 SHA512 8f7ae65364aa6a2fe32689a8389c94978da3c1ec7339a74214562ecbba0bbc531db57e9b30c0096a8428d205274c0953118f7b409a66c5e9894ce85628a25e0f +EBUILD gv-3.7.3.90.ebuild 1062 BLAKE2B 779fab28c23bc1cb4a48a657bbe929ba5c123323039b83d1654ac4b1c6484ea874b7a3ba07b0e5b9ab789e09c20e486eb655d587a9cba23029aa594d4a88945d SHA512 08b5b114166a20c56f78522181ad0e14ff5de1b9ba52b97ea1e3fca1874888a43b569d0035b441454defd05904351f5dc1c74c8d78fe2279671831912d2c040a MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36 diff --git a/app-text/gv/gv-3.7.3.90.ebuild b/app-text/gv/gv-3.7.3.90.ebuild index 95b3ac253ccb..9ceecd9b1cb7 100644 --- a/app-text/gv/gv-3.7.3.90.ebuild +++ b/app-text/gv/gv-3.7.3.90.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 + +inherit desktop DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript" HOMEPAGE="https://www.gnu.org/software/gv/" @@ -14,7 +15,8 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="xinerama" -RDEPEND="app-text/ghostscript-gpl +RDEPEND=" + app-text/ghostscript-gpl x11-libs/libICE x11-libs/libSM x11-libs/libX11 @@ -25,10 +27,8 @@ RDEPEND="app-text/ghostscript-gpl x11-libs/libXt xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} - virtual/pkgconfig x11-base/xorg-proto" - -DOCS="AUTHORS ChangeLog NEWS README" +BDEPEND="virtual/pkgconfig" src_configure() { export ac_cv_lib_Xinerama_main=$(usex xinerama) @@ -36,7 +36,9 @@ src_configure() { } src_install() { + rm README.{I18N,TRANSLATION} || die default + doicon "${FILESDIR}"/gv_icon.xpm make_desktop_entry gv GhostView gv_icon 'Graphics;Viewer' } diff --git a/app-text/hd2u/Manifest b/app-text/hd2u/Manifest index f3e0e5d43aff..9b71fb2b77a8 100644 --- a/app-text/hd2u/Manifest +++ b/app-text/hd2u/Manifest @@ -1,4 +1,4 @@ AUX hd2u-1.0.3-build.patch 666 BLAKE2B 14d1e7cbb7c7302ec0aa1354c4d0a493645f8bf4bf9e4c2e2fa2bd61b04e0e7e8f90477deb6a73a1777ff2f12ad13cdd97f604d889778759d7fe21222772eff6 SHA512 934fe3043aceeeee5df7ae5879198d385639f5b489581209c44e7ec91f5d05216424bf5652f557e154a1a442633848ebe1167b61af9c9e374cd30594744f4d7d DIST hd2u-1.0.3.tgz 60024 BLAKE2B 9dd57f2e15add3643aa92747836164b18c9c6554c435b718cea6b4e8d1455bbd775f9d4eda0f10a9bfe3ccb5dbd634a99b367ae849bce2145d9b1114400a2b1b SHA512 d354964f0ad5392315767b96438d843a5f1d6afe78da5b0c5ea65a3b0b2a61beabff3ecac89df81b9271a14ca443f23dfffeb51815e02b724ad287e42fc2d6cc -EBUILD hd2u-1.0.3.ebuild 515 BLAKE2B 4e84e7cdb9f6626cc61397559942ba15505de1ae819ce032c548581a1f271c8015d3feef8fd0840cbe63273df6debd80fa6acfa1a044707824649d19763b9814 SHA512 d0a7153a1d1961c2a1cf31028f300362a5fbaa6959719404c8f5d8cffd0bfdecc2cff47946aacd2a57fad53635532519ae8d09929acf86a654fdd041c32f03b7 +EBUILD hd2u-1.0.3.ebuild 474 BLAKE2B 8fa25cacff5262f171763842396eddd333532cadd9668cff0660a45d4c9b54d551319b3f5cf449f4bc799eeb415cac4dda56bb79ecb2d489679ebc1e26fffb4f SHA512 243201e510563726ea23d743a0c9ff49158ba5fd722856098da4760be368fdba7c3946d12243134185c12451c08e73f65008d52d96ed7790641d5645edd3a041 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25 diff --git a/app-text/hd2u/hd2u-1.0.3.ebuild b/app-text/hd2u/hd2u-1.0.3.ebuild index af0d97d7f58b..078f52b2e41b 100644 --- a/app-text/hd2u/hd2u-1.0.3.ebuild +++ b/app-text/hd2u/hd2u-1.0.3.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 - -inherit eutils +EAPI=7 DESCRIPTION="Dos2Unix like text file converter" HOMEPAGE="http://www.megaloman.com/~hany/software/hd2u/" @@ -12,13 +10,10 @@ SRC_URI="http://www.megaloman.com/~hany/_data/hd2u/${P}.tgz" KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" SLOT="0" LICENSE="GPL-2" -IUSE="" DEPEND=" dev-libs/popt" RDEPEND="${DEPEND} !app-text/dos2unix" -src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch -} +PATCHES=( "${FILESDIR}"/${P}-build.patch ) diff --git a/app-text/libxmlpatch/Manifest b/app-text/libxmlpatch/Manifest index 5d8c749a00b8..abea20a6cbe3 100644 --- a/app-text/libxmlpatch/Manifest +++ b/app-text/libxmlpatch/Manifest @@ -1,4 +1,4 @@ AUX libxmlpatch-0.3.3-gentoo.patch 2029 BLAKE2B a2cced2f4a6e8c7ad53420e1c8a6d244cfc808ae398ecd4106b59c0c80c6d3b708a9bd7c6ccddd21f15b5a000faeba4d00d9510ed1eb3b4a44a34cf79e52905d SHA512 076f5ce303fa410ed48828bfd4c9544d4606511597bf39676a899fb577bc4670db83706ef05928d9e49a665089864d6fb2e22321c19217ed341265d57d2c4052 DIST libxmlpatch-0.3.3.tar.gz 405496 BLAKE2B 57333f62b95be3acc058593ccdb935148217f84acd7b5d431043cf08bc217d04abe650be099a849790400f0153523cea46905e9a12e6a33e80f0e20edc2fd9f3 SHA512 2eb305ddd6aa1778bc9c9e7b8cae5f82ee05c0ed0a47bbb651209c496fff68f4e527b7d6ad1808bc8bf1f72aaa0172a12ddb140622ce87e3cd150a0ec4d35571 -EBUILD libxmlpatch-0.3.3.ebuild 796 BLAKE2B 4dcd48c289c36e72a8d9f4208a4857081ad9d31714a7030716b5661f66422bb40b0fa038d5fe2c318187408816d427d4fd18ea619613d0a1a8f574557e167f26 SHA512 d148276949fe5f8203bd91675421e90dc002af629c81d2299efb6296715872ebcf64299c88f35483508862f1dc50325014c661923ff454893d8a3acf4e73254d +EBUILD libxmlpatch-0.3.3.ebuild 799 BLAKE2B 61f13e2d328d26c5fd6f4985922776f1e51d041664bbe84083eb1f13b37865dfc236fa24cfdde24ebee5b995f19d3b2b07bc29ada57e39ac56ce892e3b9bb98f SHA512 4b68e1913b044f8945ded7186d63d4e274cb291f46315c3a4fff9fd1efd703d60d3efb9aad797aeec8dedc6e12a85bcc496437f159736203ceb58b3f1ed887b9 MISC metadata.xml 245 BLAKE2B e5b503817d886ea642301a8fb76459f31236d1496ba03cb467126419460106072424b6da1e1957ffaf977ac05f4c4baacef448cdf86ea4cbd93fdba026d5e8af SHA512 f884111cb1a85bb4e909b8bc6a70ca00e8d69e066fc9ef79ddbf0b3fc277bc8a47ce13bc1b7bd03a4be9bc0a54704440552394f1d1a8c68d0bf9704b8f05769f diff --git a/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild b/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild index 51ae4624c90c..d38ce9c286df 100644 --- a/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild +++ b/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit eutils autotools +inherit autotools DESCRIPTION="A set of tools to create and apply patch to XML files using XPath" HOMEPAGE="http://xmlpatch.sourceforge.net/" @@ -12,30 +12,33 @@ SRC_URI="mirror://sourceforge/${PN/lib}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" -IUSE="test static-libs" +IUSE="test" RESTRICT="!test? ( test )" -RDEPEND="dev-libs/glib:2 +RDEPEND=" + dev-libs/glib:2 dev-libs/libxml2" DEPEND="${RDEPEND} - test? ( dev-libs/check ) - virtual/pkgconfig" + test? ( dev-libs/check )" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch + default + mv configure.{in,ac} || die eautoreconf } src_configure() { econf \ - $(use_enable static-libs static) \ + --disable-static \ $(use_with test check) } -DOCS=( LEGAL_NOTICE README TODO ChangeLog ) - src_install() { default - find "${D}" -name '*.la' -delete + # no static archives + find "${D}" -name '*.la' -delete || die } diff --git a/app-text/mpage/Manifest b/app-text/mpage/Manifest index a9f6d764cad7..bac5f72f3af7 100644 --- a/app-text/mpage/Manifest +++ b/app-text/mpage/Manifest @@ -1,4 +1,5 @@ +AUX mpage-2.5.6-fix-buildsystem.patch 1014 BLAKE2B ef8b13e878060eda2ff5d0de8984bbf0b6bc1f6888e435aead416e2e8eb8eb6c68982fa16f9ec863ce129d8b15697d60f1b9c901ebc962811e285ee1d7965e13 SHA512 d7b9df3250bfe763d72241e83c64b8c220099b9859ce88534162090d8fe18d7583b8f884d31ecff22e2d9da9e6489f6a87802022c8a5d00f2085adbfbdb9e608 DIST mpage-2.5.6-gentoo-patchset.tar.bz2 12853 BLAKE2B 69adf941b43fdd7c4e43f3c793063f8d4c1d7f5eeed4b4e01cee7c7a7f5b70554cf1d2e4f73278231d5d95b99de7925ca6f355b8933bb5b7ea2d850d802b567c SHA512 2bfbe4689e02fb76af58a6db3415227df38e71b45fcc3d563a12f505fab8ea78de0415c9ac6d7c9b873f23a9f65e1c8f708f902965ab10e18b2a217b67cc5f0d DIST mpage-2.5.6.tgz 86748 BLAKE2B 44558be1272c90a83de37bf9854c96dd1f5b9b38d8588bae66adcfdaa938da351f606424f4d9049231bddae2d03ebc632570a7c80a0037ba1536147aa33df872 SHA512 79a51d0fa08848b22f758e8bc3f57680d33492d261a0061c6cce002c3cb5f129a78221d2af1749c79d4e46385136d9996294499531e60e8fc501f9fd61f8077d -EBUILD mpage-2.5.6-r1.ebuild 970 BLAKE2B 17de01d5e612540093fc011c37ba8d9944ee321c11cdba31ecadaeecd6ede3ba3ad18bf51e3f0c8b9ddf956c14dda4f276a14b132c823b047c5db480380dd64b SHA512 312066f12c7fbfbcf68ec5c3b595a4ce5fa41cb7328be95291aadfa58a0a13e555cb727bc800192be9457ba46bbb55130533b41dadfa0253856ad604aa22f4da +EBUILD mpage-2.5.6-r1.ebuild 1003 BLAKE2B 974fa91cf7211af2d930e7e0d6226fa604252c48f4d06a19b5c1c079adffa8aca4f215ac959815f211806c3c2be0534d98c3aa6ec4a23e4497cbbad64d245426 SHA512 6f282bd32d9c45bd087e3e92481a7060401f48cb2f7194c417ec17097eef7e9d2b91a3ffd4ff5f3a8b08a5d58e9fa7b8a255446ee85143df15bd75902d72c4ef MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/app-text/mpage/mpage-2.5.6-r1.ebuild b/app-text/mpage/mpage-2.5.6-r1.ebuild index 0b6a0146109e..6ab60421dd8f 100644 --- a/app-text/mpage/mpage-2.5.6-r1.ebuild +++ b/app-text/mpage/mpage-2.5.6-r1.ebuild @@ -1,39 +1,44 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Many to one page printing utility" HOMEPAGE="http://www.mesa.nl/" -SRC_URI="http://www.mesa.nl/pub/${PN}/${P}.tgz +SRC_URI=" + http://www.mesa.nl/pub/${PN}/${P}.tgz https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2" -KEYWORDS="amd64 ppc x86" LICENSE="freedist" SLOT="0" -IUSE="" - -src_prepare() { - sed -i Makefile \ - -e '/^CFLAGS/s|=.*| += $(DEFS)|g' \ - -e 's|$(CFLAGS) -o|$(LDFLAGS) &|g' \ - || die "sed Makefile" - EPATCH_SOURCE="${WORKDIR}/${P}-gentoo-patchset" epatch \ - 01_previous_changes.patch 10_bts354935_fix_fontdefs.patch \ - 20_bts416573_manpage_fixes.patch 30_bts443280_libdir_manpage.patch +KEYWORDS="amd64 ppc x86" + +PATCHES=( + "${FILESDIR}"/${P}-fix-buildsystem.patch + "${WORKDIR}"/${P}-gentoo-patchset/01_previous_changes.patch + "${WORKDIR}"/${P}-gentoo-patchset/10_bts354935_fix_fontdefs.patch + "${WORKDIR}"/${P}-gentoo-patchset/20_bts416573_manpage_fixes.patch + "${WORKDIR}"/${P}-gentoo-patchset/30_bts443280_libdir_manpage.patch +) + +src_configure() { + tc-export CC } src_compile() { emake \ - CC="$(tc-getCC)" \ - PREFIX=/usr \ - MANDIR=/usr/share/man/man1 + PREFIX="${EPREFIX}"/usr \ + MANDIR="${EPREFIX}"/usr/share/man/man1 } src_install () { emake \ - PREFIX="${D}/usr" \ - MANDIR="${D}/usr/share/man/man1" install - dodoc CHANGES Encoding.format FAQ NEWS README TODO + PREFIX="${ED}"/usr \ + MANDIR="${ED}"/usr/share/man/man1 install + + rm README.{amiga,OS2} || die + einstalldocs + dodoc Encoding.format } diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index cc4fe4a583f1..a800fe77446c 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -3,6 +3,7 @@ AUX mupdf-1.14-libressl.patch 1362 BLAKE2B b52ccec0a03d97b357d5329317143595e0cf3 AUX mupdf-1.15-CFLAGS.patch 376 BLAKE2B ace255a4110df9200d627ac68f5950218eeaa993bbd37fa7fe2d676572cad02d50a632750e6a9bdf6269cd97501f709d075a79d7db8b9832909b59b33251b594 SHA512 c00cd5cb30d33a9cbc55557cab3c4e2be1ae86121c5b1b28b6e35f97f93751aa2e96e106f13b7f365a56ebcce8e1c5e4163a440e8c85a48130803f5a7aec63ed AUX mupdf-1.15-Makefile.patch 1189 BLAKE2B 21447e2fd8ca7c396b9b2bd5e1e70ac6ebff5dc8dcbde273e0b23e17281cf2fe16f7a53587f9b0a3b2af1837f3ed5fc4a19666a4cdfa5d491e8b9be71519e1a8 SHA512 6c696b5a522116d075ee1a4759cdf3cae2e8836315f2898a51c15e227d4d57b44095a9927e7d66ab7d522ba6e0c65eed10a379d9e80b791ee8b6022933f615ab AUX mupdf-1.15-openssl-x11.patch 735 BLAKE2B 03e53970a145db913bad9c03de899ffeb7eed3abfad4d3db15819d5e101ba03e376fc0faea9c4939b7167b276fffe022975bae2e99238d5b4bee92edfb924fd5 SHA512 028930d5e6c86a9052de6e1e0f3e937d89a3f22e10b7fb71f1dba998c480c9914520e4248c21d68291c6fd7684c627b5068c1bb2e027ff6a518d1ca5533eb677 +AUX mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch 3410 BLAKE2B 1181234b618d52766e159366bd4358776ec39fc7091c05025a6a70cf626427fb3a36c0909569d4be22aba8c9695366d0b8a61592f5bbab766efbe8190077d66d SHA512 069c8150402fc463def14ff5690ecfe8a376579ad8319bf79f90823a04799bef1bfa25e79b759a0e027595a114bd3cf48f613541eeb2eec2c85e31d2105062f6 DIST mupdf-1.16.1-source.tar.xz 45800404 BLAKE2B bc4158a457056c55db52a518efc13c289cca537c29a6b563046297dc225f3ce0add781adb8520c4d0829d653ed0539042597e341cb21c4fb4c462ed422bf735b SHA512 fa657e6b9251aff91c25e91b335ea829b797dd91a759505bfd7259f8236613f590a044bc741e9b0587da55817a1ab8c1499c067d65d683d099259d06d91a8f50 -EBUILD mupdf-1.16.1.ebuild 3423 BLAKE2B 617b555931b62636135ca23945b18970063b735ad2dc25b79e0b22600bfc21bacac94ad3a729fa41506246a9d8ab5189911664494370d76812b43639ced8df2c SHA512 fe78c972cca044632fed80a591d101e9ab42e3faabc190ce68fb564ec3b725b8a155030670b6c652c954a9d23db232f8a453ee57025d94ff859ac0f7e25167e8 +EBUILD mupdf-1.16.1.ebuild 3480 BLAKE2B 4a2712e52241a5c763e8e06381884c75ebecc25331260be69675bbe34c2ffc153b0354bf8a3e3a73c6ec1532d398a89c84248e4115c034141d51c0dffff7195e SHA512 8341e53be62e5198f5de0a10a25e2d5b0c8643f77f90dc58d317b955666ac90b6ceb4c5bca8652fcfcb8d3541364426ba35f7fdf7db7e20afd1c452d9260fc4b MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild b/app-text/mupdf/mupdf-1.16.1.ebuild index 117de7bc1999..a7b999565155 100644 --- a/app-text/mupdf/mupdf-1.16.1.ebuild +++ b/app-text/mupdf/mupdf-1.16.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -46,6 +46,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch # See bugs #662352 "${FILESDIR}"/${PN}-1.15-openssl-x11.patch + "${FILESDIR}"/${PN}-1.16.1-freeglut-fg_gl2-gcc-10.patch ) src_prepare() { diff --git a/app-text/o3read/Manifest b/app-text/o3read/Manifest index b156d3661c29..accc5319663f 100644 --- a/app-text/o3read/Manifest +++ b/app-text/o3read/Manifest @@ -1,3 +1,4 @@ +AUX o3read-0.0.4-fix-buildsystem.patch 703 BLAKE2B 89a61be0303ee3bee3162b9adf0f415795baf9726837ee2e3c805516a5e989a59ecb079f684660ec616fe72a62809b4f845bc1cb6380647c383b8e44dfc8a216 SHA512 0395f4af51deeb330a155e72b55a400f803d451af5e7664f147f7a8b3d1a3d971a209ae454faa9d836a8e28be09d83ca1a6cadb412befd4f16b0f45928e64da9 DIST o3read-0.0.4.tar.gz 21075 BLAKE2B 35a7cdb3b8242179372c08428691ff0d7ef6df14777b2559847df0a3b15396a8eb28746cdefa99109e6b2544d4ed7997934b50b620d847c3ad150404b8b3252e SHA512 5287a9d58a77cba47397265de9decac1d4327f0a6065cbf7303451d48126a173ad2763157355c9a41237feac6b467ddff5d7e5ad4b4d6c3870f1d09ae0035879 -EBUILD o3read-0.0.4.ebuild 631 BLAKE2B cd93bd95c82f589cb0deb26a0b1a8a6bac7e0a6d55f8617553b21725606d9a0fa2a8f380a5010fe7ff416289c07b38b6c9737b296d0578254c1cf28442046fd2 SHA512 de72f26f1d09390eb361b1f9f9071da5ba204ea2a1ce1a4ed15cd487c06f849cfa4c6363ca6b5b4a50df48a5588e35e2add166d5584a60d50a50f7f84fcc518f +EBUILD o3read-0.0.4.ebuild 556 BLAKE2B 7ab6882de3d8c4445e1914f72babb382bfa74c9ccd030ee4f298d5d3c85ce4a03f24aa25986ada7aea76686f3ae280a58b4a65591a5ec55b45a2cc5d74841b61 SHA512 35463dfaa39df6c49e998fffc4e0fabeced79e11421c170beccd58eb4c8cef52902514c5ef7eb37947bb6c44c0931fbdb81cd40d272144fb548cb6ddf05f819d MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/app-text/o3read/o3read-0.0.4.ebuild b/app-text/o3read/o3read-0.0.4.ebuild index 9b39421c0634..4cf54987a0c9 100644 --- a/app-text/o3read/o3read-0.0.4.ebuild +++ b/app-text/o3read/o3read-0.0.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 inherit toolchain-funcs @@ -12,20 +12,16 @@ SRC_URI="http://siag.nu/pub/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" +RESTRICT="test" -RESTRICT=test +PATCHES=( "${FILESDIR}"/${P}-fix-buildsystem.patch ) -src_prepare() { - sed \ - -e 's:-o:$(LDFLAGS) -o:g' \ - -e '/^CC/d' \ - -e '/^CFLAGS/g' \ - -i Makefile || die +src_configure() { tc-export CC } src_install() { dobin o3read o3totxt o3tohtml utf8tolatin1 - doman o3read.1 o3tohtml.1 o3totxt.1 utf8tolatin1.1 + einstalldocs + doman *.1 } diff --git a/app-text/pspdftool/Manifest b/app-text/pspdftool/Manifest index adfb65daad54..674a2f209fcc 100644 --- a/app-text/pspdftool/Manifest +++ b/app-text/pspdftool/Manifest @@ -1,4 +1,3 @@ DIST pspdftool-0.03.tar.bz2 129936 BLAKE2B 100ae29a9d929475d90c0acd6c5e50b61c65d690489ef223238bd19f567757635e0b0e774ff4561aa8e41476dd9a270ef8abafb307ad354e4f919b5ce578cf9c SHA512 8e621719c59f79f7201e8221a851e85d11573fa1895a64ab5e77382fa1103004f70a38f98928a8ce4b5795ce89ac3e4a7a5eade772959e26e49d6db9cc7fe7ea -EBUILD pspdftool-0.03.ebuild 882 BLAKE2B 0e0793ed9090b7a2218ef8bdd9d1fc50aec0a8b062eb608e2a2742c81f967129d060bbb1eb4972ef64f894c8525c1204480e03a6bd56c3626382ecaadc8a4e92 SHA512 2555568da3e8feb2a0bf29384b67f5204eeb61dcf176d976f2c5f66718a1ab9c0f377d3ad0a89169fe8fb7cfec13864a02fb48a275e9a50299932f87dc52e28c -EBUILD pspdftool-9999.ebuild 806 BLAKE2B 83accfdbff4beacbbebbf52f22749868028d38b75641dc3171059b025c35ad0ce3bfb613cf90b4dacbe38a5464e1980acfe712cdbb7eb76d2333e27a3892f9b2 SHA512 a0a04775997d3cd9cd460ceb49f96d34cd225590a6d9f39ad65a80d0c04212e31641d621ffffad3742bba70bc1bddabe9e9adbdabaec2ac45ef90718481e227a +EBUILD pspdftool-0.03.ebuild 615 BLAKE2B c58cc55562c843c6e5561f265db89495e9a39eed7fc346978c7839da98647538fe9e4377e3f2759965884035cf2ae4821f900851da0abc3fc2e5e405519fbb33 SHA512 689365db99cba7ed8771edf48c18cf44c0ed87afabaa0039ef94fe4920ed95bfc5828344f78d208c2e1b19ea73e982a63a6671a11b3131c945c94b1ac35f49da MISC metadata.xml 498 BLAKE2B f7458570baa04efbeb3781aefd4187bc5f84b0d7279be2b903c2347cf3c32d7b6ec64c68222ddd665db4698be2b760eb5efeafdc188a49a80b03e0c4d1a95cb1 SHA512 55cb86516399e85deae15087e3625848416af0585a6805ed65245c644b85ed3e0509ed6b9cfd7013664eff00ba0c7c9d09951bac3fce306adb7b96829615452c diff --git a/app-text/pspdftool/pspdftool-0.03.ebuild b/app-text/pspdftool/pspdftool-0.03.ebuild index 5b6cbb7e2ecf..5dff5b9d0d33 100644 --- a/app-text/pspdftool/pspdftool-0.03.ebuild +++ b/app-text/pspdftool/pspdftool-0.03.ebuild @@ -1,31 +1,25 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -ESVN_REPO_URI="https://svn.code.sf.net/p/pspdftool/code/trunk" -ESVN_PROJECT="pspdftool" - -[[ "${PV}" == "9999" ]] && EXTRA_ECLASS="subversion" -inherit autotools ${EXTRA_ECLASS} -unset EXTRA_ECLASS +inherit autotools DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents" HOMEPAGE="https://sourceforge.net/projects/pspdftool" -[[ "${PV}" == "9999" ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 -[[ "${PV}" == "9999" ]] || \ -KEYWORDS="~amd64 ~x86" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" +KEYWORDS="~amd64 ~x86" IUSE="zlib" -DEPEND="zlib? ( sys-libs/zlib ) " -RDEPEND="${DEPEND}" +RDEPEND="zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND}" src_prepare() { + default + mv configure.{in,ac} || die eautoreconf } @@ -35,5 +29,5 @@ src_configure() { src_install() { default - rm -rf "${ED}"/usr/share/doc/${PN}* + rm -rf "${ED}"/usr/share/doc/${PN}* || die } diff --git a/app-text/pspdftool/pspdftool-9999.ebuild b/app-text/pspdftool/pspdftool-9999.ebuild deleted file mode 100644 index 96932275aac6..000000000000 --- a/app-text/pspdftool/pspdftool-9999.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -ESVN_REPO_URI="https://svn.code.sf.net/p/pspdftool/code/trunk" -ESVN_PROJECT="pspdftool" - -[[ "${PV}" == "9999" ]] && EXTRA_ECLASS="subversion" -inherit autotools ${EXTRA_ECLASS} -unset EXTRA_ECLASS - -DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents" -HOMEPAGE="https://sourceforge.net/projects/pspdftool" -[[ "${PV}" == "9999" ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" -[[ "${PV}" == "9999" ]] || \ -KEYWORDS="~amd64 ~x86" - -LICENSE="GPL-2" -SLOT="0" -IUSE="zlib" - -DEPEND="zlib? ( sys-libs/zlib ) " -RDEPEND="${DEPEND}" - -src_prepare() { - eautoreconf -} - -src_configure() { - econf $(use_with zlib) -} - -src_install() { - default - rm -rf "${ED}"/usr/share/doc/${PN}* -} diff --git a/app-text/rtf2html/Manifest b/app-text/rtf2html/Manifest index b3ebb225c4d8..ec51210cfa8d 100644 --- a/app-text/rtf2html/Manifest +++ b/app-text/rtf2html/Manifest @@ -1,4 +1,4 @@ AUX rtf2html-0.2.0-gcc43.patch 693 BLAKE2B fac12178580d8114b7429e3da6552c31bd82f5aac174d08276346cfd1e5ccc1181d31d2db524aa78eee83b1d2aff2a27f74adcc3f52f36b8f8300295c06777fa SHA512 e8f4ad4f30ef8b317786a9c6b864245254c9127d5967ffc61c9934a55f0223c2f15ad388b1047ca3aaef11fcf1bad372f515df24c32a52a3abdbb6aaa5afe2d6 DIST rtf2html-0.2.0.tar.bz2 75292 BLAKE2B 18cc67ff3642f68ae262aa6e3368be93defe19ceeab07f9e55fcd2390e4c374c7ab315c0c5f8b7644a458e4100a4be3812767b080842d862266083856f5376aa SHA512 7399c98adb4dc0f45e420cd6836c36720d6b19ccbba062d2102b2693a6812642d6193000172ef7eeef5b8a84dcb2d35c1eb99fbf3bffaf8dad43e8ca06c6fe75 -EBUILD rtf2html-0.2.0-r1.ebuild 700 BLAKE2B d9b7e446a395f8c4273c1d968d09d40c07b0d45a0a6ccc335b8429ee02ff0bbdfc3800e133e85199073fb8e26f41ddfb1be8621ca8d1a909ad118a9b4f896a0c SHA512 5b48e0bbd927f43a759cb5d345a728721321734523d41a57415cdfd3ca37b906b5f7c5704547db96b81b5ed573fefbbf3ae5858d504abb16ed33bf34fc1b8081 +EBUILD rtf2html-0.2.0-r1.ebuild 506 BLAKE2B 0ad1a14e906249ce38a68025c708972b9751d7292fe3cf9f9cb8d4c5034f5bfe33f0cb3fd07b73b9dafff83bc761654353252ad3a5f8d03c1be0bf70bf09ebb8 SHA512 3531cf46a2dd394af35e48d29007a5a4498034359c9f1431a8da91f88cb2c924abda5ba645c5aa5a27bea0267770effc873c7d95e3e5bc9eb0d12455370186cd MISC metadata.xml 318 BLAKE2B 8456d5d447f556d9e6d5039fce7ea1437214b68c04aafe1a56d7a6dd51286ffb62ccbd6b0c42857dd5dcb0e42c4856b84beef6c4ccd80506153af42cfb0229c0 SHA512 f9fce83b4df04e11ddd34a60cc7bb32e9ab12cc5eed26352de20186660ab8173d910b6cdae63e1562f83bd1ed89f6210aca1cd5401ae93f31296dbac6f3256d4 diff --git a/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild b/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild index d5f0c353c4c1..f48b71d62643 100644 --- a/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild +++ b/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" - -inherit base flag-o-matic +EAPI=7 DESCRIPTION="RTF to HTML converter" HOMEPAGE="http://rtf2html.sourceforge.net/" @@ -12,23 +10,12 @@ SRC_URI="mirror://sourceforge/rtf2html/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug" - -DEPEND="" -RDEPEND="${DEPEND}" -DOCS=( ChangeLog README ) - -PATCHES=( "${FILESDIR}/${P}-gcc43.patch" ) +PATCHES=( "${FILESDIR}"/${P}-gcc43.patch ) src_prepare() { + default + # CFLAGS are incorrectly parsed, so handle this here sed -i -e '/CFLAGS=$(echo $CFLAGS/d' configure || die 'sed on configure failed' - use !debug && filter-flags "-g*" - - base_src_prepare -} - -src_configure() { - econf $(use_enable debug) } diff --git a/app-text/sloccount/Manifest b/app-text/sloccount/Manifest index 343ab7d1103b..1b552b042b0a 100644 --- a/app-text/sloccount/Manifest +++ b/app-text/sloccount/Manifest @@ -1,6 +1,6 @@ AUX sloccount-2.26-coreutils-tail-n-fix.patch 468 BLAKE2B 81f7e84e738ef592c9863590b8648e1bb3446b8556b2562fe20f42af060719bb639fd93c25a1350ee738b095aff6943fb77b7498aaa6d5b2c6d405affacfbfea SHA512 200ccf47b4ca21a17cbe06ccf7b9a8022c794d1b5c0e0f59477b74a37704a6d5a106d4a7791ab84f6387032c938c132ffc1971e4db6532b21d5a0f2fef6df03e -AUX sloccount-2.26-gentoo.patch 852 BLAKE2B 5e41be564f2aedb7d5094453148e9a9048894473316f77d50570f94dfcf973aa84f362533b4ceaf617fb8f1eb24db03e42a3562c6ba4da2716e652101acb1b86 SHA512 226a28d6ce4bc42f3074dc4390379e0d4539d9e2d9dabe3ec7b60fd41a9b3d9d882d4c4b0dce6803eb137230b67cc622d2b3ab6c4ead0cb90a410efe4b5b18af +AUX sloccount-2.26-gentoo.patch 2883 BLAKE2B 97234b574060b0c0d7343e2589765c7aea67604bcd56a3671c825d0e798ea122bc68e9f7d6e1fc0b016ae0124e49e19a059b97a59137bc26f242d91c1f6fa4c7 SHA512 6d744053c050525e6d54be467fdf83bdedc80871d3ffb7f65e15ba44224f2c67e8785e2e5621747ee680000aa542ca014ea6afa25bb90aee5469d679b41114f4 AUX sloccount-2.26-libexec.patch 2293 BLAKE2B 7e2dbbf27535e8a2c6ebba2eca790b67b84cd102a0b000a45bf2b56434138891de72906b42170a488f1a1ef6df4a848f0d72137662b835d5f002350b747f1b33 SHA512 87101dc6c6632d38ff25b842b3342ee7caae0a926ce7c62f07360691a1494f8fefb8a039743d6cc49e3ca53a2eb179a06a97763ff5cf6224056a0916317afa35 DIST sloccount-2.26.tar.gz 190948 BLAKE2B 060cba3796ba4edc5f64ca3cc16de6f7dd8d1d18e45f9ccc0abe7a27e37daa6c02dd7a3f31b124b5e9ccc81ab59a7c4c6405b86ebb17ca9853c1ac1dafcba095 SHA512 ed6ab315a56dbdc86c654b94e790c9ea9e2dcad0db26b63c0973c33eb7fa634b4ade0a1f3c6ccfd5172ea95f648c1dd3b0ae2575b0aa44b3fec708c24a6aca54 -EBUILD sloccount-2.26-r3.ebuild 1267 BLAKE2B 5f1d76f99046efe81cf597fae62e50078078a68d25eea23e20a5eeba8b605976c8656c722a616772b7feaf919bd751ff44fc6b4f7953a1f3c2a2eb3aecb2645c SHA512 c6bedf3aaaafa0fcd5b3145fbf46034a60081ab9deb8f6168258574581a085afc22cafcb36a70ab24680286cbfc670a08099f0d677a1da0961707b7ff6a11782 +EBUILD sloccount-2.26-r3.ebuild 1135 BLAKE2B ce6a8d294d08b22d71341f98947b4a0b113706e63862e768e98ce37b09d9f707a7f91466887f216394e73526008faca5d58995acc1b9ec7dc439af17f59c825a SHA512 6819e72e932a0c85fd7e7efb55c804fca5dd327b12f2e1c0a51cd3b8e7385c8a6ecd2c24b47dedfe7cce9d3dd32d92fc4b3efda6a70a006b6ef2098a2f798773 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd diff --git a/app-text/sloccount/files/sloccount-2.26-gentoo.patch b/app-text/sloccount/files/sloccount-2.26-gentoo.patch index c3a031190a36..5e4010b81f32 100644 --- a/app-text/sloccount/files/sloccount-2.26-gentoo.patch +++ b/app-text/sloccount/files/sloccount-2.26-gentoo.patch @@ -1,5 +1,5 @@ ---- break_filelist.old 2013-10-14 17:23:01.523330534 +0800 -+++ break_filelist 2004-08-01 12:17:28.000000000 +0800 +--- a/break_filelist ++++ b/break_filelist @@ -177,7 +177,7 @@ "p" => "pascal", "pas" => "pascal", "pp" => "pascal", "dpr" => "pascal", "py" => "python", @@ -18,3 +18,65 @@ ($firstline =~ m~^#!\s*\@_?(SCRIPT_)?(PATH_)?(BA|K)?SH(ELL)?(\d+)?\@?(\s|\Z)~)) { # Note: wish(1) uses a funny trick; see wish(1) for more info. +--- a/makefile ++++ b/makefile +@@ -37,7 +37,7 @@ + # Set this to your C compiler, if it's not "gcc"; a likely alternative is "cc". + # The "-Wall" option turns on warnings in gcc. gcc users might also want + # to consider using "-Werror", which turns warnings into errors. +-CC=gcc -Wall ++CFLAGS+= -Wall + + # Set this to the name of your "install" program. On some systems, + # "install -C" would be useful (so unchanged files won't be modified), +@@ -124,34 +124,34 @@ + + MANPAGES=sloccount.1.gz + +-MYDOCS=sloccount.html README TODO ChangeLog ++MYDOCS=README TODO ChangeLog + + + all: $(COMPILED_EXECUTABLES) + + lexcount1$(EXE_SUFFIX): lexcount1.c +- $(CC) lexcount1.c -o lexcount1$(EXE_SUFFIX) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) lexcount1.c -o lexcount1$(EXE_SUFFIX) + + c_count$(EXE_SUFFIX): c_count.c +- $(CC) c_count.c -o c_count$(EXE_SUFFIX) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) c_count.c -o c_count$(EXE_SUFFIX) + + php_count$(EXE_SUFFIX): php_count.c +- $(CC) php_count.c -o php_count$(EXE_SUFFIX) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) php_count.c -o php_count$(EXE_SUFFIX) + + pascal_count.c: pascal_count.l driver.c driver.h + flex -Cfe -t pascal_count.l > pascal_count.c + + pascal_count$(EXE_SUFFIX): pascal_count.c +- $(CC) pascal_count.c -o pascal_count$(EXE_SUFFIX) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) pascal_count.c -o pascal_count$(EXE_SUFFIX) + + jsp_count.c: jsp_count.l driver.c driver.h + flex -Cfe -t jsp_count.l > jsp_count.c + + jsp_count$(EXE_SUFFIX): jsp_count.c +- $(CC) jsp_count.c -o jsp_count$(EXE_SUFFIX) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) jsp_count.c -o jsp_count$(EXE_SUFFIX) + + ml_count$(EXE_SUFFIX): ml_count.c +- $(CC) ml_count.c -o ml_count$(EXE_SUFFIX) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ml_count.c -o ml_count$(EXE_SUFFIX) + + sloccount.1.gz: sloccount.1 + gzip -c sloccount.1 > sloccount.1.gz +@@ -162,7 +162,7 @@ + + # This is USC's code counter, not built by default: + c_lines: C_LINES.C +- $(CC) C_LINES.C -o c_lines$(EXE_SUFFIX) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) C_LINES.C -o c_lines$(EXE_SUFFIX) + + install_prefix: + $(INSTALL_A_DIR) $(PREFIX) diff --git a/app-text/sloccount/sloccount-2.26-r3.ebuild b/app-text/sloccount/sloccount-2.26-r3.ebuild index 0c1bc3de2f75..6b6eb6730501 100644 --- a/app-text/sloccount/sloccount-2.26-r3.ebuild +++ b/app-text/sloccount/sloccount-2.26-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Tools for counting Source Lines of Code (SLOC) for a large number of languages" HOMEPAGE="http://www.dwheeler.com/sloccount/" @@ -12,39 +12,41 @@ SRC_URI="http://www.dwheeler.com/sloccount/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="" -RDEPEND="dev-lang/perl - >=sys-apps/sed-4 - app-shells/bash" + +RDEPEND="dev-lang/perl" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-libexec.patch + "${FILESDIR}"/${P}-coreutils-tail-n-fix.patch + # support for + # 1) .ebuild + # 2) #!/sbin/openrc-run + # 3) CFLAGS/CPPFLAGS/LDFLAGS + "${FILESDIR}"/${P}-gentoo.patch +) + src_prepare() { - epatch "${FILESDIR}"/${P}-libexec.patch - epatch "${FILESDIR}"/${P}-coreutils-tail-n-fix.patch - # support for .ebuild and #!/sbin/openrc-run: - epatch "${FILESDIR}"/${P}-gentoo.patch - - sed -i \ - -e 's|^CC=gcc|CFLAGS+=|g' \ - -e 's|$(CC)|& $(CFLAGS) $(LDFLAGS)|g' \ - -e '/^DOC_DIR/ { s/-$(RPM_VERSION)//g }' \ - -e '/^MYDOCS/ { s/[^ =]\+\.html//g }' \ - makefile || die "sed makefile failed" - - #fixed hard-codes libexec_dir in sloccount + default + + # fix hard-coded libexec_dir in sloccount sed -i "s|libexec_dir=|&\"${EPREFIX}\"|" sloccount || die } -src_compile() { - emake CC=$(tc-getCC) +src_configure() { + tc-export CC } src_test() { - PATH+=":${S}" - emake test + PATH="${PATH}:${S}" emake test } src_install() { - emake PREFIX="${ED}/usr" DOC_DIR="${ED}/usr/share/doc/${PF}/" install - dohtml *html + emake PREFIX="${ED}"/usr DOC_DIR="${ED}"/usr/share/doc/${PF}/ install + + HTML_DOCS=( *.html ) + einstalldocs + + # avoid QA warning + gunzip "${ED}"/usr/share/man/man1/sloccount.1.gz || die } diff --git a/app-text/texi2html/Manifest b/app-text/texi2html/Manifest index 7479adfc39d7..deff832f4937 100644 --- a/app-text/texi2html/Manifest +++ b/app-text/texi2html/Manifest @@ -1,3 +1,3 @@ DIST texi2html-5.0.tar.bz2 15397249 BLAKE2B 3e502d9424c2936a922488aab7a66140c0a8369253a5500beeebcea0942ffa7b97fb7021b23212264e110d4bdab4850f263269aacf61de23ac6e052dfcf10d67 SHA512 50afc2f1f8875d3e62a51cc0339bd4c4f058041f42a9fda9cd5b02960f0d5c72838e4f010702ba716dbd256946f64520ce1e5b86539b6f7b8b7ce24a43c98e9d -EBUILD texi2html-5.0-r1.ebuild 1331 BLAKE2B c8a945376b9170577369ab7a5779df032aa30f5fecd4e9a52937a0b18589309fc6f2a489e2172359fd94da40c0890c2c1553ad9bf491bc644170c7c52b95e4f4 SHA512 3fef0018328252c5156c1126affc72d2a0a3ee3d457b4837353e2c7584131705c27410547a0e7c52770b33b57b9c5557529313f5f22126c21e5ade832959d9e2 +EBUILD texi2html-5.0-r1.ebuild 1350 BLAKE2B e22201f81e83a95bd57ea071847011c9fbade332488b1f46fe77b9acb9de378f90e953f83249e4797745ffa1c371c7e2e7dcdfb026cee4725bfa549088b247c1 SHA512 85c7762bf4cedb41c4da6fe721e467b175ddf8b6b92f017d385adc81af8e8de7fb16fbd58d867abfa4667a1f1e48a657213bd0aecb4861f015dd384f28c5bbf9 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 diff --git a/app-text/texi2html/texi2html-5.0-r1.ebuild b/app-text/texi2html/texi2html-5.0-r1.ebuild index 81ea54fbe106..51e4bdab7d44 100644 --- a/app-text/texi2html/texi2html-5.0-r1.ebuild +++ b/app-text/texi2html/texi2html-5.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 inherit prefix @@ -13,32 +13,34 @@ LICENSE="GPL-2+ || ( GPL-2 CC-BY-SA-1.0 ) Texinfo-manual LGPL-2+ MIT" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="unicode" +RESTRICT="test" #411523 -RDEPEND=">=dev-lang/perl-5.10.1 - >=dev-perl/libintl-perl-1.200 +RDEPEND=" + dev-lang/perl + dev-perl/libintl-perl unicode? ( dev-perl/Text-Unidecode dev-perl/Unicode-EastAsianWidth - )" + )" DEPEND="${RDEPEND}" -DOCS="AUTHORS ChangeLog NEWS README TODO" - -RESTRICT="test" #411523 - src_prepare() { + default + # On FreeBSD this script is used instead of GNU install but it comes without # executable pemissions... Fix it! chmod +x install-sh || die if use prefix; then - hprefixify $(find . -name '*.pl' | xargs) + local f + while IFS="" read -d $'\0' -r f ; do + hprefixify "${f}" + done < <(find . -name '*.pl' -print0) fi } src_configure() { - local myconf - use unicode && myconf='--with-external-Unicode-EastAsianWidth' + use unicode && local myconf='--with-external-Unicode-EastAsianWidth' econf \ --with-external-libintl-perl \ @@ -48,9 +50,9 @@ src_configure() { src_install() { default - rm -f "${ED}"/usr/share/${PN}/images/{COPYING*,GPL,README} + rm "${ED}"/usr/share/${PN}/images/{COPYING*,GPL,README} || die } pkg_preinst() { - rm -f "${EROOT}"/usr/bin/${PN} + rm -f "${EROOT}"/usr/bin/${PN} || die } diff --git a/app-text/uudeview/Manifest b/app-text/uudeview/Manifest index 9f296c25f355..6988e2fc3f51 100644 --- a/app-text/uudeview/Manifest +++ b/app-text/uudeview/Manifest @@ -1,9 +1,9 @@ AUX uudeview-0.5.20-CVE-2004-2265.patch 1788 BLAKE2B 6ee4cc768f3bab3cb4116c465d10324668e3d885a73359ff1919263843396475524f146fd747fe5748b1bf5bb52c45993c89ba8c4f8718213eb6f63d0c8efab0 SHA512 63ca3c7d98924df1a2a2c08188291cfc24870c8464bc2bb98d47315f2e28ef876cf732598b6410b2875d9875c2463fda51da959b9e1340c32baa2ec64875f46c AUX uudeview-0.5.20-CVE-2008-2266.patch 4595 BLAKE2B dd2ba71e43941812472729575f1481be9d93641f1868952385f7d5f69d6c63991b6856becc967d92c1ced93f0b5a68349af43b011de4ab92adacb93232b226c4 SHA512 fe6ffaf4d55f8a367cf8661ee4599f1224b2bdbf1d3659558c024e7c0d9a6ad043d7eb9631f28e4762b39a5b5e2a417b66be9e98efc7e5caeb9a286e239e486e AUX uudeview-0.5.20-bugfixes.patch 3575 BLAKE2B 8778f0f08fa8d8c5faabf2721c195505a53369f30d93c494080025e491121a75135f321fe5c0c117e5bfd538a7cb2d82fc64cb5584822dc9f353cd31b168bdf0 SHA512 c5e4126e9457cb94d6f014ba20e2497969a50b84d917bd31529a2a75ae5b1e9990ec946e8f8de7a83ced71e32aea7d62210416d94b765dc860902825ca6b34a3 -AUX uudeview-0.5.20-makefile.patch 895 BLAKE2B b9f2d027b71667ea78bcc9de05b3f20dfe5d04cb037f06633d7846b2f5ecfb5154736d2ff7faab01104039e9ce4b0e8b5f7c89a42f75db670d7ce2b719ed5336 SHA512 65f223af7f06a854746328354bee5f2703b0603b085a5a52a2a49f09528cffe4a4756a5bd63e86fadf266c2cf1d30691dc75661bca79cc7d122329cdf9bb71f0 +AUX uudeview-0.5.20-makefile.patch 822 BLAKE2B b7729d04f9b881924205efce8dbb398b12e04ed95aa585f2e19fc79340e36772d8c8eb2c9fa23d2d69fedd44c743d85234578edd406b910f6f6ec70457f220a2 SHA512 69efb3af67aa9a47a4d4155b1c346bda5bcfcec26000e82b170d854dbc29e72ce6a8b21f171a72761f8ea2cc2c6fb65e74700a6134c9cbe107b596b45762a34c AUX uudeview-0.5.20-man.patch 3246 BLAKE2B 390d89a13080798b1ef0f902d92c82df59c10c6bb5b34eb8655ceadade0e31b0e81c100fc3e8908edf6c482c51c2560b90aaff8156b7ca805908036aa8342b77 SHA512 a940d6663563e7a91b35f5350e05b6cb7939f06d7db8767a8a5483dc82477c796a351cc03be9de49bd55513ca0b2e3203cd82c4b834caa54da9c8aae5750136b AUX uudeview-0.5.20-rename.patch 1736 BLAKE2B 820e32f9d2fd248ee2748e3f6173994b02074720814ec8adc6a896b72defc29ce24a356626c7bab414c516555547fe04cbaf304a52c9f141b80a836593c8638f SHA512 afb5b72bca70eb7c156584df1b44fa3cbb6cf07da97a79ff6330acb52ff102584b7a382ce779f2f695c9384d017984cabc670d31b243c0e5d916df19c6846439 DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c -EBUILD uudeview-0.5.20-r2.ebuild 865 BLAKE2B b6103031b60e088939a1eb5b88b2af38f92f5e622113f620d559a5064ed9442a63b26704d118728ed9f93d6c04e0915007d8044773a85a91414b98b82626a7b8 SHA512 c97c87e1881cf173b552aa4667b2e438ba7abbd216544b749a68fa4db310c784d3d2756a472c6f8f390ad21553c7ea00069acfbb78e13693200edca9a2802821 +EBUILD uudeview-0.5.20-r2.ebuild 788 BLAKE2B 3b67e40bd88085a6182524f9f89a087c9ac5b3e8d9a8dd9425d994e2b6aaddf92a3ec6ae85f5549b1f2ec7966130a4e747a21d94f1f1df36c285efc58020bc6d SHA512 381dbd18cb9e1f8159f148423fa44d0e22ec4c1494fff3adef85162db362799ca1b9ec0c68d310f2b568aad6cfd536a6f954efccb32414642729e4b8cc7d87c9 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/app-text/uudeview/files/uudeview-0.5.20-makefile.patch b/app-text/uudeview/files/uudeview-0.5.20-makefile.patch index ed3cdf66374a..a2366851f467 100644 --- a/app-text/uudeview/files/uudeview-0.5.20-makefile.patch +++ b/app-text/uudeview/files/uudeview-0.5.20-makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2015-11-18 13:52:44.173432349 +0300 -+++ Makefile.in 2015-11-18 13:53:39.244429093 +0300 +--- a/Makefile.in ++++ b/Makefile.in @@ -183,22 +183,22 @@ install: $(DOINST) diff --git a/app-text/uudeview/uudeview-0.5.20-r2.ebuild b/app-text/uudeview/uudeview-0.5.20-r2.ebuild index 6331df769ce0..d8c47f134083 100644 --- a/app-text/uudeview/uudeview-0.5.20-r2.ebuild +++ b/app-text/uudeview/uudeview-0.5.20-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit eutils autotools +inherit autotools DESCRIPTION="uu, xx, base64, binhex decoder" HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/" @@ -12,28 +12,21 @@ SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" - -RDEPEND="" -DEPEND="" - -DOCS=( HISTORY INSTALL README ) PATCHES=( - "${FILESDIR}/${P}-bugfixes.patch" - "${FILESDIR}/${P}-CVE-2004-2265.patch" - "${FILESDIR}/${P}-CVE-2008-2266.patch" - "${FILESDIR}/${P}-man.patch" - "${FILESDIR}/${P}-rename.patch" - "${FILESDIR}/${P}-makefile.patch" + "${FILESDIR}"/${P}-bugfixes.patch + "${FILESDIR}"/${P}-CVE-2004-2265.patch + "${FILESDIR}"/${P}-CVE-2008-2266.patch + "${FILESDIR}"/${P}-man.patch + "${FILESDIR}"/${P}-rename.patch + "${FILESDIR}"/${P}-makefile.patch ) -src_prepare() { - epatch "${PATCHES[@]}" - - mv configure.in configure.ac || die +DOCS=( HISTORY INSTALL README ) - epatch_user +src_prepare() { + default + mv configure.{in,ac} || die eautoreconf } diff --git a/app-text/xml2/Manifest b/app-text/xml2/Manifest index 97b615070e51..390fa2b31954 100644 --- a/app-text/xml2/Manifest +++ b/app-text/xml2/Manifest @@ -1,3 +1,3 @@ DIST xml2-0.5.tar.gz 86318 BLAKE2B acafc3f28baf21308ecb5ca7bfef3526e0850355d1f4ce29a26ba2a580d5a2a7c6a1bb072f6e4c77df3a4de6fd7fb83bb1d7fd959926b8f34618063eee48c31f SHA512 76b6523e1b64af32529fd8cec52f61f3ca45e452c1398772367f8389368bb7712698e4ba6cb6c8e50e92f68f7f9517f90668c73016e11797931ddb6858782aba -EBUILD xml2-0.5.ebuild 445 BLAKE2B b76147c754053956e8e772145a71a41b4b1d98a69820876d671c2291ead6fe74c943dee193d1893d4e9ff8c6e11fa7c3ecef6ebed05bb4347a567cf01108959d SHA512 6f994f874089f6190c1f3528d2f64a54022619ee06b80102c6cc17ddd3df383f7f736d6b8879ce53e8a9a6451dd25acf09b7b287dc059e6c11e48ce1eca98a3b +EBUILD xml2-0.5.ebuild 443 BLAKE2B 8adc7a25b0ed8efb74da357f4dd325e2614eaaa097434c717059b7a6aa0156c79a686c46970f1f0cfb7f4373c536bb999b831a7cc05f8df78fedd3c7df7af3c3 SHA512 7b39bba0c4d911e33139f8bd84081bbde7ef50a1bae34c25a44303bb01b51c06352044f3134a97e2519d79a04500dea5711874d69d69039abeb976cb6a6d08a8 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/app-text/xml2/xml2-0.5.ebuild b/app-text/xml2/xml2-0.5.ebuild index 45dbd05bc02b..7afcc12352ec 100644 --- a/app-text/xml2/xml2-0.5.ebuild +++ b/app-text/xml2/xml2-0.5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 DESCRIPTION="These tools are used to convert XML and HTML to and from a line-oriented format" HOMEPAGE="http://dan.egnor.name/xml2" @@ -10,8 +10,7 @@ SRC_URI="http://download.ofb.net/gale/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos" -IUSE="" RDEPEND="dev-libs/libxml2" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" diff --git a/app-text/xml2doc/Manifest b/app-text/xml2doc/Manifest index 21b91ae07d53..dad5e21718dc 100644 --- a/app-text/xml2doc/Manifest +++ b/app-text/xml2doc/Manifest @@ -1,4 +1,6 @@ +AUX xml2doc-20030510-gcc10-no-common.patch 195 BLAKE2B 3c90b98f57ae23f78b586dadf8a53b1a092597bef4e1bfee41fef5ce47cf6c639e03a59a8985434c931b0e7a803262d8f03874b2b4c676980efe62b913f214d6 SHA512 4fc3640be15c6c5192bb2a2a74ced1ebc22fd33bd2c49a39df295239e8b4b4047d6c840e23df091c060dcb6895a0dc1552127de0029d2d403214352e8f7f218f +AUX xml2doc-20030510-makefile.patch 2661 BLAKE2B d9822ba57187553ae6da3f2b3f146bd3ae4316a99cb9608d88112a18462345c4614e167bb3757a723b6a12e2b521f1a2fb575ef19db480ed45fa60e133297c38 SHA512 c5aee7f9b98f1c64345459cb3ad6132082c04020a56f39fa950584689953c1058564332351a5b51e130e077fbe15c08ea88f35504888a153bfc878d8210b8b00 AUX xml2doc-pointer_fix.patch 627 BLAKE2B 3ca9313b44d88fce3f548874d40ed57b42b9faa66e30574677c911f7d5c9d0a8d5eea8c35781162302543df82c5b38b1327fcaabee0a50c396c95937c3a86e44 SHA512 ebdf69986821fdb1a22e3da4447729433d7f30d08e516b5b28c1f9e4fe6ec98d7a31e925028f940e8a0aaab5c05bd52a1a4d12564fd47a79953b1de606fd2430 DIST xml2doc-20030510.tgz 53307 BLAKE2B 3f7e44ede6ac0a2ec4762e66181de34ffe553035b54ee302345d1b38a5063106fc4ba65abec042b4ec693b173d70fc4b548ebc942b2a8f6636f84e7beeed2bd6 SHA512 9eb2970b7adef1669b9b0aede2b3d2b42ba234c8294f0f8e6e230d8fcc6cf878675b2f0bff87ee36a255ab29376be844d92d382be7aad0ab11972847cfe49dbd -EBUILD xml2doc-20030510-r1.ebuild 1189 BLAKE2B 85aad44ccaee3ae47e8e7e6ffc2e0e352a8b6fe5e3d141bd01bd2be35e55ea84664e4fe86e451218658ad5323f42d41ecae02883292456b947a569ab6c6f2cf6 SHA512 b5faa7a55c0884b083bdfc47ce539a81d4df515b232bc4563ff8a4dd809c886dc9b18c472cca3ae406f872467d59606094df2c59aed5b28d2e3b454fd38b7cc3 +EBUILD xml2doc-20030510-r1.ebuild 1010 BLAKE2B c66afdbad87d601f358b7fe438c4f483833c4b84f38dfb12ffd904ca9d3594c3eaa9228b19af46432b0583c879cc8248f83ed74d6a9c161c6f0a0e0ebd7e2c18 SHA512 1b15699e2cdf8ed954631369a4f83683ff0d0c86a23a539494877704867c90708bfaebed4b0a0966c8c61a2aa92e4078727e9df3ffff28d990264f193050b649 MISC metadata.xml 244 BLAKE2B 6c0f152456a096c4bfbf861d8d7db04d0b8c605deb5f9a3277cd6b60df4a714c77bb12d5e4a491a193da11883447855986468ecf5c707600febbed973253181d SHA512 b4abe1dd13476a480e518e284cb832c2b41893049169975ee44edba8661af79b7cd8f8110e03b920fe90cd8e0e1d926bd5a692a24ecb841bd454659de3422ee9 diff --git a/app-text/xml2doc/xml2doc-20030510-r1.ebuild b/app-text/xml2doc/xml2doc-20030510-r1.ebuild index 481bd3d247ee..e4a387e503a4 100644 --- a/app-text/xml2doc/xml2doc-20030510-r1.ebuild +++ b/app-text/xml2doc/xml2doc-20030510-r1.ebuild @@ -1,59 +1,50 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Tool to convert simple XML to a variety of formats (pdf, html, txt, manpage)" - HOMEPAGE="http://xml2doc.sourceforge.net" SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="GPL-2" -IUSE="" SLOT="0" - KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86" -DEPEND=">=dev-libs/libxml2-2.5" +DEPEND="dev-libs/libxml2:2" RDEPEND="${DEPEND}" -S=${WORKDIR}/${PN} - -src_prepare() { - # Fix pointer-related bug detected by a QA notice. - epatch "${FILESDIR}/${PN}-pointer_fix.patch" +S="${WORKDIR}/${PN}" +PATCHES=( + # Fix pointer-related bug detected by a QA notice + "${FILESDIR}"/${PN}-pointer_fix.patch # Don't strip symbols from binary (bug #152266) - sed -i -e '/^\s*strip/d' \ - -e 's/^\t$(CC) $(LFLAGS).*/\t$(LINK.o) $(L_PDF) $^ -lxml2 -o $(BIN)/' \ - -e '/^\t$(CC) $(CFLAGS) /d' \ - src/Makefile.in -} + "${FILESDIR}"/${P}-makefile.patch + # fix GCC 10 -fno-common change + "${FILESDIR}"/${P}-gcc10-no-common.patch +) src_configure() { + tc-export CC econf --disable-pdf } src_compile() { - emake CC="$(tc-getCC)" + default - cd "${S}/doc" + cd doc || die "${S}"/src/xml2doc -oM manpage.xml xml2doc.1 || die } src_install() { - # xml2doc's make install is unfortunately broken - - # binary dobin src/xml2doc - # documentation - dodoc BUGS README TODO + einstalldocs docinto examples dodoc examples/*.{xml,png} - # manpage doman doc/xml2doc.1 } diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest index bd403653d478..1de420434259 100644 --- a/app-text/xmlstarlet/Manifest +++ b/app-text/xmlstarlet/Manifest @@ -1,3 +1,3 @@ DIST xmlstarlet-1.6.1.tar.gz 420923 BLAKE2B 56bf29f62549a7445e3cf15b6a3f60558dbcacf96645c3acc5a45b432d61f47614274a5d3e7234399f7dbdb854b503d73a6cfb8989710b7363d743dce4dff8f0 SHA512 4228df812caec7059d7a76986c4d9a4262bd861cc53dca05f341ae6c062be05f1c39fc637918ab00f60f40587c6c556e3c9bfaf8a18b149e3c321a92214dbe8b -EBUILD xmlstarlet-1.6.1.ebuild 933 BLAKE2B bd579b52641fb927084d915a1272b1f57f198a16f5f810f780c6e36e3667e1a62f2c1ba2fe7cd62740425457b22382b3a05edd4997616489e6dcea2f7f813c17 SHA512 9907ecd56ddc3e689799ffd69078957c240bb39ad502317733d9d021605d0b26e22f67ae511b1a3ce194d58fa5ef6aa95df7536046168c18eb73d976aaeb3bf9 +EBUILD xmlstarlet-1.6.1.ebuild 944 BLAKE2B 43de29f725e2cff8b62be3b68aaa43e8473bf5e3f50e2017c823b5fea45e44b41ef8a1fbce8e8bb5c48cf0927bb24d6903f2d4ac566f71c1349fbed3603abcbd SHA512 68e906d0da8fbd93ce2423e5794545ba2a18929ab991e90588384d465719ba2ff29605c271e55d93b47a31834741d4d1a5c501bd62df9f037e42bb4a77de3a49 MISC metadata.xml 293 BLAKE2B 1e39cff7005653b64f2f27c49262c0ae492da15d33d361e5e9b4148a3e975db2b30e26468fe5cf7f61155f53a3f76a16121b8a4c85ae5420d0ec74885d33bba9 SHA512 9fd9f809f74a272cc9abb789f3e08ab9b2ecdd1f6ca3931f43567b3b2e3423c0622bd3cc52f5dceac6989282351400fe9c1554ec2b69439986902b11f589796d diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild index 96f6d174f1ce..48e432677af1 100644 --- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild +++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 + +inherit flag-o-matic toolchain-funcs DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents" HOMEPAGE="http://xmlstar.sourceforge.net/" @@ -10,30 +12,28 @@ SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" -RDEPEND=">=dev-libs/libxml2-2.6.27 - >=dev-libs/libxslt-1.1.9 - dev-libs/libgcrypt:0 +RDEPEND=" + dev-libs/libxml2 + dev-libs/libxslt + dev-libs/libgcrypt:0= virtual/libiconv" - -DEPEND="${RDEPEND} - sys-apps/sed" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_configure() { + append-cppflags $($(tc-getPKG_CONFIG) --cflags libxml-2.0) + # NOTE: Fully built documentation is already shipped with the tarball: # - doc/xmlstarlet-ug.{pdf,ps,html} # - doc/xmlstarlet.txt # - doc/xmlstarlet.1 econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ --disable-build-docs \ - --disable-static-libs \ - --disable-silent-rules + --disable-static-libs } src_install() { default - dosym xml /usr/bin/xmlstarlet } |