[gentoo-commits] repo/proj/guru:dev commit in: media-gfx/azpainter/files/, media-gfx/azpainter/
commit: 6589ae6d525486533404f8303423bec001288cd1
Author: Anna Vyalkova sysrq in>
AuthorDate: Sun May 16 15:27:13 2021 +
Commit: Anna Vyalkova sysrq in>
CommitDate: Sun May 16 16:11:07 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6589ae6d
media-gfx/azpainter: fix AR and paths, drop old
Closes: https://bugs.gentoo.org/785097
Signed-off-by: Anna Vyalkova sysrq.in>
media-gfx/azpainter/Manifest | 1 -
media-gfx/azpainter/azpainter-2.1.6.ebuild | 36 -
media-gfx/azpainter/azpainter-2.1.7.ebuild | 14 +-
.../files/azpainter-2.1.6-fix_configure.patch | 83 ---
.../files/azpainter-2.1.6-signed_char.patch| 156 -
5 files changed, 13 insertions(+), 277 deletions(-)
diff --git a/media-gfx/azpainter/Manifest b/media-gfx/azpainter/Manifest
index aa609f178..40a96a355 100644
--- a/media-gfx/azpainter/Manifest
+++ b/media-gfx/azpainter/Manifest
@@ -1,2 +1 @@
-DIST azpainter-2.1.6.tar.xz 747464 BLAKE2B
a3d242cb3fa881c761711595686362924e55125f7b33def30949c321b6a23ccb2bed1b4d3df0b7e73ebd4a5f6a75e7c4b99c4116d5e6af62518d03fc92e6de81
SHA512
94ebe3ad8df7148d73a6f73fe383df2d8b9203aa67ef77ebcc68c8fa937ba134315ca757693c5ad33bdf79afd90915779a3086d24f5a81ab767eced50d4d97d9
DIST azpainter-2.1.7.tar.xz 758960 BLAKE2B
a70371777d8f5a8a976032fb13fe21343d852442c3ca1eaa8d4ebdb0aeec25bf9d532a2d03c58c55df629b4a299b2d40100ba83909476d4e0a15b05ea27a5527
SHA512
7edcfe1e3a1f87b6cd3006da288d9a11c3667f49da73d9fa7665f4e2edb90282b30ec356b5f1eda3559b3c51c1f99e585f4b60d6039ba3c8c28da50022f9c798
diff --git a/media-gfx/azpainter/azpainter-2.1.6.ebuild
b/media-gfx/azpainter/azpainter-2.1.6.ebuild
deleted file mode 100644
index 911ef759a..0
--- a/media-gfx/azpainter/azpainter-2.1.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg
-
-DESCRIPTION="Full color painting software for Linux for illustration drawing"
-HOMEPAGE="http://azsky2.html.xdomain.jp/soft/azpainter.html
https://github.com/Symbian9/azpainter";
-SRC_URI="https://github.com/Symbian9/azpainter/releases/download/v${PV}/${P}.tar.xz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXi:=
- media-libs/freetype:=
- media-libs/fontconfig:=
- sys-libs/zlib:=
- media-libs/libpng:=
- media-libs/libjpeg-turbo:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix_configure.patch"
- "${FILESDIR}/${P}-signed_char.patch"
-)
-
-src_configure() {
- sh ./configure --prefix=/usr CC="$(tc-getCC)" CFLAGS="${CFLAGS:-02}"
LDFLAGS="${LDFLAGS}"
-}
diff --git a/media-gfx/azpainter/azpainter-2.1.7.ebuild
b/media-gfx/azpainter/azpainter-2.1.7.ebuild
index d23ebdfa5..0a46c057a 100644
--- a/media-gfx/azpainter/azpainter-2.1.7.ebuild
+++ b/media-gfx/azpainter/azpainter-2.1.7.ebuild
@@ -26,6 +26,18 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+DOCS=( AUTHORS ChangeLog ReadMe_en ReadMe_ja manual_ja.html )
+
src_configure() {
- sh ./configure --prefix=/usr CC="$(tc-getCC)" CFLAGS="${CFLAGS:-02}"
LDFLAGS="${LDFLAGS}"
+ sh ./configure --prefix=/usr CC="$(tc-getCC)" CFLAGS="${CFLAGS:-02}"
LDFLAGS="${LDFLAGS}" || die "./configure failed"
+}
+
+src_compile() {
+ tc-export AR
+ default
+}
+
+src_install() {
+ default
+ rm -r "${D}/usr/share/doc/${PN}" || die
}
diff --git a/media-gfx/azpainter/files/azpainter-2.1.6-fix_configure.patch
b/media-gfx/azpainter/files/azpainter-2.1.6-fix_configure.patch
deleted file mode 100644
index f8824dd68..0
--- a/media-gfx/azpainter/files/azpainter-2.1.6-fix_configure.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 185bf21dd0040a11cbffddb6e4bcf7af46a5bef7 Mon Sep 17 00:00:00 2001
-From: app4soft
-Date: Sun, 26 Apr 2020 06:54:09 +0300
-Subject: [PATCH] Update configure
-
- README| 2 +-
- README_ja | 2 +-
- configure | 11 ++-
- 3 files changed, 8 insertions(+), 7 deletions(-)
- mode change 100755 => 100644 configure
-
-diff --git a/README b/README
-index ba5f2c8..610e423 100644
a/README
-+++ b/README
-@@ -90,7 +90,7 @@ $ gmake
-
- ## MacOS
-
--$ ./configure --prefix=/usr/X11
-+$ ./configure --prefix=/opt/X11
- $ make
- $ sudo make install
-
-diff --git a/README_ja b/README_ja
-index db190f2..997a499 100644
a/README_ja
-+++ b/README_ja
-@@ -102,7 +102,7 @@ $ gmake
-
- ## MacOS
-
--$ ./configure --prefix=/usr/X11
-+$ ./configure --prefix=/opt/X11
- $ make
- $ sudo make install
-
-diff --git a/configure b/configure
-old mode 100755
-new mode 100644
-index cb9a9f6..e98b20f
a/configure
-+++ b/configure
-@@ -9,7 +9,7 @@ cat <<_ZYXW_
-
- Options:
- --help display this help
-- --debugcreate debug exe (CFLAGS += -g)
-+ --debugcreate debug exe (CFLAGS = -g)
[gentoo-commits] repo/proj/guru:dev commit in: media-gfx/azpainter/files/, media-gfx/azpainter/
commit: dc70a5b1918c5cf435e1baf7987a0f848bffb037
Author: Haelwenn (lanodan) Monnier hacktivis me>
AuthorDate: Thu Apr 30 03:35:24 2020 +
Commit: Haelwenn Monnier hacktivis me>
CommitDate: Thu Apr 30 03:35:24 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dc70a5b1
media-gfx/azpainter: Bump to 2.1.6
Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me>
media-gfx/azpainter/Manifest | 1 +
media-gfx/azpainter/azpainter-2.1.6.ebuild | 34 +
.../files/azpainter-2.1.6-fix_configure.patch | 83 +++
.../files/azpainter-2.1.6-signed_char.patch| 156 +
4 files changed, 274 insertions(+)
diff --git a/media-gfx/azpainter/Manifest b/media-gfx/azpainter/Manifest
index 351f1bb..bf31471 100644
--- a/media-gfx/azpainter/Manifest
+++ b/media-gfx/azpainter/Manifest
@@ -1 +1,2 @@
DIST azpainter-2.1.5.tar.xz 825892 BLAKE2B
c6430393bb7dc3fd4b38357f696ec1da567b2b5763ed5e51526fa7948bf8c7a25b8200771607ecd86ed927d3692c5b4a72c471d8e354a7da48aa952b934ea852
SHA512
9797a22d512a26cdf2d441f91c5b77e9a8221433d33359782486f2254fffdaa30daae04da77e899b4068e5988aa67dfda3b7bb915d41a807e3069f84c8d15a3a
+DIST azpainter-2.1.6.tar.xz 747464 BLAKE2B
a3d242cb3fa881c761711595686362924e55125f7b33def30949c321b6a23ccb2bed1b4d3df0b7e73ebd4a5f6a75e7c4b99c4116d5e6af62518d03fc92e6de81
SHA512
94ebe3ad8df7148d73a6f73fe383df2d8b9203aa67ef77ebcc68c8fa937ba134315ca757693c5ad33bdf79afd90915779a3086d24f5a81ab767eced50d4d97d9
diff --git a/media-gfx/azpainter/azpainter-2.1.6.ebuild
b/media-gfx/azpainter/azpainter-2.1.6.ebuild
new file mode 100644
index 000..1176940
--- /dev/null
+++ b/media-gfx/azpainter/azpainter-2.1.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Full color painting software for Linux for illustration drawing"
+HOMEPAGE="http://azsky2.html.xdomain.jp/linux/azpainter.html
https://github.com/Symbian9/azpainter";
+SRC_URI="https://github.com/Symbian9/azpainter/releases/download/v${PV}/${P}.tar.xz";
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ x11-libs/libX11:=
+ x11-libs/libXext:=
+ x11-libs/libXi:=
+ media-libs/freetype:=
+ media-libs/fontconfig:=
+ sys-libs/zlib:=
+ media-libs/libpng:=
+ media-libs/libjpeg-turbo:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix_configure.patch"
+ "${FILESDIR}/${P}-signed_char.patch"
+)
+
+src_configure() {
+ sh ./configure --prefix=/usr CFLAGS="${CFLAGS:-02}" LDFLAGS="${LDFLAGS}"
+}
diff --git a/media-gfx/azpainter/files/azpainter-2.1.6-fix_configure.patch
b/media-gfx/azpainter/files/azpainter-2.1.6-fix_configure.patch
new file mode 100644
index 000..f8824dd
--- /dev/null
+++ b/media-gfx/azpainter/files/azpainter-2.1.6-fix_configure.patch
@@ -0,0 +1,83 @@
+From 185bf21dd0040a11cbffddb6e4bcf7af46a5bef7 Mon Sep 17 00:00:00 2001
+From: app4soft
+Date: Sun, 26 Apr 2020 06:54:09 +0300
+Subject: [PATCH] Update configure
+
+---
+ README| 2 +-
+ README_ja | 2 +-
+ configure | 11 ++-
+ 3 files changed, 8 insertions(+), 7 deletions(-)
+ mode change 100755 => 100644 configure
+
+diff --git a/README b/README
+index ba5f2c8..610e423 100644
+--- a/README
b/README
+@@ -90,7 +90,7 @@ $ gmake
+
+ ## MacOS
+
+-$ ./configure --prefix=/usr/X11
++$ ./configure --prefix=/opt/X11
+ $ make
+ $ sudo make install
+
+diff --git a/README_ja b/README_ja
+index db190f2..997a499 100644
+--- a/README_ja
b/README_ja
+@@ -102,7 +102,7 @@ $ gmake
+
+ ## MacOS
+
+-$ ./configure --prefix=/usr/X11
++$ ./configure --prefix=/opt/X11
+ $ make
+ $ sudo make install
+
+diff --git a/configure b/configure
+old mode 100755
+new mode 100644
+index cb9a9f6..e98b20f
+--- a/configure
b/configure
+@@ -9,7 +9,7 @@ cat <<_ZYXW_
+
+ Options:
+ --help display this help
+- --debugcreate debug exe (CFLAGS += -g)
++ --debugcreate debug exe (CFLAGS = -g)
+ --arch=[ARCH] CFLAGS += "-march=ARCH"
+
+ --prefix=[PREFIX] install dir
+@@ -202,7 +202,8 @@ for opt;do
+ --no-check-lib)
+ cf_check_lib=no ;;
+ *=*)
+- eval "$opt" ;;
++ tmp2=`expr "X$opt" : 'X\([^=]*\)=.*'`
++ eval $tmp2=\'$tmp1\' ;;
+ *)
+ echo "unknown option: $opt"
+ exit 1 ;;
+@@ -226,8 +227,8 @@ tmp1=`uname`
+ if test "$tmp1" = Linux;then cf_os=linux
+ elif test "$tmp1" = Darwin;then
+ cf_os=mac
+- CFLAGS=`fc_add_string "$CFLAGS" "-I/usr/X11/include"`
+- LDFLAGS=`fc_add_string "$LDFLAGS" "-L/usr/X11/lib"`
++ CFLAGS=`fc_add_string "$CFLAGS" "-I/opt/X11/include"`
++ LDFLAGS=`fc_add_string "$LDFLAGS" "-L/opt/X11/lib"`
+ elif test "$tmp1" = FreeBSD;then
+ cf_os=freebsd
+ cf_make=gmake
+@@ -311,7 +312,7 @@ fc_check_lib libjpeg "libjpeg" "" "-lj
