public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/macopix/
@ 2021-02-14 20:10 Jonas Stein
  0 siblings, 0 replies; 8+ messages in thread
From: Jonas Stein @ 2021-02-14 20:10 UTC (permalink / raw
  To: gentoo-commits

commit:     acdc5aba6a4cf192ee0bba008f0d96681ba8eccb
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 20:07:19 2021 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 20:09:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acdc5aba

x11-misc/macopix: Update HOMEPAGE

Source moved to github.

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Jonas Stein <jstein <AT> gentoo.org>

 x11-misc/macopix/macopix-3.4.0.ebuild | 4 ++--
 x11-misc/macopix/metadata.xml         | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/x11-misc/macopix/macopix-3.4.0.ebuild b/x11-misc/macopix/macopix-3.4.0.ebuild
index 4765b8dbb41..b7351081a80 100644
--- a/x11-misc/macopix/macopix-3.4.0.ebuild
+++ b/x11-misc/macopix/macopix-3.4.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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="http://rosegray.sakura.ne.jp/macopix/index-e.html"
+HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html https://github.com/chimari/MaCoPiX"
 
 BASE_URI="http://rosegray.sakura.ne.jp/macopix"
 SRC_URI="${BASE_URI}/${P}.tar.gz"

diff --git a/x11-misc/macopix/metadata.xml b/x11-misc/macopix/metadata.xml
index 7a38bb90096..d5a7512e6c1 100644
--- a/x11-misc/macopix/metadata.xml
+++ b/x11-misc/macopix/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">chimari/MaCoPiX</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/macopix/
@ 2024-07-08 17:40 Ulrich Müller
  0 siblings, 0 replies; 8+ messages in thread
From: Ulrich Müller @ 2024-07-08 17:40 UTC (permalink / raw
  To: gentoo-commits

commit:     8aa9b1dece94610032c8e91a1cc983e804c9e360
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  8 17:36:08 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jul  8 17:40:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa9b1de

x11-misc/macopix: update HOMEPAGE, LICENSE, SRC_URI

Update license of software to "GPL-3+ GPL-2+ LGPL-2.1+".

Leave the license of assets alone for now, as the situation is not
entirely clear.

Bug: https://bugs.gentoo.org/935751
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 x11-misc/macopix/macopix-3.4.0.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/x11-misc/macopix/macopix-3.4.0.ebuild b/x11-misc/macopix/macopix-3.4.0.ebuild
index 530a80225d7f..9cb1ba4dbce9 100644
--- a/x11-misc/macopix/macopix-3.4.0.ebuild
+++ b/x11-misc/macopix/macopix-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,9 +6,9 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application"
-HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html https://github.com/chimari/MaCoPiX"
+HOMEPAGE="https://rosegray.sakura.ne.jp/macopix/index-e.html https://github.com/chimari/MaCoPiX"
 
-BASE_URI="http://rosegray.sakura.ne.jp/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.
@@ -30,8 +30,8 @@ for i in ${MACOPIX_MASCOTS} ; do
 	SRC_URI+=" ${BASE_URI}/${i}.tar.gz"
 done
 
-# program itself is GPL-2, and mascots are free-noncomm
-LICENSE="GPL-2 free-noncomm"
+# 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"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/macopix/
@ 2021-05-16 18:53 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-05-16 18:53 UTC (permalink / raw
  To: gentoo-commits

commit:     75f61ea5a4407d051f5316860275811675bc47c9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 16 18:50:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 16 18:50:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75f61ea5

x11-misc/macopix: Stabilize 3.4.0 x86, #769134

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-misc/macopix/macopix-3.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/macopix/macopix-3.4.0.ebuild b/x11-misc/macopix/macopix-3.4.0.ebuild
index 5183a87da91..530a80225d7 100644
--- a/x11-misc/macopix/macopix-3.4.0.ebuild
+++ b/x11-misc/macopix/macopix-3.4.0.ebuild
@@ -33,7 +33,7 @@ done
 # program itself is GPL-2, and mascots are free-noncomm
 LICENSE="GPL-2 free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="gnutls nls"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/macopix/
@ 2021-05-16 12:45 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-05-16 12:45 UTC (permalink / raw
  To: gentoo-commits

commit:     9647b494f1a9eb2e2d5630244b302c2b1cf7d904
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 16 12:42:38 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 16 12:45:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9647b494

x11-misc/macopix: Stabilize 3.4.0 ppc, #769134

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-misc/macopix/macopix-3.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/macopix/macopix-3.4.0.ebuild b/x11-misc/macopix/macopix-3.4.0.ebuild
index 179c572c44a..5183a87da91 100644
--- a/x11-misc/macopix/macopix-3.4.0.ebuild
+++ b/x11-misc/macopix/macopix-3.4.0.ebuild
@@ -33,7 +33,7 @@ done
 # program itself is GPL-2, and mascots are free-noncomm
 LICENSE="GPL-2 free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE="gnutls nls"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/macopix/
@ 2021-02-14 20:10 Jonas Stein
  0 siblings, 0 replies; 8+ messages in thread
From: Jonas Stein @ 2021-02-14 20:10 UTC (permalink / raw
  To: gentoo-commits

commit:     9cea5bd9721c7a1fa10fa2ad09f3f28eb906d330
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 20:03:18 2021 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 20:09:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cea5bd9

x11-misc/macopix: drop project desktop-misc

Drop project desktop-misc from the list of maintainers.

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Jonas Stein <jstein <AT> gentoo.org>

 x11-misc/macopix/metadata.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/x11-misc/macopix/metadata.xml b/x11-misc/macopix/metadata.xml
index 49c86a887b6..7a38bb90096 100644
--- a/x11-misc/macopix/metadata.xml
+++ b/x11-misc/macopix/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>desktop-misc@gentoo.org</email>
-	<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/macopix/
@ 2020-02-02 13:56 Jeroen Roovers
  0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2020-02-02 13:56 UTC (permalink / raw
  To: gentoo-commits

commit:     fadd2de56fb3cf2d07cb2fbc05b114d35b813b0b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  2 13:55:35 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Feb  2 13:56:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fadd2de5

x11-misc/macopix: Set CFLAGS+=-fcommon

Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-misc/macopix/macopix-1.7.4-r2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x11-misc/macopix/macopix-1.7.4-r2.ebuild b/x11-misc/macopix/macopix-1.7.4-r2.ebuild
index a862222fef2..21fa93789d0 100644
--- a/x11-misc/macopix/macopix-1.7.4-r2.ebuild
+++ b/x11-misc/macopix/macopix-1.7.4-r2.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
@@ -58,6 +58,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cflags -fcommon
 	append-libs -lX11
 
 	econf $(use_with gnutls)


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/macopix/
@ 2019-04-30  7:46 Jeroen Roovers
  0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2019-04-30  7:46 UTC (permalink / raw
  To: gentoo-commits

commit:     ff0b706438d2f8b64c038db15eefbb04a814df07
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 07:44:36 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 07:46:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff0b7064

x11-misc/macopix: Partially work around slow doins bug

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-misc/macopix/macopix-1.7.4-r2.ebuild | 82 ++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/x11-misc/macopix/macopix-1.7.4-r2.ebuild b/x11-misc/macopix/macopix-1.7.4-r2.ebuild
new file mode 100644
index 00000000000..a862222fef2
--- /dev/null
+++ b/x11-misc/macopix/macopix-1.7.4-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application"
+HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html"
+
+BASE_URI="http://rosegray.sakura.ne.jp/macopix"
+SRC_URI="${BASE_URI}/${P}.tar.bz2"
+
+# 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
+
+# programme itself is GPL-2, and mascots are free-noncomm
+LICENSE="GPL-2 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnutls nls"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/libpng:0=
+	sys-devel/gettext
+	x11-libs/gtk+:2
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl:0= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-windres.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	append-libs -lX11
+
+	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
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/macopix/
@ 2017-02-22 10:48 Jeroen Roovers
  0 siblings, 0 replies; 8+ messages in thread
From: Jeroen Roovers @ 2017-02-22 10:48 UTC (permalink / raw
  To: gentoo-commits

commit:     5f1d0abb93f66bb347deea1dc4c844811293b1b2
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 10:48:14 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 10:48:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f1d0abb

x11-misc/macopix: Ignore windres (bug #560622).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 x11-misc/macopix/macopix-1.7.4-r1.ebuild | 87 ++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/x11-misc/macopix/macopix-1.7.4-r1.ebuild b/x11-misc/macopix/macopix-1.7.4-r1.ebuild
new file mode 100644
index 0000000000..6392b64eef
--- /dev/null
+++ b/x11-misc/macopix/macopix-1.7.4-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application"
+HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html"
+
+BASE_URI="http://rosegray.sakura.ne.jp/macopix"
+SRC_URI="${BASE_URI}/${P}.tar.bz2"
+
+# NOTE: These mascots are not redistributable on commercial CD-ROM.
+# The author granted to use them under Gentoo Linux.
+MY_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 ${MY_MASCOTS} ; do
+	SRC_URI="${SRC_URI} ${BASE_URI}/${i}.tar.gz"
+done
+
+# programme itself is GPL-2, and mascots are free-noncomm
+LICENSE="GPL-2 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnutls nls"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/libpng:0=
+	x11-libs/gtk+:2
+	nls? ( >=sys-devel/gettext-0.10 )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl:0= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i -e 's|HAVE_WINDRES_TRUE|HAVE_WINDRES_FALSE|g' src/Makefile.in || die
+
+	append-libs -lX11
+}
+
+src_configure() {
+	econf \
+		--with-gtk2 \
+		$(use_enable nls) \
+		$(use_with gnutls)
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog* NEWS *README*
+
+	# install mascots
+	for d in ${MY_MASCOTS} ; do
+		einfo "Installing ${d}..."
+		cd "${WORKDIR}/${d}" || die
+		insinto /usr/share/"${PN}"
+		for i in *.mcpx *.menu ; do
+			doins "$i" || die
+		done
+		insinto /usr/share/"${PN}"/pixmap
+		for i in *.png ; do
+			doins "$i"
+		done
+		docinto "${d}"
+		dodoc README.jp
+	done
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2024-07-08 17:40 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-14 20:10 [gentoo-commits] repo/gentoo:master commit in: x11-misc/macopix/ Jonas Stein
  -- strict thread matches above, loose matches on Subject: below --
2024-07-08 17:40 Ulrich Müller
2021-05-16 18:53 Sam James
2021-05-16 12:45 Sam James
2021-02-14 20:10 Jonas Stein
2020-02-02 13:56 Jeroen Roovers
2019-04-30  7:46 Jeroen Roovers
2017-02-22 10:48 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox