From f2e359c456b051f95efc92e21299d55a302e58ed Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Nov 2024 03:03:00 +0000 Subject: gentoo auto-resync : 19:11:2024 - 03:03:00 --- x11-misc/Manifest.gz | Bin 46491 -> 46492 bytes x11-misc/macopix/Manifest | 3 +- x11-misc/macopix/files/macopix-3.4.0-_exit.patch | 11 +++ x11-misc/macopix/macopix-3.4.0-r1.ebuild | 88 +++++++++++++++++++++++ x11-misc/macopix/macopix-3.4.0.ebuild | 87 ---------------------- 5 files changed, 101 insertions(+), 88 deletions(-) create mode 100644 x11-misc/macopix/files/macopix-3.4.0-_exit.patch create mode 100644 x11-misc/macopix/macopix-3.4.0-r1.ebuild delete mode 100644 x11-misc/macopix/macopix-3.4.0.ebuild (limited to 'x11-misc') diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz index ee07a026dd91..6ed0eb234043 100644 Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ diff --git a/x11-misc/macopix/Manifest b/x11-misc/macopix/Manifest index 305d47991355..2d02458871c3 100644 --- a/x11-misc/macopix/Manifest +++ b/x11-misc/macopix/Manifest @@ -1,5 +1,6 @@ AUX macopix-3.4.0-CVE-2015-8614.patch 3701 BLAKE2B 261c5214910d76a8eaf85180aed9bc2ee8a5a4ccf24f011b4211aa2326cff3d2ed1a5aed473cac710f6abfe59737fc05549397d944038ef1cbcd7e0f7ae02119 SHA512 0ea37c298b97edb4fc600e6d86d13ba50849843f20995dc3ac62708eefade7f46397992a9c39d475dab0b39a5928f769b7f862636123dca489541a1cc8704381 AUX macopix-3.4.0-Werror.patch 387 BLAKE2B 0f79e3cd3de0994289cf9b7ff42a849ed70e57c815cdf716892001740e5a5f6b7e335267c388329454aff6f6a62a1bc7d619c6fe7119e796a100e97565ea75fa SHA512 855be914f3e463904261bbef8b48fa35e83d213acb9c787112b1fd6a80b7f13f4bf842bc0617099bcbfae5fff05c69653adfd36e886f6d739c8106a75e78df99 +AUX macopix-3.4.0-_exit.patch 377 BLAKE2B 221f3a245d6bdf066e81bb0e05d65cd85a1a1a472a70355501a67b638ed7abd4ed6aa1db66b93fa282024d3f6f1e12bc9391cdad12af15dc512bce9b0aee1a79 SHA512 00324bac3fe2d528acee5750aee49b6c327f51bae5a4eadcb90afadefd6fd95e177d664f01cdde080a6d9469df804e12930b69f599c195ffb6cf4ce5bf5f8cc4 AUX macopix-3.4.0-fno-common.patch 8807 BLAKE2B b21a6ee329d43b7bec0f86303f5cc2cd49b5731792645053a97be3ee8c56ece1993dac6ab9c727a7528ffa82ab99ff669f553aae2d517fc23c7eaff0c64facb0 SHA512 92866d617ec37bd9ca9214faf199046b561bf91abda2247ffd8cc7f4cb3547ef5e7ebad90c26b32bbe5984c6b51396fa5a2dbce19ce5689b0af1a5dfebaf0cc0 AUX macopix-3.4.0-openssl-1.1.0.patch 185 BLAKE2B 8a89ebc1a9ea5668659793a8d26e8cd930e0e05b2277f0f9cfeee6a7bff0b4b2cfef127f84695ed874b776d3515072915719fb9e6970395b3ad28794647f187f SHA512 95313728a87568338324a20c4f1340cbd576b06eb4c40ee9e862c455e1737662f526d35872dc2514fc65d1d86eebb3a5604390aa92b94bbbe3bba251b3c0d31e AUX macopix-3.4.0-windres.patch 271 BLAKE2B 8bec698d590413b88412b7eedc6bead1849affe54ad6e67f7b80cdce57909bb64b9aba1ca8b3629d179260b93d9094a64fbbe77ead4e9b5883f5920253749788 SHA512 c3d5b80325f18f22e14434561ef26e798b639d5a35a52d718fa5bfa408aa9c77069b979b63b23d3e7594e93fd60da6e93dab77585959ab603ca23468e216d1a4 @@ -14,5 +15,5 @@ DIST macopix-mascot-one-euc-ja-1.02.tar.gz 199796 BLAKE2B 64c303704daadcd47379ea DIST macopix-mascot-pia2-euc-ja-1.02.tar.gz 191520 BLAKE2B 7fa81c34df02751563fff92fba5bde1d60720f659f49d714cbc5d45c93c394b9bae399c65b3950ed3defe929b9058e13bf51d08241ddacc80626e0ac4fa22d0f SHA512 4e0177ca699d9e9caea7a9b6f6d81b41a25e1f05f44c9df1ea31578ddb908fcf12e6463bb84f0536ae25df24aca712b17a0d068d74c587671bb202c8441b7f42 DIST macopix-mascot-triangle_heart-euc-ja-1.02.tar.gz 310099 BLAKE2B f52f2ad14cd9c76f32eb8c582bd07886f50eb6ae2615766306081ea1850b51b205b5177831ca30ab4049fd07081ff42d5dc7c9858efa49ab79a6acf2135ff9b1 SHA512 133a3446a3713192ffef84cd381065b2a99db2eb0dd18692d54e7974eb26aa63eef6d051466ddf89152f6baa8e4625ae6e7e975cf944dd12e0b6cc17c56e5673 DIST macopix-mascot-tsukihime-euc-ja-1.02.tar.gz 616138 BLAKE2B 8616fb0f3b8e4b72c6576dfada3794dc3e387d250e3a6f64eb2b290ef793f62c43f20ef9c03d2b309f4fd3860ce828a562f28ec37ca55ce8e2831315ccbd8a63 SHA512 226a175846a1f81a5aeedab6d7b85e38903d3b85a88a4a2c9a91365ba8a149a9ee54d6174bf8c4595cbe6542d3afcebd440a4185402c2139310664059515a2c5 -EBUILD macopix-3.4.0.ebuild 1984 BLAKE2B aa90484f52f3f06fd0fb50139cdb4a44007caf1daced1fea02083ba087a452ad65ad47bc6e4bd0f76ed059d64d09f2bb615dd92c5a89e79d36a9f3fe88ef50b6 SHA512 55dd93c6142d67caffbf2c365b2b8fbfb39c41617445d7b3053cac5bc2eb744a6e7c9d9b2b1021415d39b54145f0e2fd202ddfa52c416c56486171a21bc0deed +EBUILD macopix-3.4.0-r1.ebuild 2023 BLAKE2B 5703071653e633f53f6cfa58d9c7888eba8da3508959aba34d2bac6069306923f229070dc52449d417f8828dac38272c83fd20ae2bb4942c0f65e3a409befcc9 SHA512 4dded669fdab6b7b0c27a8a5137587d6beafe0a25521197eb826aa576e704db9c6a2a14c43b3e660b8a43dc3df9887e443b468e85bb156de2219feea8607c92a MISC metadata.xml 248 BLAKE2B 68d4e4a22d3db8c6c0b8ae2ec638c33bbdbf493ae55ca863472ea8ae6bc488a01bdb6bafc33dba50946a0f84fbf0456d783dd9517f6ab8a7f78a2e27b2f0c1c3 SHA512 dbe8e263e68bc25e4a20a57bc77013ce510c0591269bf711efa35b5f593ce4d8736d6abadea9bb1eebf5c7ceccea1886ad22a0020b31ac49879507344429a84c diff --git a/x11-misc/macopix/files/macopix-3.4.0-_exit.patch b/x11-misc/macopix/files/macopix-3.4.0-_exit.patch new file mode 100644 index 000000000000..be00b9c2b6a8 --- /dev/null +++ b/x11-misc/macopix/files/macopix-3.4.0-_exit.patch @@ -0,0 +1,11 @@ +diff '--color=auto' -ruN macopix-3.4.0.orig/m4/intdiv0.m4 macopix-3.4.0/m4/intdiv0.m4 +--- macopix-3.4.0.orig/m4/intdiv0.m4 2019-12-26 03:40:38.000000000 +0100 ++++ macopix-3.4.0/m4/intdiv0.m4 2024-11-19 01:03:00.472977096 +0100 +@@ -32,6 +32,7 @@ + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ + #include ++#include + #include + + static void diff --git a/x11-misc/macopix/macopix-3.4.0-r1.ebuild b/x11-misc/macopix/macopix-3.4.0-r1.ebuild new file mode 100644 index 000000000000..f04b437de99a --- /dev/null +++ b/x11-misc/macopix/macopix-3.4.0-r1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application" +HOMEPAGE="https://rosegray.sakura.ne.jp/macopix/index-e.html https://github.com/chimari/MaCoPiX" + +BASE_URI="https://rosegray.sakura.ne.jp/macopix" +SRC_URI="${BASE_URI}/${P}.tar.gz" + +# NOTE: These mascots are not redistributable on commercial CD-ROM. +# The author granted to use them under Gentoo Linux. +MACOPIX_MASCOTS=" + macopix-mascot-HxB-euc-ja-0.30 + macopix-mascot-marimite-euc-ja-2.20 + macopix-mascot-cosmos-euc-ja-1.02 + macopix-mascot-mizuiro-euc-ja-1.02 + macopix-mascot-pia2-euc-ja-1.02 + macopix-mascot-tsukihime-euc-ja-1.02 + macopix-mascot-triangle_heart-euc-ja-1.02 + macopix-mascot-comic_party-euc-ja-1.02 + macopix-mascot-kanon-euc-ja-1.02 + macopix-mascot-one-euc-ja-1.02 +" + +for i in ${MACOPIX_MASCOTS} ; do + SRC_URI+=" ${BASE_URI}/${i}.tar.gz" +done + +# program itself is GPL, and mascots are free-noncomm +LICENSE="GPL-3+ GPL-2+ LGPL-2.1+ free-noncomm" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="gnutls nls" + +RDEPEND=" + dev-libs/glib:2 + media-libs/libpng:0= + sys-devel/gettext + gnutls? ( net-libs/gnutls ) + !gnutls? ( dev-libs/openssl:0= ) + x11-libs/gtk+:3 +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.4.0-CVE-2015-8614.patch + "${FILESDIR}"/${PN}-3.4.0-Werror.patch + "${FILESDIR}"/${PN}-3.4.0-fno-common.patch + "${FILESDIR}"/${PN}-3.4.0-windres.patch + "${FILESDIR}"/${PN}-3.4.0-openssl-1.1.0.patch + "${FILESDIR}"/${PN}-3.4.0-_exit.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf \ + $(use_with gnutls) +} + +src_install() { + default + + dodoc AUTHORS ChangeLog* NEWS *README* + + # install mascots + for d in ${MACOPIX_MASCOTS} ; do + einfo "Installing ${d}..." + cd "${WORKDIR}/${d}" || die + insinto /usr/share/"${PN}" + doins *.mcpx *.menu + insinto /usr/share/"${PN}"/pixmap + doins *.png + docinto "${d}" + dodoc README.jp + done +} diff --git a/x11-misc/macopix/macopix-3.4.0.ebuild b/x11-misc/macopix/macopix-3.4.0.ebuild deleted file mode 100644 index 9cb1ba4dbce9..000000000000 --- a/x11-misc/macopix/macopix-3.4.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application" -HOMEPAGE="https://rosegray.sakura.ne.jp/macopix/index-e.html https://github.com/chimari/MaCoPiX" - -BASE_URI="https://rosegray.sakura.ne.jp/macopix" -SRC_URI="${BASE_URI}/${P}.tar.gz" - -# NOTE: These mascots are not redistributable on commercial CD-ROM. -# The author granted to use them under Gentoo Linux. -MACOPIX_MASCOTS=" - macopix-mascot-HxB-euc-ja-0.30 - macopix-mascot-marimite-euc-ja-2.20 - macopix-mascot-cosmos-euc-ja-1.02 - macopix-mascot-mizuiro-euc-ja-1.02 - macopix-mascot-pia2-euc-ja-1.02 - macopix-mascot-tsukihime-euc-ja-1.02 - macopix-mascot-triangle_heart-euc-ja-1.02 - macopix-mascot-comic_party-euc-ja-1.02 - macopix-mascot-kanon-euc-ja-1.02 - macopix-mascot-one-euc-ja-1.02 -" - -for i in ${MACOPIX_MASCOTS} ; do - SRC_URI+=" ${BASE_URI}/${i}.tar.gz" -done - -# program itself is GPL, and mascots are free-noncomm -LICENSE="GPL-3+ GPL-2+ LGPL-2.1+ free-noncomm" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="gnutls nls" - -RDEPEND=" - dev-libs/glib:2 - media-libs/libpng:0= - sys-devel/gettext - gnutls? ( net-libs/gnutls ) - !gnutls? ( dev-libs/openssl:0= ) - x11-libs/gtk+:3 -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.4.0-CVE-2015-8614.patch - "${FILESDIR}"/${PN}-3.4.0-Werror.patch - "${FILESDIR}"/${PN}-3.4.0-fno-common.patch - "${FILESDIR}"/${PN}-3.4.0-windres.patch - "${FILESDIR}"/${PN}-3.4.0-openssl-1.1.0.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf \ - $(use_with gnutls) -} - -src_install() { - default - - dodoc AUTHORS ChangeLog* NEWS *README* - - # install mascots - for d in ${MACOPIX_MASCOTS} ; do - einfo "Installing ${d}..." - cd "${WORKDIR}/${d}" || die - insinto /usr/share/"${PN}" - doins *.mcpx *.menu - insinto /usr/share/"${PN}"/pixmap - doins *.png - docinto "${d}" - dodoc README.jp - done -} -- cgit v1.2.3