diff options
Diffstat (limited to 'app-text')
29 files changed, 357 insertions, 159 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz Binary files differindex 4b497a48a867..47d6a2b25ca0 100644 --- a/app-text/Manifest.gz +++ b/app-text/Manifest.gz diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest index 70b19c4bca46..92678553ab6d 100644 --- a/app-text/a2ps/Manifest +++ b/app-text/a2ps/Manifest @@ -19,5 +19,5 @@ AUX a2ps-4.14-texinfo-6.7-encoding.patch 1372 BLAKE2B 3eb51e4c83e60f7073c4957963 DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f EBUILD a2ps-4.14-r7.ebuild 3595 BLAKE2B ceafe4d3667ce8c7c51cd06516453bfc3847c0aaa57e30ae4544dad5d366bbf87a4ebf4eddf901119e2c68c19b0f93c1261a930a97b860d51dde04f13718afb4 SHA512 63d1f39badc98876d18495ff639f0e72a622b3708928669a15ee1e519f531e2ded974bb433bc0f10b033d2b5f2971a5451f59736b1c3ec44aa18e051f4d08e97 -EBUILD a2ps-4.14-r8.ebuild 3083 BLAKE2B 9bdcf9f436d739685aba1c494df1830def76bb73504a7878a84156dbd8f87e7129acf7b30eaaaa0d83df1e4073ad98f28a749a733fb655517df4e55bc4ad0365 SHA512 1ee57b11f6c35321180b2bdb2784f46e9a0d8d7663b03a5b5cdd0a58f2cd69ae8afaf69fb915817cf1b13f20336fc7148454011c168f506cbd6d2be0533834ae +EBUILD a2ps-4.14-r8.ebuild 3082 BLAKE2B f8108f80eb6a8a9042606c14817dc9ea3b72bab5854a0af9b38d8196c5c80a0461c1bef0bab71891ab30d1cf63153854b8b45f95ff370e5a94730c9efd9e8ed5 SHA512 b651e952140749643ad46c71f752fa9bb2935f464b2ca7e70a01125f32939deb5b61f084bb746d773285975936355ccb6f19926d0f60b305ca23ee9205bfa451 MISC metadata.xml 442 BLAKE2B 89796eb65cfc9ab8929511f94655a9c7f6a39837f5c1cfb0f8885a29d3900512e6c3ee6b44f3ee8e23eca54112f72c7462d4fb223109fdea3d203d5ff4492252 SHA512 078d824c815b9cc0c5a0acfea6f8c5203eb3f1e94778987137181f987cbeaab0040389b0e34cda160d6a3c6f00508c39a6c30404b89dfe64782db1980c9340b7 diff --git a/app-text/a2ps/a2ps-4.14-r8.ebuild b/app-text/a2ps/a2ps-4.14-r8.ebuild index ede532a155af..12c541774ed3 100644 --- a/app-text/a2ps/a2ps-4.14-r8.ebuild +++ b/app-text/a2ps/a2ps-4.14-r8.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${PV:0:4}" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="cjk emacs latex nls static-libs vanilla" RESTRICT="test" diff --git a/app-text/bact/Manifest b/app-text/bact/Manifest index ad527d2baf7e..98f178990c3b 100644 --- a/app-text/bact/Manifest +++ b/app-text/bact/Manifest @@ -1,4 +1,5 @@ -AUX bact-0.13-cpp14.patch 1686 BLAKE2B 7e5778ea93bab4841658c3004ecae139fb10324b3ac612c61522eeae748bb2e2c6488670d9a718c6c1bd09d99d83afa306225ad9a403fdd88182fb1bdab3bf68 SHA512 c61d19a2aab85f8597ea40548ef4e2984aa20b44a7ef1c7d5b45d10ef38956cd614844ed5bee0e770a7cfe7f9c8778e491e0ead2585653a57676b4b33dad9204 +AUX bact-0.13-cpp14.patch 2947 BLAKE2B 1fc614aac3fbdacd8320f8b3629ef751d99c89b523b9ef8e43f7b535c18609ce66aa43aeb6560401f5eb2f18ff77fffba099b63025cccc8b7cfdebe26f1531d1 SHA512 21c1d68b1aea93ad98feb5c965931521100c8997c7cc64ab771cc3b6b6c3ce385aee750415b34e08f627e778bcfd11c25c0ef2fc7933306d073ecfa46b01cada +AUX bact-0.13-makefile.patch 1144 BLAKE2B 476096704ed088318d46a53b3e908722257241d82441542f9a33c22a383cbe90e99dd48ea5c12e0c987e8663ea6ae7b8cee51d9f406b9e62c70d2bfb7140f8b9 SHA512 afb59e8d06119adfed150895fc88810e240420f34826e6010f6ba9400f6a1839da8140a40f78861977600a88ac75ffb51c98369671de63c286cdbfccfb73b9ac DIST bact-0.13.tar.gz 230681 BLAKE2B a12ebfb52db0baa83d95a6d32b18324ea1c1b795fe92e6fd0409e54ed9f82e8a9e4497ffa1e97e9844edbcefb78ae1ad8d7a77c8c7e69688f18991e4f74391db SHA512 ba531c41d93e60699d9a06bd1d1df71f6fb1559c1cccd86756a88bcf72279065d3c565cbb1664444cb74fa25a3472d77682419fe9efa8881d73b23f0bcddb9f8 -EBUILD bact-0.13-r1.ebuild 674 BLAKE2B bd1c74b187a60055ecec93ee624e6dac4170225420c8f651d56b00d25db34eb74e5390f7d766277a166d458cc0590fcb4690e3f2e0d1e5661cc09c0ac3d69a68 SHA512 b1601d1110fdd875cc2236c3ca2b19dc74e60d2da66307c84f8537115fb33d608a1b01a28dd124a5a14cd2805902dc99d11b11463bea09ec5c1a5bbce0cd0085 +EBUILD bact-0.13-r2.ebuild 588 BLAKE2B de46dc828870e1d145f7be68895b5b31acc6d7a352142e6688b0c92b910f042c031f346516585931b6b0269d616cf969e9ded52c850e3f6f1f2ccb30deff564a SHA512 8e2284d7281d72e088265108f18ce50bd40abc836eb5d37a3607755cbfcfe9dcf9a9b56431348c892b12c76bef7dadb87953d81fd9d93fb68d7c253ca0abfd86 MISC metadata.xml 491 BLAKE2B d4c7c3592ae1c78ed34fb23e03606e1e9bd063c24cb9218ed28e0ecc74f32ee7709f53e6379f1bbb34f65786a47a7a0fc1fb5f14cc36630f44dade91d77e7bf0 SHA512 f61141e1b33d73ad3fad346950bd7ee971b340e50d4edb34d3cc83c3f321aba7dcd994829056e02dac97bf106de220db879b4c14b6cf610ce103dd4eca356497 diff --git a/app-text/bact/bact-0.13-r1.ebuild b/app-text/bact/bact-0.13-r2.ebuild index aaf872d9bd2b..8c6381a627b2 100644 --- a/app-text/bact/bact-0.13-r1.ebuild +++ b/app-text/bact/bact-0.13-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -12,23 +12,19 @@ SRC_URI="http://chasen.org/~taku/software/bact/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="" -DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-cpp14.patch +) -HTML_DOCS=( index.html bact.css ) -PATCHES=( "${FILESDIR}/${P}-cpp14.patch" ) - -src_compile() { - emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" -} - -src_test() { - emake test +src_configure() { + tc-export CXX } src_install() { dobin bact_learn bact_mkmodel bact_classify + + HTML_DOCS=( index.html bact.css ) einstalldocs } diff --git a/app-text/bact/files/bact-0.13-cpp14.patch b/app-text/bact/files/bact-0.13-cpp14.patch index fa083c223b12..a0f6edda1eed 100644 --- a/app-text/bact/files/bact-0.13-cpp14.patch +++ b/app-text/bact/files/bact-0.13-cpp14.patch @@ -1,6 +1,7 @@ Fix C++14 compilation errors -- since C++11 make_pair<T1,T2> is resolved to make_pair(T1&&, T2&&). Types should be deduced. -Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=594312 + +Bug: https://bugs.gentoo.org/594312 --- a/bact_classify.cpp +++ b/bact_classify.cpp @@ -42,3 +43,48 @@ Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=594312 ary.push_back ((Darts::DoubleArray::key_type *)it->first.c_str()); alpha.push_back (a); } +--- a/darts.h ++++ b/darts.h +@@ -394,10 +394,10 @@ + { + if (! len) len = LengthFunc() (key); + +- register ArrayType b = array[pos].base; +- register ArrayUType p; ++ ArrayType b = array[pos].base; ++ ArrayUType p; + +- for (register size_t i = 0; i < len; ++i) { ++ for (size_t i = 0; i < len; ++i) { + p = b + (NodeUType)(key[i]) + 1; + if ((ArrayUType)b == array[p].check) b = array[p].base; + else return -2; +@@ -414,8 +414,8 @@ + { + if (! len) len = LengthFunc() (key); + +- register ArrayType b = array[pos].base; +- register ArrayUType p; ++ ArrayType b = array[pos].base; ++ ArrayUType p; + + for (; pos2 < len; ++pos2) { + p = b + (NodeUType)(key[pos2]) + 1; +@@ -437,12 +437,12 @@ + { + if (! len) len = LengthFunc() (key); + +- register ArrayType b = array[pos].base; +- register size_t num = 0; +- register ArrayType n; +- register ArrayUType p; ++ ArrayType b = array[pos].base; ++ size_t num = 0; ++ ArrayType n; ++ ArrayUType p; + +- for (register size_t i = 0; i < len; ++i) { ++ for (size_t i = 0; i < len; ++i) { + p = b; // + 0; + n = array[p].base; + if ((ArrayUType) b == array[p].check && n < 0) result[num++] = -n-1; diff --git a/app-text/bact/files/bact-0.13-makefile.patch b/app-text/bact/files/bact-0.13-makefile.patch new file mode 100644 index 000000000000..d27879559d1d --- /dev/null +++ b/app-text/bact/files/bact-0.13-makefile.patch @@ -0,0 +1,38 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,8 +1,6 @@ +-CXX = c++ + VERSION = 0.13 +-CXXFLAGS = -O3 -Wall -Wno-deprecated ++CXXFLAGS += -Wall -Wno-deprecated + EXECPREFIX = +-LDFLAGS = + TARGETS1 = bact_learn${EXEC_PREFIX} + TARGETS2 = bact_classify${EXEC_PREFIX} + TARGETS3 = bact_mkmodel${EXEC_PREFIX} +@@ -10,14 +8,11 @@ + + all: bact_learn bact_mkmodel bact_classify + +-bact_learn: bact_learn.o ${OBJ} +- ${CXX} ${CFLAGS} ${LDFLAGS} -o ${TARGETS1} ${OBJ} bact_learn.o ${LDFLAGS} ++bact_learn: ${OBJ} + +-bact_classify: bact_classify.o ${OBJ} +- ${CXX} ${CFLAGS} ${LDFLAGS} -o ${TARGETS2} ${OBJ} bact_classify.o ${LDFLAGS} ++bact_classify: ${OBJ} + +-bact_mkmodel: bact_mkmodel.o ${OBJ} +- ${CXX} ${CFLAGS} ${LDFLAGS} -o ${TARGETS3} ${OBJ} bact_mkmodel.o ${LDFLAGS} ++bact_mkmodel: ${OBJ} + + clean: + rm -f *.o ${TARGETS1} ${TARGETS2} ${TARGETS3} core *~ *.tar.gz *.exe core* med.model* jp.model* +@@ -33,7 +28,6 @@ + scp bact-${VERSION}.tar.gz index.html bact.css chasen.org:public_html/software/bact/ + + check: +-test: + ./bact_learn -T1000 med.train med.model + ./bact_mkmodel -i med.model -o med.model.bin -O med.model.O + ./bact_classify med.test med.model.bin diff --git a/app-text/bdf2psf/Manifest b/app-text/bdf2psf/Manifest index f7863f2e83d3..9c91877de746 100644 --- a/app-text/bdf2psf/Manifest +++ b/app-text/bdf2psf/Manifest @@ -1,3 +1,3 @@ DIST console-setup_1.155.tar.xz 1641952 BLAKE2B fbe1e58915c2aac1148a1de31eca5bc9b7fc078c9840b5d51d8b1211e178315360e294d81040c464e2404774594606b3fecab6f7924b1fd4bec4c24b219e9197 SHA512 e00b0b48d91c9587c0659714f74de259bf3efd1caa553c4a06d9bc545335463808db2da16797ffca1dc59cae4f524619d3cf9a68db2ff5ad7b47cdd8aced37ac -EBUILD bdf2psf-1.155.ebuild 685 BLAKE2B d841255d52e658998bfd699929d9fc40b3a2956f0498292ccbe04d60908749fd208d8e2075c733694ae3756ca21e663e0c1c55e06400e116a8b92824f383d7cd SHA512 de7a1cdd6208e62369d4d574b4260d284c7dba2ea86834f6139fef6161f5a7d3f2ac967e8fee0a9b320ce4e998806e6f70146052319e534c2c2adf6d73e7a6b9 +EBUILD bdf2psf-1.155-r1.ebuild 667 BLAKE2B eec3d3675ed26a427c17aac2cda58f2ebf374ca490bb1845deb6354a2e42643a2607d6f114fd9553733790457a4c3571d3a5e2ec2ba78f7ed5c10b8e617e7769 SHA512 f3fe9298ace6a903972a079d9039a7989e3cfd9d1dc9933e9b4efea3195dd39b0a7badc6a214c32250d273812ecc34e743e7f98307bd68d82643a877c967595c MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/app-text/bdf2psf/bdf2psf-1.155.ebuild b/app-text/bdf2psf/bdf2psf-1.155-r1.ebuild index ecd93be01bea..9d0afcf96b91 100644 --- a/app-text/bdf2psf/bdf2psf-1.155.ebuild +++ b/app-text/bdf2psf/bdf2psf-1.155-r1.ebuild @@ -1,22 +1,19 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Converter to generate console fonts from BDF source fonts" HOMEPAGE="http://packages.debian.org/sid/bdf2psf" SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.xz" +S="${WORKDIR}/console-setup-${PV}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="" -DEPEND="" RDEPEND="dev-lang/perl" -S="${WORKDIR}/console-setup-${PV}" - src_compile() { : } @@ -24,7 +21,7 @@ src_compile() { src_install() { dobin Fonts/bdf2psf - insinto usr/share/bdf2psf + insinto /usr/share/bdf2psf doins -r Fonts/*.equivalents Fonts/*.set Fonts/fontsets doman man/bdf2psf.1 diff --git a/app-text/crf++/Manifest b/app-text/crf++/Manifest index aa19d972b17f..e224c7da0e13 100644 --- a/app-text/crf++/Manifest +++ b/app-text/crf++/Manifest @@ -1,4 +1,4 @@ -AUX crf++-automake-1.13.patch 216 BLAKE2B 129027abc820acf499b9fd49ea152f0d404c458af0584c0f7acc3dde6a02c46f1f14f96321b0ea7e2d00e9345276e8bdefb2206cc475772e5c23890143c78d0d SHA512 5bd02a0d3f67e37d544255984341beda8c958e5f76ce51521fd2157eb7dc70dfb1d43d30913e4d02e7dfe21526f04520f6539e28a58beed6e577a31b5d4a16ca +AUX crf++-0.58-autotools.patch 470 BLAKE2B e5d749ffdc84b45afaa5f1acb2fe2a71ca3ac4be0a93fa8ed16ac45267c77d15324e52a001b6a6bc14bde4bece6354e15a91dbb41b8d8c09f03ad4ea9afa3425 SHA512 188a95ba63a7c979a3fbd1a3f800764857f9b16c0ce2651ece7f575029992a9eb1a94bc14827bb7f766b7e61d5b0703edf4d204cb215ac1f002b977154e81da0 DIST CRF++-0.58.tar.gz 790570 BLAKE2B 8fdd3fea3e30f4196560e2e265519c961739aabbad75e9805040a8f7da0f501620d6bb2c4f589c6d0c8bb79af5c8f46bbe27b610a4ec6a0db632fef219ea5b46 SHA512 676b3e9ed89b5fb2f246175b58c384f10cab09fff8329c07311fed3832f55dbad26a25d2946c9efaa75cd8026517cb9e1742bb70ca26187367747852073e4eb9 -EBUILD crf++-0.58.ebuild 1097 BLAKE2B afc590d65d22590d2bc02bb523953097f681875f8034adccbdb1ac5e79b12f7cea8865eccbf6340b7b1e9fe799d64e7ec8aee47b1106542bef574c782c6122f6 SHA512 a5f6db965938aee9d8ddf2079e1d996dbea715f87beeaff24fee2be0a47fad105eb8766958c84d8608d21b9eb6b1fc517a6a9400f5af9e57b2af983dcb0ef36f +EBUILD crf++-0.58-r1.ebuild 828 BLAKE2B e12e631d0968f5ab1c9c1ff3a19c444c467bd7e6167372307802d4de8a210082a2814ef8652f0df17f23d224cfa2128c047f71ea82b36acaf92568bfacf08f80 SHA512 5bcd8b24b5b481baf04e269344a6fff23a9ce6b8ef8ce2ebd32bf6566c749a5b65b44f91a5cbea72c6490f2f66e427ebb287ba15cc82e4dfe80cfdf4c8319205 MISC metadata.xml 670 BLAKE2B c37096e57c935e0d90c1434e509857577275165424fecbc8fe3a836c1330ff4fa4dffa174dd8004e3c923fd890dbbd370f8269b2ebe0b1538fec41ca25edeeed SHA512 e42bf715ac69cc4d61ee289a8ab14bc3e15bad7d4002b826fc9d5ca8bbf79998e4f79d76d0b698c30602d6dbd4dd64553085bbb354a30c466a3b1ab6ce62ca9c diff --git a/app-text/crf++/crf++-0.58.ebuild b/app-text/crf++/crf++-0.58-r1.ebuild index f14ffbc4defd..c10b4b472085 100644 --- a/app-text/crf++/crf++-0.58.ebuild +++ b/app-text/crf++/crf++-0.58-r1.ebuild @@ -1,59 +1,44 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 inherit autotools -MY_P="${P^^[crf]}" - DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data" HOMEPAGE="https://taku910.github.io/crfpp/" -SRC_URI="mirror://gentoo/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" +SRC_URI="mirror://gentoo/${P^^}.tar.gz" +S="${WORKDIR}/${P^^}" LICENSE="|| ( BSD LGPL-2.1 )" SLOT="0" KEYWORDS="amd64 x86" -IUSE="examples static-libs" +IUSE="examples" -PATCHES=( "${FILESDIR}"/${PN}-automake-1.13.patch ) +PATCHES=( "${FILESDIR}"/${P}-autotools.patch ) HTML_DOCS=( doc/. ) src_prepare() { - sed -i \ - -e "/CFLAGS/s/-O3/${CFLAGS}/" \ - -e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \ - configure.in - default - mv configure.{in,ac} || die eautoreconf } -src_configure() { - econf $(use_enable static-libs static) -} - src_test() { local d for d in example/*; do - cd "${d}" + pushd "${d}" >/dev/null || die ./exec.sh || die "failed test in ${d}" - cd - >/dev/null + popd >/dev/null || die done } src_install() { - emake DESTDIR="${D}" install - einstalldocs + default if use examples; then dodoc -r example docompress -x /usr/share/doc/${PF}/example fi - if ! use static-libs; then - find "${ED}" -name "*.la" -type f -delete || die - fi + find "${ED}" -name '*.la' -type f -delete || die } diff --git a/app-text/crf++/files/crf++-0.58-autotools.patch b/app-text/crf++/files/crf++-0.58-autotools.patch new file mode 100644 index 000000000000..df3584432bbe --- /dev/null +++ b/app-text/crf++/files/crf++-0.58-autotools.patch @@ -0,0 +1,23 @@ +--- a/configure.in ++++ b/configure.in +@@ -49,10 +49,8 @@ + dnl + dnl check gcc + dnl +-if test -n "$GCC"; then +- CFLAGS="-O3 -Wall"; +- CXXFLAGS="-O3 -Wall"; +-fi ++CFLAGS="${CFLAGS} -Wall" ++CXXFLAGS="${CXXFLAGS} -Wall" + + AC_DEFUN(ADD_CC_FLAG, [ + AC_MSG_CHECKING(whether ${CC-cc} accepts $1) +@@ -285,6 +283,6 @@ + AC_MSG_RESULT([yes]) + + AC_SUBST(datarootdir) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_OUTPUT([Makefile Makefile.msvc swig/version.h]) + diff --git a/app-text/crf++/files/crf++-automake-1.13.patch b/app-text/crf++/files/crf++-automake-1.13.patch deleted file mode 100644 index afff7edc0707..000000000000 --- a/app-text/crf++/files/crf++-automake-1.13.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -240,6 +240,6 @@ - AC_MSG_RESULT([yes]) - - AC_SUBST(datarootdir) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_OUTPUT([Makefile Makefile.msvc swig/version.h]) - diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest index c93386f9a097..d4f9d21294e9 100644 --- a/app-text/gtkspell/Manifest +++ b/app-text/gtkspell/Manifest @@ -1,5 +1,5 @@ DIST gtkspell-2.0.16.tar.gz 351277 BLAKE2B ccb49b99c4f9059ed4461bb5ffda4dbeb691c5a062184ba7b51d8464d2461c5be0d648e4f69dbc36fe345be2addbc271af9701a0a387975265585dd3a7926e99 SHA512 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d DIST gtkspell3-3.0.10.tar.xz 300968 BLAKE2B aa167e9e5068e9c6c5fcf6933a28246de0be8386be43ab3af80a45dfbc092e1381503822d09742d20dde2e0b8dae77210001c955e37a8dab263b832ee52675a1 SHA512 3b1ceaa9ffa06bd3f6dae39c95db951588e5cf2edf4f551cac6972822ba230af3415c5045fa24f7a4dfe05c2e386ab3f67cb80cb779576b4e54293b7b9fbc28e -EBUILD gtkspell-2.0.16-r1.ebuild 969 BLAKE2B e738ab3471d36c2e6481766fc0dc53b61fa5b4d37f67816bfc37e214214cd3650edae0931ba70762ce0c04b06df80cb239a953e888570a70d31a18c3028a1ec7 SHA512 d7bbb41b8f69a769ea699fe2c6e912d356bffb3d71e299e18806dd18798ef5b71ce9613a514921e107593b3e5bd733d7a646c75089d559cdab20f62863f67a0d -EBUILD gtkspell-3.0.10.ebuild 1056 BLAKE2B b67483668cffcec1745ec6cfe994630f46f8d8e9532e62194919f53785497039050df7a71cd5b9e606c2697fe7869a12812cb9912945c08b59afa351c7d676c3 SHA512 9aaf07d5b94e22bab319b3908079a4de079647e0213e8447d3a5e3f7d904bacefb25ee594b37fc71a143e18cd8172e8f00e5d3ba68f8756d641a47ee55d89faf +EBUILD gtkspell-2.0.16-r2.ebuild 902 BLAKE2B 1ec25eefb1d679f44d4332380c405d264957037dc9b647b30e807e20b3077e530bd022fe3d3eb39e2904e653a5538d142b994dadcf4ecda4ae4be786302a2137 SHA512 56999a42237ed2c0d6ede26667f26367adac85fe20c890b9ad59be105241df17160fb0d41e209ed0e8701c639fbba9e5bcece2d989d3fab6f2117e90c4ffed76 +EBUILD gtkspell-3.0.10-r1.ebuild 1000 BLAKE2B 80272b4461a73ef94470b6a9d0f627859d3762c31566f1651f98642898314cef9e3926b712182f0391a16cd40a5dd84fc0cd2f1ac824a8954dc686d470e146b1 SHA512 c94893d76495e6f369b720d83f4a43069c038d89cb19d7fd73786ef011be1aaa8d3c2a2a9ed8c765ec9a35a710511dd067d3b9c9da02cc1d6065db65a665c03e MISC metadata.xml 332 BLAKE2B 27079d23e02f65245be8d872fc8939d75eae2009d2396447736d993191a489fe773ac46e3d4f3829911dfa79444894ccfd6e18bf26af341d652cb07d7699b545 SHA512 a67c2f81b050afc0d3c00d730928e29d88726dde736936b4b69c2863933fd2fd28f96c90bbc56062ce229a632ee6fff20c5f1a99d02adcee2a6826eecf28dd04 diff --git a/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild b/app-text/gtkspell/gtkspell-2.0.16-r2.ebuild index d2a9465c87c3..e7f3727506aa 100644 --- a/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild +++ b/app-text/gtkspell/gtkspell-2.0.16-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Spell checking widget for GTK" HOMEPAGE="http://gtkspell.sourceforge.net/" @@ -11,17 +11,16 @@ SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz" LICENSE="GPL-2+" SLOT="2" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" -RDEPEND="x11-libs/gtk+:2 +RDEPEND=" + x11-libs/gtk+:2 >=app-text/enchant-1.1.6:0" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig" -DOCS=( AUTHORS ChangeLog README ) # NEWS file is empty - src_prepare() { default @@ -30,10 +29,10 @@ src_prepare() { } src_configure() { - econf --disable-static --disable-gtk-doc + econf --disable-gtk-doc } src_install() { default - find "${D}" -name '*.la' -type f -delete || die + find "${ED}" -name '*.la' -type f -delete || die } diff --git a/app-text/gtkspell/gtkspell-3.0.10.ebuild b/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild index 9e36430f1a65..bfa4472c0e2e 100644 --- a/app-text/gtkspell/gtkspell-3.0.10.ebuild +++ b/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit gnome2 vala +MY_P="${PN}3-${PV}" + DESCRIPTION="Spell checking widget for GTK" HOMEPAGE="http://gtkspell.sourceforge.net/" -MY_P="${PN}3-${PV}" SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2+" SLOT="3/0" @@ -22,25 +24,18 @@ RDEPEND=" dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] - introspection? ( >=dev-libs/gobject-introspection-1.30:= ) -" -DEPEND="${RDEPEND} + introspection? ( >=dev-libs/gobject-introspection-1.30:= )" +DEPEND="${RDEPEND}" +BDEPEND=" >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.35.0 virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - use vala && vala_src_prepare - gnome2_src_prepare -} + vala? ( $(vala_depend) )" src_configure() { + use vala && vala_setup + gnome2_src_configure \ - --disable-static \ $(use_enable introspection) \ $(use_enable vala) } diff --git a/app-text/logmerge/Manifest b/app-text/logmerge/Manifest index 8625fae41041..8d625a960ab1 100644 --- a/app-text/logmerge/Manifest +++ b/app-text/logmerge/Manifest @@ -1,3 +1,3 @@ DIST logmerge-0.5.2b.tar.gz 3407 BLAKE2B 5bc6f46693a9a6e087f8b18441659a06387410bcc66c789120644e088bf1971ef161bead4494b2a509850d8031bad43052bc76d3a8afc13de836119b32dab8ee SHA512 9185d52c62d2ea68fee0e1c6fa798cda60b4a2b621436f5060d7c9b3e5b15363fdb1c9fb40351f66dc48173498f3b18035c46fcf58fa3063bad0008b9bb5946f -EBUILD logmerge-0.5.2b.ebuild 450 BLAKE2B c445d8e44efa541af85debe1e41bea8b0223546dfe84323454a822e9eb2d9c6250c7e034dc9b1c8d99e3e58409323c47ba91ba0e16b0411ed209a1b64b16cce0 SHA512 a542512742a0597691407e8d6f1a4756f8cc5c98fc30d2210701ed36f2675b57187969e38a576feaa26efa2f476f338d7f9fc15e7a299b931cfbca60eecb8604 +EBUILD logmerge-0.5.2b-r1.ebuild 448 BLAKE2B a5ff8dca63315daea142f84c48118fdca7f9d385f68b09b5accc3e6cfacfa4fe074873e7d1b88cc66648072d1207da879d328640f07bec06c601534c8455ce12 SHA512 ad1734f1b7e5b8a39f410df572b0aae889524e144e091fdfaf7b1b81964a63acd009423eb45218753b8aa997e9fe19867706ed597aa1704aad65114a0ae92d68 MISC metadata.xml 265 BLAKE2B b5f6d9a21ba4204c509528162c7138391a7ca5e4edfb74335714ceb8c69a3e87e6498de41a72e8b49390f7faf1b92c8adf2052a85330cb20b7f5d3c3d7abfd45 SHA512 7ddd044f5167be5a3f98cfc4c4e21cf21a62a6d6eb60427190c9516d54ae45bcbad68a3dbcc54f896064110e10a3f8c624a4980475cf81d84c7221c748e3a5ad diff --git a/app-text/logmerge/logmerge-0.5.2b.ebuild b/app-text/logmerge/logmerge-0.5.2b-r1.ebuild index a7f24d5fd1f8..9fc47fd81530 100644 --- a/app-text/logmerge/logmerge-0.5.2b.ebuild +++ b/app-text/logmerge/logmerge-0.5.2b-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 DESCRIPTION="Small and powerful script to merge two or more logfiles" HOMEPAGE="https://github.com/ildar-shaimordanov/logmerge" @@ -15,5 +15,5 @@ RDEPEND="dev-lang/perl" src_install() { default - dobin ${PN} + dobin logmerge } diff --git a/app-text/odt2txt/Manifest b/app-text/odt2txt/Manifest index 4668997b5167..5d0ecd8097f5 100644 --- a/app-text/odt2txt/Manifest +++ b/app-text/odt2txt/Manifest @@ -1,4 +1,4 @@ -AUX odt2txt-0.5-darwin_iconv.patch 366 BLAKE2B 37fa3b5710de1df1760960ffc4b4e00773464bcb63408f3bc03968ad4e758420f508165f6d450bc25bb034f85317dd3a001e13d3694fa9fa3ad77606579c9d20 SHA512 0341c6d4d06b96766e35f55358f26ed52d8eb456f853cd83b098fb3e2adae690bc47090dfd8a1a66f9d24c77586a9fb7151cbe9695dcbdc3f9eef8f5d81b5762 +AUX odt2txt-0.5-makefile.patch 2804 BLAKE2B ba5737bac3a9d01c5d31375de772402ee1cc024e8b0674d6fc9d8b63945977a5c059e85b33fcfa87fdc4fed2a975f3bc439f8678f162b48328a5ec959a31394f SHA512 507fdd6f8663874b970b7833d7d15d6903b8e3193489c6b092158a4d6ad0d3bae794571e4f17c79861ee22afddbf79f9d40c2e4e465f6cdd4bee72b67650d0af DIST odt2txt-0.5.tar.gz 24460 BLAKE2B 703dd48447aa38a9a8bc0989231adf6f3dcf2796cb730feef6649cd14bff0265b12d6dba258a2779911f908a8ec322c5543b43222676e78ff12246daa3753b40 SHA512 95d782a088908518191dd0dcd294676fff25c95a2f23a2b8577b8e3adcce2f9d6d5ccaa2a02c7d36be19d05687a4d7a43bed36056c044af0934af810363c7ce0 -EBUILD odt2txt-0.5.ebuild 734 BLAKE2B 0eecccd2bd9659fbe7b3e499560b5a094784a914d9d7834ba3737353d3db6cca1969373efce774b31628e7c218d28ab6714d7f742b7b2faeefb81ef478360e94 SHA512 90d8025c398a7b0ec014eebe9fc4ee8c8aabc0dbbac99579fa01d9a494947057a552262a89387b319d2697b3cfa6ad79b2414651a11114cf24a33235cb662be1 +EBUILD odt2txt-0.5-r1.ebuild 709 BLAKE2B 66c0d895fa3ceb46b54be47955eb814ea34c2479126ea303d6690974f75f94ee6fbe910f43ad3bcdf0e03d6e7b6acdcca70b8490e218077fd9f3571e435f3094 SHA512 8dc2504218f5d99dcb0b47331a6274f9fb25be3c4ed5e4aea4714ba80f7728c704be4d521bd1f98b574ed3983fa57c5a58b923dfa41cf7cd30dcf6cf559718e7 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch b/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch deleted file mode 100644 index 05957269888e..000000000000 --- a/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur odt2txt-0.4/Makefile odt2txt-0.4/Makefile ---- odt2txt-0.4/Makefile 2008-06-23 23:32:28 +0400 -+++ odt2txt-0.4/Makefile 2010-05-24 15:39:16 +0400 -@@ -56,6 +56,9 @@ - CFLAGS += -I$(ZLIB_DIR) - LIBS = $(ZLIB_DIR)/libz.a - endif -+ifeq ($(UNAME_S),Darwin) -+ LIBS += -liconv -+endif - ifeq ($(UNAME_O),Cygwin) - CFLAGS += -DICONV_CHAR="const char" - LIBS += -liconv - diff --git a/app-text/odt2txt/files/odt2txt-0.5-makefile.patch b/app-text/odt2txt/files/odt2txt-0.5-makefile.patch new file mode 100644 index 000000000000..b87814f3ff58 --- /dev/null +++ b/app-text/odt2txt/files/odt2txt-0.5-makefile.patch @@ -0,0 +1,116 @@ +--- a/Makefile ++++ b/Makefile +@@ -2,28 +2,22 @@ + UNAME_S := $(shell uname -s 2>/dev/null || echo unknown) + UNAME_O := $(shell uname -o 2>/dev/null || echo unknown) + +-ifdef DEBUG +-CFLAGS = -O0 -g -Wextra -DMEMDEBUG -DSTRBUF_CHECK +-#LDFLAGS = -lefence +-LDFLAGS += -g +-else +-CFLAGS = -O2 +-endif +- + ifdef NO_ICONV +-CFLAGS += -DNO_ICONV ++CPPFLAGS += -DNO_ICONV + endif + +-LIBS = -lz ++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags zlib) ++LDLIBS += $(shell $(PKG_CONFIG) --libs zlib) ++ + ZIP_OBJS = + ifdef HAVE_LIBZIP +- CFLAGS += -DHAVE_LIBZIP +- LIBS += -lzip ++ CPPFLAGS += -DHAVE_LIBZIP ++ LDLIBS += -lzip + else + ZIP_OBJS = kunzip/fileio.o kunzip/zipfile.o + endif + +-OBJ = odt2txt.o regex.o mem.o strbuf.o $(ZIP_OBJS) ++OBJ = regex.o mem.o strbuf.o $(ZIP_OBJS) + TEST_OBJ = t/test-strbuf.o t/test-regex.o + ALL_OBJ = $(OBJ) $(TEST_OBJ) + +@@ -37,50 +31,44 @@ + MAN1DIR = $(MANDIR)/man1 + + ifeq ($(UNAME_S),FreeBSD) +- CFLAGS += -DICONV_CHAR="const char" -I/usr/local/include ++ CPPFLAGS += -DICONV_CHAR="const char" + LDFLAGS += -L/usr/local/lib +- LIBS += -liconv ++ LDLIBS += -liconv + endif + ifeq ($(UNAME_S),OpenBSD) +- CFLAGS += -DICONV_CHAR="const char" -I/usr/local/include ++ CPPFLAGS += -DICONV_CHAR="const char" + LDFLAGS += -L/usr/local/lib +- LIBS += -liconv ++ LDLIBS += -liconv + endif + ifeq ($(UNAME_S),Darwin) +- CFLAGS += -I/opt/local/include +- LDFLAGS += -L/opt/local/lib +- LIBS += -liconv ++ LDLIBS += -liconv + endif + ifeq ($(UNAME_S),NetBSD) +- CFLAGS += -DICONV_CHAR="const char" ++ CPPFLAGS += -DICONV_CHAR="const char" + endif + ifeq ($(UNAME_S),SunOS) +- ifeq ($(CC),cc) +- ifdef DEBUG +- CFLAGS = -v -g -DMEMDEBUG -DSTRBUF_CHECK +- else +- CFLAGS = -xO3 +- endif +- endif +- CFLAGS += -DICONV_CHAR="const char" ++ CPPFLAGS += -DICONV_CHAR="const char" + endif + ifeq ($(UNAME_S),HP-UX) +- CFLAGS += -I$(ZLIB_DIR) +- LIBS = $(ZLIB_DIR)/libz.a ++ CPPFLAGS += -I$(ZLIB_DIR) ++ LDLIBS += $(ZLIB_DIR)/libz.a ++endif ++ifeq ($(UNAME_S),Darwin) ++ LDLIBS += -liconv + endif + ifeq ($(UNAME_O),Cygwin) +- CFLAGS += -DICONV_CHAR="const char" +- LIBS += -liconv ++ CPPFLAGS += -DICONV_CHAR="const char" ++ LDLIBS += -liconv + EXT = .exe + endif + ifneq ($(MINGW32),) +- CFLAGS += -DICONV_CHAR="const char" -I$(REGEX_DIR) -I$(ZLIB_DIR) +- LIBS = $(REGEX_DIR)/regex.o ++ CPPFLAGS += -DICONV_CHAR="const char" -I$(REGEX_DIR) -I$(ZLIB_DIR) ++ LDLIBS += $(REGEX_DIR)/regex.o + ifdef STATIC +- LIBS += $(wildcard $(ICONV_DIR)/lib/.libs/*.o) +- LIBS += $(ZLIB_DIR)/zlib.a ++ LDLIBS += $(wildcard $(ICONV_DIR)/lib/.libs/*.o) ++ LDLIBS += $(ZLIB_DIR)/zlib.a + else +- LIBS += -liconv ++ LDLIBS += -liconv + endif + EXT = .exe + endif +@@ -89,7 +77,6 @@ + MAN = odt2txt.1 + + $(BIN): $(OBJ) +- $(CC) -o $@ $(LDFLAGS) $(OBJ) $(LIBS) + + t/test-strbuf: t/test-strbuf.o strbuf.o mem.o + t/test-regex: t/test-regex.o regex.o strbuf.o mem.o diff --git a/app-text/odt2txt/odt2txt-0.5.ebuild b/app-text/odt2txt/odt2txt-0.5-r1.ebuild index e736a365e9a1..70a3b4a55b3e 100644 --- a/app-text/odt2txt/odt2txt-0.5.ebuild +++ b/app-text/odt2txt/odt2txt-0.5-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -12,23 +12,21 @@ SRC_URI="https://github.com/dstosberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc64 ~sparc x86" -IUSE="" RDEPEND=" !app-office/unoconv sys-libs/zlib - virtual/libiconv -" -DEPEND="${RDEPEND} - sys-apps/groff -" -PATCHES="${FILESDIR}/${P}-darwin_iconv.patch" - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" + virtual/libiconv" +DEPEND="${RDEPEND}" +BDEPEND="sys-apps/groff" + +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) + +src_configure() { + tc-export CC PKG_CONFIG } src_install() { - emake install DESTDIR="${D}" PREFIX=/usr + emake install DESTDIR="${D}" PREFIX="${EPREFIX}"/usr doman odt2txt.1 } diff --git a/app-text/pspresent/Manifest b/app-text/pspresent/Manifest index da453a50ec8a..748350164a82 100644 --- a/app-text/pspresent/Manifest +++ b/app-text/pspresent/Manifest @@ -1,3 +1,4 @@ +AUX pspresent-1.3-makefile.patch 949 BLAKE2B be1514b651d32fd062129c2c42deb7dc1d9134e01ead14b0f4aef8838e65a0b0a37729ea277e9a2fbe95182ee8bfa40e4dc138bc69587810a03710ab1b1555d2 SHA512 9d6ff2a7b132a5888c1ce62ea5a3291c8c2f58ba849d34fefd5a53bcec84a65ac58528daefc25e963a8da1747ecde69a0ddd985e591e3fcf88e46b47d04761df DIST pspresent-1.3.tar.gz 14357 BLAKE2B b15f288f2446ef0a9a00bcf454d9e55fc60a0547c534f0015695c6d2b23c5bd779acd2b423b01f6cd019cff419cdc79da8f8575804440c3f70bbeb29e5fa1b32 SHA512 cfca0b4758d03051cea95d077a45239103f6fd24dada775c3b7fb0b7f78863f6628b530a21834546546dc935596b6d93dbe45048a661fcc41152a4b97b8f21f3 -EBUILD pspresent-1.3-r1.ebuild 860 BLAKE2B e13256c827c441f64e42d289d03f52b629d9ef0e705cf6c2d9aa63375e9cf650664e033374e307d0a52ea2e9882ff1e9f5f2acde8965ffad1a28f9cb2d2229d1 SHA512 ecbd928c625cde9db7a01e79dc200994f323eddf7521b199091fabf19e9dcafc179da1616588181f57a14db2a3158113ea3a062f4b726ba42bc827c8c9a13773 +EBUILD pspresent-1.3-r2.ebuild 749 BLAKE2B 97f9a12b4ffda7dae0b3d74bcc0bdf8282543caeee8725b227194d7eb25656a4421da62ec24e299ea8d51e968e32efbbcc2c8210b144d441f55e23e36709e281 SHA512 ee891068a6fdad0f2c17c97f21d2816675cc00d7d82bca5173884d3b9c194cd00e453ab32d1a2c11eae1a4ed8841d1395a72bc335a03d8bde10a9ecb0de2b36c MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/app-text/pspresent/files/pspresent-1.3-makefile.patch b/app-text/pspresent/files/pspresent-1.3-makefile.patch new file mode 100644 index 000000000000..363a52c57285 --- /dev/null +++ b/app-text/pspresent/files/pspresent-1.3-makefile.patch @@ -0,0 +1,39 @@ +--- a/Makefile ++++ b/Makefile +@@ -4,28 +4,16 @@ + # + + # You may need to change these paths +-X11_CFLAGS=-I/usr/X11R6/include +-X11_LDLIBS=-L/usr/X11R6/lib -lX11 ++X11_CFLAGS = $(shell $(PKG_CONFIG) --cflags x11) ++X11_LDLIBS = $(shell $(PKG_CONFIG) --libs x11) + + # Remove the following two lines to disable XINERAMA support +-XINERAMA_CFLAGS=-DHAVE_LIBXINERAMA +-XINERAMA_LDLIBS=-lXext -lXinerama ++ifdef USE_XINERAMA ++XINERAMA_CFLAGS = -DHAVE_LIBXINERAMA $(shell $(PKG_CONFIG) --cflags xinerama) ++XINERAMA_LDLIBS = $(shell $(PKG_CONFIG) --libs xinerama) ++endif + +-CC = gcc +-CFLAGS = -Wall -O2 $(X11_CFLAGS) $(XINERAMA_CFLAGS) ++CPPFLAGS += $(X11_CFLAGS) $(XINERAMA_CFLAGS) + LDLIBS = $(X11_LDLIBS) $(XINERAMA_LDLIBS) + +-TARGET = pspresent +-OBJS = pspresent.o gs.o ps.o +- +-$(TARGET): $(OBJS) +- $(CC) -o $(TARGET) $(OBJS) $(LDLIBS) +- +-clean: +- rm $(TARGET) $(OBJS) +- +-.SUFFIXES: +-.SUFFIXES: .c .o +- +-.c.o: +- $(CC) $(CFLAGS) -o $@ -c $< ++pspresent: gs.o ps.o diff --git a/app-text/pspresent/pspresent-1.3-r1.ebuild b/app-text/pspresent/pspresent-1.3-r2.ebuild index 24ed68ea8e0b..167d8e647c8a 100644 --- a/app-text/pspresent/pspresent-1.3-r1.ebuild +++ b/app-text/pspresent/pspresent-1.3-r2.ebuild @@ -1,38 +1,32 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs DESCRIPTION="A tool to display full-screen PostScript presentations" -SRC_URI="http://www.cse.unsw.edu.au/~matthewc/pspresent/${P}.tar.gz" HOMEPAGE="http://www.cse.unsw.edu.au/~matthewc/pspresent/" -SLOT="0" -LICENSE="GPL-2" +SRC_URI="http://www.cse.unsw.edu.au/~matthewc/pspresent/${P}.tar.gz" -IUSE="xinerama" +LICENSE="GPL-2" +SLOT="0" KEYWORDS="amd64 ppc x86" +IUSE="xinerama" -RDEPEND="x11-libs/libX11 - xinerama? ( x11-libs/libXinerama ) - app-text/ghostscript-gpl" +RDEPEND=" + app-text/ghostscript-gpl + x11-libs/libX11 + xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" -src_prepare() { - default - if ! use xinerama ; then - sed -i -e "/^XINERAMA/s/^/#/g" Makefile || die "sed Makefile" - fi - sed -i Makefile \ - -e 's|= -Wall -O2|+= -Wall|g' \ - -e 's| -o | $(LDFLAGS)&|g' \ - || die "sed Makefile" -} +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) -src_compile() { - emake CC="$(tc-getCC)" +src_configure() { + tc-export CC PKG_CONFIG + use xinerama && export USE_XINERAMA=1 } src_install() { diff --git a/app-text/pstotext/Manifest b/app-text/pstotext/Manifest index aa187403ffea..0699dbf84a92 100644 --- a/app-text/pstotext/Manifest +++ b/app-text/pstotext/Manifest @@ -1,5 +1,5 @@ AUX 1.9-flags.patch 775 BLAKE2B 32634da1338504c985a71dd58a6c5a09e03f07063c4540647e155a3d9f4b17fdc2a2d2a6db39f698c9bb7442b525ba876e7a951ad95e908e6a457699847f583f SHA512 4933522482e76eb9a220da6baf74722318e1b3c818515560f58a2d448b66a5236450c96171e89c8fa899c4e4904fcbde8457e87accbde0b6275c7154e1e9e462 AUX pstotext-1.9-quote-chars-fix.patch 3491 BLAKE2B 81f284386683222fb8c95f0b2677d05134e578486932b09511ba9fd685ade1b02db1a6c1e60dd90502e558f5ff5bc3a8eefa577c8cc620a89f5a97215e9aaea2 SHA512 c6ffabaf5b5f7261e79e43d0083543b0428cde0d62c1b9e9513905d03dd5174a1ee1a537dfa8d906b7422cc6c9e5606fc7dc6f177d11441fd028355e99c2c4a6 DIST pstotext-1.9.tar.gz 37461 BLAKE2B ff0c816ff0f57882e6fb36df9a2ba02049526cc0d5a0996e47c32f98a3d3208ca35f59c84605e75c787b80b3a0d8db498afbd4d28e2095be8abd979ecaa6bc22 SHA512 a8148e94d635544a7dfa8c96ff6071717388e4dc6c3db36f2c50939dce96c1f824ee423b1622af9111fffc60cb298215a6ee85d956c81873d71ceac804ee48ca -EBUILD pstotext-1.9-r4.ebuild 621 BLAKE2B f652bd3a7c696dfc4b1345fd9af78903661ec8371ea8d607726f596c1cd91767844a19d021c001bf9757f3861b7e8c8573090fbf60beeeb38063789ea71f74cf SHA512 b9df99ab6289e5fb097bb20bbc1b8e24d2038e9d4576bfb371f1803b83e194ada8d3fc18175bbc89bde05918d102c746b8c0ae033f889352b3d54c679fcec725 +EBUILD pstotext-1.9-r5.ebuild 606 BLAKE2B c1c9791fb2430ffc476510abad3110fb76dca40513aa4f15552ab4b8e7802fc4822fd480924e4941d764756d90be9d69754cb8ac16f072c9b15a360da4ba045c SHA512 028232fb336b81add812dc5384f0c9796e1f56fc8d69e4574fb40f3fba0b3622e36ac5935d2c6d6872c0afa752ac494d3503e507b77298a7be9f7c13bb33d60b MISC metadata.xml 250 BLAKE2B e2cadaf7d8fd791e45124cd765cb44d4e2347ecce2bc9dabdc682f6e6f198da73e34e273d326bbb8317c28c34a86e6139bde7e9cdc4ce7d6045443f8bdcec8a0 SHA512 3ca55284974baa2067e21fc58cd2f9f6a673d83f53dc53d3bafe26c1cff7b8aa13890545bcf92f9febc82afdd0b6b3afeb5c2d7fc4c31f7e0c46d1b0314564f4 diff --git a/app-text/pstotext/pstotext-1.9-r4.ebuild b/app-text/pstotext/pstotext-1.9-r5.ebuild index 814f6a395699..72c02ff901a4 100644 --- a/app-text/pstotext/pstotext-1.9-r4.ebuild +++ b/app-text/pstotext/pstotext-1.9-r5.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -12,7 +12,6 @@ SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/contrib/${P}.tar.gz" LICENSE="PSTT" SLOT="0" KEYWORDS="amd64 ~hppa ppc ppc64 x86" -IUSE="" RDEPEND="app-text/ghostscript-gpl" @@ -21,8 +20,7 @@ PATCHES=( "${FILESDIR}"/${PV}-flags.patch ) -src_prepare() { - default +src_configure() { tc-export CC } diff --git a/app-text/tkinfo/Manifest b/app-text/tkinfo/Manifest index 47fef4a676dc..2a6d4809537d 100644 --- a/app-text/tkinfo/Manifest +++ b/app-text/tkinfo/Manifest @@ -1,3 +1,3 @@ DIST tkinfo-2.8.tar.gz 56234 BLAKE2B 6351a8c3ee46092a5c46db147006cb462882cc9abec11f49f07f4f4b50888be6537625a0756a8f05837c21d769345e39837f650ad3a6488713adc304880a3674 SHA512 dfce278a1b33eebcebe3f6f9b5885a8c247f3181d154bc35d8b6d894f1f33043e9e40dd4c8dc336fa100700883295e8a648bece6f04ee556d4fa2f69adaecb76 -EBUILD tkinfo-2.8-r1.ebuild 578 BLAKE2B db7209caefd9ec7f8607820e43879952cdd8cad2bfcf33c19f54bf1df9c70af14bed99dcf35fb5c1f5ed40de90b319833a7b6a3d0af40864e6e6c75bdd140f3e SHA512 524fd1182ec44b817048f349ef23981681c3d436ddf0a99a9cc5862c3ff389d13b4c6f913933556dac19aad5a55fba72d24a2e0e9b7796590b47b828d8079205 +EBUILD tkinfo-2.8-r2.ebuild 536 BLAKE2B 7da5944f102207f3adbd1fe288a34115387778497dcb44ed982961a3d0de73ac005ca685ea282b9c8fee783e4999f49c56858f526663f56329681abac523d7b2 SHA512 d7718b81a96e9efbccac109fd9dc5b13081052123a61f431b26bc513fd704932e1dde3d1ba6b77c2c9d18270ac224aaa4be8aee9ae2ad40dce020929df1b8baa MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/app-text/tkinfo/tkinfo-2.8-r1.ebuild b/app-text/tkinfo/tkinfo-2.8-r2.ebuild index 25b60f40b1ef..97256a448ef4 100644 --- a/app-text/tkinfo/tkinfo-2.8-r1.ebuild +++ b/app-text/tkinfo/tkinfo-2.8-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Info Browser in TK" HOMEPAGE="http://math-www.uni-paderborn.de/~axel/tkinfo/" @@ -12,18 +12,14 @@ SLOT="0" KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86" RDEPEND="dev-lang/tk" -DEPEND="sys-apps/sed" - -DOCS=( README ) src_prepare() { default - sed -i \ - -e "1 s:^.*:#!/usr/bin/wish:" tkinfo || \ - die "sed tkinfo failed" + sed -e "1 s:^.*:#!/usr/bin/env wish:" \ + -i tkinfo || die "sed tkinfo failed" } src_install() { - dobin "${PN}" - doman "${PN}.1" + dobin tkinfo + doman tkinfo.1 } |