diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /app-office/magicpoint | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'app-office/magicpoint')
5 files changed, 193 insertions, 180 deletions
diff --git a/app-office/magicpoint/Manifest b/app-office/magicpoint/Manifest index 67542b90a6a1..1f30e118fe44 100644 --- a/app-office/magicpoint/Manifest +++ b/app-office/magicpoint/Manifest @@ -1,14 +1,14 @@ AUX 50magicpoint-gentoo.el 195 BLAKE2B e7abbad45cdd3cad6e658d609d7e3e41d7be75740eca5982cc990af1448d17297a0240545e1205ba8a1a11ef73cb970cd95d4f021eec3d0df8bfd8465e961a84 SHA512 e601460b245be363da41f4076381a96b1155799850807d1b6862ea2677844f87960aa27c484ee8735fddeb63e5b940973492c0a2979ad6dea31707f5682806fe AUX magicpoint-1.11b-gentoo.diff 1412 BLAKE2B 63aedeeddf4a636d9095554bb2a5c7c6c1093bd97480631d791c8959da0e7313546050c979c28760ae0db29aeb9646a495a4d98b99d2acee5e8b933c742837cb SHA512 f3ae7d2ed64771b0af719442f572b50bb4a493de7b2b91b6de39750f52875a95c579b102ac0fc94294ac14dc03aea2bc5ccb8f62015e930bf25a1b1d6454c26e -AUX magicpoint-1.13a-libpng15.patch 240 BLAKE2B 93ebf799b69a0f0133c9a6cae44d39ba49afdda22b5c7d25b398f8ae60e2dca6179c48cc67ef6dabc20f8b8f0d0a94ba4c18720d66bfdbded271a362f71ed05b SHA512 78855e421db27bdbacaa98ff0597106055cb6c8b537ad1edd4d55026669e9e948df9d6f76636bac6ed14f1a7c3509685f46eab02c1b56a0bde5e786f91adb16e +AUX magicpoint-1.13a-libpng15.patch 244 BLAKE2B ded39373f0e75adc8394a7e0d9fc4a2e1490956b7cc433c74c782c7a16627ea6eabc2cbc04ccf0bf3b36e1797f10f63f891f68bfd2ea65b087250ad75d053535 SHA512 bf59c06792324ab36a3caeb9871f99ad0535fff6bc3769d963fe5ed3fa2a564d4dc7083798008d264f5eb25e609b356166920c74e4fc7ec183aeef21cb18f4de AUX magicpoint-1.13a_p20121015-any-giflib.patch 3585 BLAKE2B 5cb2febf20cd1a3270cdc91e2e0bb72157d70be1e47bfeea4fc49594192332b1416d923b00ec3d9f305a3ac728c6efa791d00105032014dd883e44d20328b1bb SHA512 661e86eddc3c929651dd2d06b14638d4c92f03281447ee706203a99940bfca8783373ed8a175ddac73e2a6ccb2d8c25386aca39b977fbc3e631b5a16dcfc3536 AUX magicpoint-1.13a_p20121015-draw-charset.patch 376 BLAKE2B 2162436ee734410c11461389ca430fcda0410031a649a00f96059e21a2a3575491b91fe35963c64fc692f0f761ea6623d6098ac364d844d094172385ff4fb773 SHA512 3aa3b7e4fa638a86e3a5241ad2768a44b0d3e1925dcbf23e4c5b9cd1fde9d3897b3785336be174d709c6172e47c34a5e1550cef05e868e0706cf2f91b73a160c AUX magicpoint-1.13a_p20121015-draw-stringtoolong.patch 310 BLAKE2B 13af238e0ceb7afd3fb6fbe27c9ea50435de74a9be24ed53cb021e8aa708d01abb23127ff54f26d20e59ff214e28ee6e22ac140918b2b7e3de57ad4a830dfb09 SHA512 65f77a096501ba27208bdc7e036ada66946e15c012b22e5dcae579141d399a7149bd647f9a5968f82ff34c344ce9c5ee4841be33a7fb911187b1def131bb7387 AUX magicpoint-1.13a_p20121015-fno-common.patch 305 BLAKE2B 38096fe5ff8d28ed4def62492e716da01d4fbd2741e68640ab79247599812e7f1c9573ebaff1bb1b74f6f3956eeec435e1ab1592f0a2d4fca5b813508c08f408 SHA512 102ae9f4f00c542cfd0fbf16daec4e0a00a801d9557aea4eaeb792ac958d8d2388f949cf19872387f4ba9429c44bcaeeac09ff34e4c5537230387633739b081d -AUX magicpoint-1.13a_p20121015-fontconfig.patch 1005 BLAKE2B eaf2ab5655b529fd8511b590cbd73638f6becc047c97ddd92a136ef998f284c96b471bf371085d799f964ea3f3961dfb70a0d51b16cc165fbd20ca15406ca2c0 SHA512 53fc5bbce474e4c60af75ad73f00108c40ab317b9b835f971e475f8f49a893a41614ec76345e220c8e7284032f7df1a7785e2ca91d5a66c4f99470d55b0f9603 +AUX magicpoint-1.13a_p20121015-fontconfig.patch 933 BLAKE2B 02d7fa10b55704e9c013fcda7b07c8962715d28c3a46d1e875fa50cef85b869bb664f6f017ef94fa47481db1797e23261e1aff164ca9274eb0ad2b5249aaf938 SHA512 c6b6631c55b020de521b34fb8c8e44fcb5509c1b5f2bfdf245a09bd875971e30809396083884e62da80cb5f86fbd587a4a9054aeec82181ff3dfaad3d458f6d2 AUX magicpoint-1.13a_p20121015-gif-dimension.patch 493 BLAKE2B ae2e3f94f3b36b319d330504a31331e9c45429d750f2be6f8dffa299ef6541ad777d09520be72bb3ceb7c68b8fa6dc4f78a482dd1b8e0093faa2b2a5e4de0f0b SHA512 d8103374df7696ed6daf36c079c2e1f2efbfc8e774f77e06beec629b2064576325f311603ca7d1dfe3f65ed11dfaff1abd7ae70b4f78a5199e76e1d5030c5aa6 AUX magicpoint-1.13a_p20121015-implicit-declaration.patch 3673 BLAKE2B 314f8b4022c53022f6e8e2a0612d480509916f3b857a6beaa840bbd08ea6f9e62be33dd295ce516c60162516b585fbd12884866ea184eff1bbbc6c55bec017b6 SHA512 be8da97dd37a59190cddc3f826094a343d2351d832d9bbb42a7a319149884e026fdd97018826162474bb2ffc0f88082cd4075a228487fd3d40e6b76c9ebdc029 AUX magicpoint-1.13a_p20121015-parse-empty.patch 316 BLAKE2B 4d532b1e56bcc3d21035051b3a1e6421b02d83dd24a2e450b841f8f1c9740e19a266f5ca7619624d6046e6699507ef3a630ba605311977a466efd20b6c57fd19 SHA512 adb7a9e1585c907cd8f8b0f834391620cecf854702301715149ddc80af080115dbdd18c7f8622a5fc403df8f1205133909c98a2153461e4e8f4bf401b647f518 DIST mgp-snap-20121015.tar.gz 886902 BLAKE2B c4f4730a805aee43f8fff7439cd18ab84f2dc73be6c249c3d8168da63fc0c32b4aff2d800345a35d3c22dd930c78f51e8cc64f4f74f0cf0aeb5f6cc4d145d4f0 SHA512 fa59b1ec04e2e191b74c25fd3ae9b4c855ad96d23e9e5b071c959f56b9d2064d7bdf9217b5c62c5733cc2d9ec17981947febd7afb2552f1145262225909cc711 -EBUILD magicpoint-1.13a_p20121015-r1.ebuild 3928 BLAKE2B ac9b56bf426bc4529af7532fc3620c400e1f81e5a31cbb65834156c9878cbe1498b50841e93761166283b66a5455bcf9686e65b75be1db74f50101e075105f70 SHA512 adb2f7a90d01f07bc3c883e584ae03d35d06f4c0b8e7882325760ea59d82a91f51477efe3fa583fe361829372e315ab82effcc238f950b34ccb57838efc1234b +EBUILD magicpoint-1.13a_p20121015-r2.ebuild 4248 BLAKE2B e610fecadb8fec4824e56607043375842829a8a246eb488dd21ac7df3fa9b4caa4c8e3651be485d7f37b106ca5275def067be44507ca5bc851f77c1dd9154f09 SHA512 f09af770f6d526c64cb58c45c37f0248f222f8bbaf2612559837c9839f8d993e95cc86a4137b0bce06dd16745a4d019fe38800c0be41fec64ab48803e07166fb MISC metadata.xml 619 BLAKE2B cf03f94d998aac24ad462ec4f13de8dfe022ff716c611f12e1a6e5e6964bf4d2ba1038d8d07b61924af5000057445816167c8899a9b784ecdc3ffed00acee8a8 SHA512 252061aa0a52e933b017498596b4b7b5f45fe660616212dd0718b8fe5e46ce90f4b92af96ef5ccd1db8ac05d0190743d6242208d248cc12fc9a523fd06b80c7b diff --git a/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch b/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch index 7990b4685544..31ae6200e441 100644 --- a/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch +++ b/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch @@ -1,5 +1,5 @@ ---- image/png.c -+++ image/png.c +--- a/image/png.c ++++ b/image/png.c @@ -86,7 +86,7 @@ return NULL; } diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch index 9a49eb39282e..7a3599ea475f 100644 --- a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch +++ b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch @@ -1,6 +1,6 @@ # Bug #572658 ---- kit.orig/configure.in 2009-05-04 09:36:47.000000000 +0200 -+++ kit/configure.in 2016-01-23 04:25:17.047720246 +0100 +--- a/configure.in ++++ b/configure.in @@ -16,6 +16,7 @@ AC_PROG_AWK AC_PROG_YACC @@ -14,10 +14,10 @@ AC_MSG_CHECKING(for xft2 library..) AC_CHECK_LIB(Xft, XftFontOpen, - [LIBS="$LIBS -lXft -lfontconfig" -+ [LIBS="$LIBS -lXft `pkg-config --libs fontconfig`" ++ [LIBS="$LIBS -lXft `${PKG_CONFIG} --libs fontconfig`" AC_DEFINE(USE_XFT2) - mgp_xft2_found=yes], [], [-lfontconfig]) -+ mgp_xft2_found=yes], [], [`pkg-config --libs fontconfig`]) ++ mgp_xft2_found=yes], [], [`${PKG_CONFIG} --libs fontconfig`]) fi fi fi @@ -26,7 +26,7 @@ OPTFLAGS="$OPTFLAGS `m17n-config X --cflags`" LIBS="$LIBS `m17n-config X --libs` -lm17n-core" + if test "x$ac_cv_header_fontconfig_fontconfig_h" = "xyes"; then -+ LIBS="$LIBS `pkg-config --libs fontconfig`" ++ LIBS="$LIBS `${PKG_CONFIG} --libs fontconfig`" + fi fi fi diff --git a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild deleted file mode 100644 index c72a1f5b5744..000000000000 --- a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools elisp-common eutils toolchain-funcs - -MY_SNAP="${PV/*_p}" -MY_P="mgp-snap-${MY_SNAP}" -DESCRIPTION="An X11 based presentation tool" -SRC_URI="ftp://sh.wide.ad.jp/WIDE/free-ware/mgp-snap/${MY_P}.tar.gz" -HOMEPAGE="http://member.wide.ad.jp/wg/mgp/" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cjk contrib doc emacs examples fontconfig gif imlib m17n-lib mng nls png truetype" - -REQUIRED_USE="imlib? ( !gif !png )" -S="${WORKDIR}/kit" - -COMMON_DEPEND="x11-libs/libICE - x11-libs/libSM - x11-libs/libXrender - x11-libs/libXmu - imlib? ( media-libs/imlib2[X] ) - !imlib? ( - gif? ( media-libs/giflib:= ) - png? ( >=media-libs/libpng-1.4:0= ) - ) - truetype? ( - x11-libs/libXft - media-libs/fontconfig - ) - emacs? ( >=app-editors/emacs-23.1:* ) - m17n-lib? ( - dev-libs/m17n-lib - fontconfig? ( media-libs/fontconfig ) - ) - mng? ( media-libs/libmng )" -DEPEND="${COMMON_DEPEND} - sys-devel/autoconf - x11-base/xorg-proto - x11-libs/libxkbfile - app-text/rman - x11-misc/imake" -RDEPEND="${COMMON_DEPEND} - contrib? ( dev-lang/perl ) - nls? ( sys-devel/gettext ) - truetype? ( cjk? ( media-fonts/sazanami ) )" - -SITEFILE=50${PN}-gentoo.el - -src_prepare() { - sed -i -e '/mgp_version =/s, (.*), ('${MY_SNAP}'),' mgp.c - - epatch \ - "${FILESDIR}"/${PN}-1.11b-gentoo.diff \ - "${FILESDIR}"/${PN}-1.13a_p20121015-fontconfig.patch \ - "${FILESDIR}"/${PN}-1.13a_p20121015-parse-empty.patch \ - "${FILESDIR}"/${PN}-1.13a_p20121015-draw-charset.patch \ - "${FILESDIR}"/${PN}-1.13a_p20121015-draw-stringtoolong.patch \ - "${FILESDIR}"/${PN}-1.13a_p20121015-implicit-declaration.patch \ - "${FILESDIR}"/${PN}-1.13a_p20121015-fno-common.patch - - if ! use imlib; then - epatch "${FILESDIR}"/${PN}-1.13a-libpng15.patch - - # fix compability with libpng14 - sed -i \ - -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \ - configure.in image/png.c || die - - if use gif; then - # bug #85720 - sed -i -e "s/ungif/gif/g" configure.in || die - - # bug #486248 - epatch "${FILESDIR}"/${PN}-1.13a_p20121015-any-giflib.patch - - # fix use of uninitialized memory in error message - epatch "${FILESDIR}"/${PN}-1.13a_p20121015-gif-dimension.patch - fi - fi - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable gif) \ - $(use_enable imlib) \ - $(use_enable nls locale) \ - $(use_enable truetype xft2) \ - $(use_with m17n-lib) \ - --disable-vflib \ - --disable-freetype \ - --x-libraries=/usr/lib/X11 \ - --x-includes=/usr/include/X11 -} - -src_compile() { - xmkmf || die - # no parallel build possible anywhere - emake -j1 Makefiles - - tc-export CC - emake -j1 \ - CC="${CC}" \ - CDEBUGFLAGS="${CFLAGS}" \ - LOCAL_LDFLAGS="${LDFLAGS}" \ - BINDIR=/usr/bin \ - LIBDIR=/etc/X11 - - if use emacs; then - pushd contrib || die - elisp-compile *.el || die - popd - fi -} - -src_install() { - emake -j1 \ - DESTDIR="${D}" \ - BINDIR=/usr/bin \ - LIBDIR=/etc/X11 \ - install - - emake -j1 \ - DESTDIR="${D}" \ - DOCHTMLDIR=/usr/share/doc/${PF} \ - MANPATH=/usr/share/man \ - MANSUFFIX=1 \ - install.man - - use contrib && dobin contrib/mgp2{html,latex}.pl - - if use emacs; then - pushd contrib || die - elisp-install ${PN} *.el *.elc || die - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - popd - fi - - dodoc FAQ README* RELNOTES SYNTAX TODO* USAGE* - - if use examples; then - pushd sample || die - insinto /usr/share/doc/${PF}/examples - doins README* cloud.jpg dad.* embed*.mgp gradation*.mgp \ - mgp-old*.jpg mgp.mng mgp3.xbm mgprc-sample \ - multilingual.mgp sample*.mgp sendmail6*.mgp \ - tutorial*.mgp v6*.mgp v6header.* - popd - fi -} - -pkg_postinst() { - elog - elog "If you enabled xft2 support (default) you may specify xfont directive by" - elog "font name and font registry." - elog "e.g.)" - elog '%deffont "standard" xfont "sazanami mincho" "jisx0208.1983"' - elog - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/app-office/magicpoint/magicpoint-1.13a_p20121015-r2.ebuild b/app-office/magicpoint/magicpoint-1.13a_p20121015-r2.ebuild new file mode 100644 index 000000000000..4c584b1af2c8 --- /dev/null +++ b/app-office/magicpoint/magicpoint-1.13a_p20121015-r2.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools elisp-common toolchain-funcs + +MY_SNAP="${PV/*_p}" +MY_P="mgp-snap-${MY_SNAP}" + +DESCRIPTION="X11 based presentation tool" +HOMEPAGE="http://member.wide.ad.jp/wg/mgp/" +SRC_URI="ftp://sh.wide.ad.jp/WIDE/free-ware/mgp-snap/${MY_P}.tar.gz" +S="${WORKDIR}/kit" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cjk contrib doc emacs examples fontconfig gif imlib m17n-lib mng nls png truetype" +REQUIRED_USE="imlib? ( !gif !png )" + +COMMON_DEPEND=" + x11-libs/libICE + x11-libs/libSM + x11-libs/libXmu + x11-libs/libXrender + emacs? ( >=app-editors/emacs-23.1:* ) + imlib? ( media-libs/imlib2[X] ) + !imlib? ( + gif? ( media-libs/giflib:= ) + png? ( >=media-libs/libpng-1.4:0= ) + ) + m17n-lib? ( + dev-libs/m17n-lib[X] + fontconfig? ( media-libs/fontconfig ) + ) + mng? ( media-libs/libmng:= ) + truetype? ( + x11-libs/libXft + media-libs/fontconfig + )" +RDEPEND=" + ${COMMON_DEPEND} + contrib? ( dev-lang/perl ) + nls? ( sys-devel/gettext ) + truetype? ( cjk? ( media-fonts/sazanami ) )" +DEPEND=" + ${COMMON_DEPEND} + x11-libs/libxkbfile" +BDEPEND=" + app-text/rman + virtual/pkgconfig + x11-base/xorg-proto + >=x11-misc/imake-1.0.8-r1 +" + +SITEFILE="50${PN}-gentoo.el" + +PATCHES=( + "${FILESDIR}"/${PN}-1.11b-gentoo.diff + "${FILESDIR}"/${PN}-1.13a_p20121015-fontconfig.patch + "${FILESDIR}"/${PN}-1.13a_p20121015-parse-empty.patch + "${FILESDIR}"/${PN}-1.13a_p20121015-draw-charset.patch + "${FILESDIR}"/${PN}-1.13a_p20121015-draw-stringtoolong.patch + "${FILESDIR}"/${PN}-1.13a_p20121015-implicit-declaration.patch + "${FILESDIR}"/${PN}-1.13a_p20121015-fno-common.patch +) + +src_prepare() { + default + + sed -i -e '/mgp_version =/s, (.*), ('${MY_SNAP}'),' mgp.c || die + + if ! use imlib; then + eapply "${FILESDIR}"/${PN}-1.13a-libpng15.patch + + # fix compability with libpng14 + sed -i \ + -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \ + configure.in image/png.c || die + + if use gif; then + # bug #85720 + sed -i -e "s/ungif/gif/g" configure.in || die + + # bug #486248 + eapply "${FILESDIR}"/${PN}-1.13a_p20121015-any-giflib.patch + + # fix use of uninitialized memory in error message + eapply "${FILESDIR}"/${PN}-1.13a_p20121015-gif-dimension.patch + fi + fi + + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable gif) + $(use_enable imlib) + $(use_enable nls locale) + $(use_enable truetype xft2) + $(use_with m17n-lib) + --disable-freetype + --disable-vflib + --x-libraries="${ESYSROOT}/usr/$(get_libdir)" + --x-includes="${ESYSROOT}/usr/include" + ) + + tc-export PKG_CONFIG + + econf "${myeconfargs[@]}" + + export IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" xmkmf || die +} + +src_compile() { + # no parallel build possible anywhere + emake -j1 CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" Makefiles + + local myemakeargs=( + AR="$(tc-getAR) cq" + CC="$(tc-getCC)" + RANLIB="$(tc-getRANLIB)" + CDEBUGFLAGS="${CFLAGS}" + LOCAL_LDFLAGS="${LDFLAGS}" + BINDIR="${EPREFIX}/usr/bin" + LIBDIR="${EPREFIX}/etc/X11" + ) + emake -j1 "${myemakeargs[@]}" + + if use emacs; then + pushd contrib >/dev/null || die + elisp-compile *.el + popd >/dev/null || die + fi +} + +src_install() { + local myemakeargs=( + DESTDIR="${D}" + BINDIR="${EPREFIX}/usr/bin" + DOCHTMLDIR="${EPREFIX}/usr/share/doc/${PF}" + LIBDIR="${EPREFIX}/etc/X11" + MANPATH="${EPREFIX}/usr/share/man" + MANSUFFIX=1 + ) + emake -j1 "${myemakeargs[@]}" install install.man + + use contrib && dobin contrib/mgp2{html,latex}.pl + + if use emacs; then + pushd contrib >/dev/null || die + elisp-install ${PN} *.el *.elc + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + popd >/dev/null || die + fi + + dodoc FAQ README* RELNOTES SYNTAX TODO* USAGE* + + if use examples; then + # default and mgp[1-3].jpg are already installed + rm sample/{default.mgp,mgp{1,2,3}.jpg} || die + docinto examples + dodoc sample/[^IM]* + fi +} + +pkg_postinst() { + elog + elog "If you enabled xft2 support (default) you may specify xfont directive by" + elog "font name and font registry." + elog "e.g.)" + elog '%deffont "standard" xfont "sazanami mincho" "jisx0208.1983"' + elog + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} |