[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2024-03-07 Thread Alfredo Tupone
commit: 7cf1710ae68c886b496d038cc2af4faef4152fe0
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Thu Mar  7 21:40:55 2024 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Thu Mar  7 21:43:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cf1710a

dev-tcltk/tkimg: drop QA warning

Closes: https://bugs.gentoo.org/926199
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.16.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
index 05382e66b0ca..c8787bd9b569 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
@@ -41,7 +41,7 @@ PATCHES=(
 )
 
 QA_CONFIG_IMPL_DECL_SKIP=(
-   stat64 # used to test for Large File Support
+   opendir64 rewinddir64 closedir64 stat64 # used on AIX
glBegin # used to test for openGL support
glutMainLoop # used to test for glut support
 )



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/files/, dev-tcltk/tkimg/

2024-03-05 Thread Alfredo Tupone
commit: 6aeb488eeb991c598145185cfeff409554509dc3
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Tue Mar  5 19:17:57 2024 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Tue Mar  5 19:18:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aeb488e

dev-tcltk/tkimg: drop 1.4.14-r2

Closes: https://bugs.gentoo.org/920481
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/Manifest   |   1 -
 dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch |  74 ---
 dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild | 119 -
 3 files changed, 194 deletions(-)

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 7391afe1f2f9..5f8bd763509d 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,4 +1,3 @@
-DIST Img-1.4.14-Source.tar.gz 9844859 BLAKE2B 
f373859104c7f1b2d2b5c10adf6b8d3349e22765936916b493589772d2b56e1717cbecf074034989e7e927df16d387ff6533170a1ae9f677ea358a96a86fe67d
 SHA512 
41bfc6909a6836cbdce34f5e5672a02ac67e6d7263a97d48b564994462cc089905a082bd849b6d228750bf09f0cf617989dc9008705938a283fa4e5f1b45
 DIST Img-1.4.15-Source.tar.gz 12108837 BLAKE2B 
b423457f7edceeff38389644e206f2a96204d5f3202a5eb224d9f9a3e4fd2a031c6efb9b53ed72a53441b4d306f4bcdc3ece5d7a08b19e478ed2c74ad66d870e
 SHA512 
f034f7b1cf8b02e0fb80f723927c8512ca67de661b21ee53ea4cf0ec8c09a151466fae0e90395f140834e46e4c231dbce8fefaf870fab41c9dd5a1995fe0d978
 DIST Img-1.4.16-Source.tar.gz 12129708 BLAKE2B 
5da76a42a1643d759d765ade01a8a9e9782cba21d30f5ec95693364d80aca32fa54f610081833d44bf5723e6901d7577e93bd4d4285880e855e835ae6a901f4b
 SHA512 
622549749d41c7c026053cf82b4c434602ff541b9ee7f6f15c2450fcf3cfb34eb8277432267c78adc3dcc60e53fa2d84b7cf98c5fd5a6c3cfbcf0f60746cd227
 DIST tkimg-1.4.14-patchset-1.tar.gz 3256 BLAKE2B 
8f182365b70b4d7a3f4d9002618285b11293644755304600d302fbb8cf8945cd4bd4eb45e66ed0aec93d19e42556ef294508587f7d4e66821ad960ea5c26c7b6
 SHA512 
8c93e2b669b56ce5621a4d6d96e7412f623bd42dd777a99ec74741621a5be84f24f47149efae58baa874f49088b053b8466d16dffd79edf9594195ff41c38c0e

diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch 
b/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
deleted file mode 100644
index 9b889315efb3..
--- a/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
+++ /dev/null
@@ -1,74 +0,0 @@
 a/libtiff/tifftclDecls.h   2023-03-14 18:53:43.978820056 +0100
-+++ b/libtiff/tifftclDecls.h   2023-03-14 18:54:32.583047764 +0100
-@@ -169,10 +169,10 @@
- TIFFTCLAPI intTIFFReadRGBATile(TIFF *tiffptr, uint32_t a,
-   uint32_t b, uint32_t *c);
- /* 57 */
--TIFFTCLAPI intTIFFRGBAImageOK(TIFF *tiffptr, char *a);
-+TIFFTCLAPI intTIFFRGBAImageOK(TIFF *tiffptr, char a[1024]);
- /* 58 */
- TIFFTCLAPI intTIFFRGBAImageBegin(TIFFRGBAImage *a, TIFF 
*tiffptr,
--  int b, char *c);
-+  int b, char c[1024]);
- /* 59 */
- TIFFTCLAPI intTIFFRGBAImageGet(TIFFRGBAImage *d, uint32_t *c,
-   uint32_t b, uint32_t a);
 a/tiff/tiffZip.c   2023-03-14 19:04:42.869354563 +0100
-+++ b/tiff/tiffZip.c   2023-03-14 19:05:14.768849607 +0100
-@@ -22,6 +22,7 @@
-  * OF THIS SOFTWARE.
-  */
- 
-+#include 
- #include "tiffInt.h"
- 
- /*
-@@ -233,7 +234,7 @@
-   we need to simplify this code to reflect a ZLib that is likely 
updated
-   to deal with 8byte memory sizes, though this code will respond
-   appropriately even before we simplify it */
--  sp->stream.avail_out = (uint64)tif->tif_rawdatasize <= 0xU ? 
(uInt)tif->tif_rawdatasize : 0xU;
-+  sp->stream.avail_out = (uint64_t)tif->tif_rawdatasize <= 0xU ? 
(uInt)tif->tif_rawdatasize : 0xU;
-   return (deflateReset(>stream) == Z_OK);
- }
- 
 a/tiff/tiffPixar.c 2023-03-14 20:52:33.865532115 +0100
-+++ b/tiff/tiffPixar.c 2023-03-14 20:54:14.606973646 +0100
-@@ -592,8 +592,8 @@
- #define DecoderState(tif) ((PixarLogState*) (tif)->tif_data)
- #define EncoderState(tif) ((PixarLogState*) (tif)->tif_data)
- 
--static int PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s);
--static int PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s);
-+static int PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s);
-+static int PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s);
- 
- #define PIXARLOGDATAFMT_UNKNOWN   -1
- 
-@@ -747,7 +747,7 @@
- }
- 
- static int
--PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s)
-+PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s)
- {
-   static const char module[] = "PixarLogDecode";
-   TIFFDirectory *td = >tif_dir;
-@@ -,7 +,7 @@
-  * Encode a chunk of pixels.
-  */
- static int
--PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s)
-+PixarLogEncode(TIFF* tif, uint8_t *bp, 

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2024-03-03 Thread Jakov Smolić
commit: 7694fb9460f79add661ca1896b26e8eeb1bf65ec
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Mar  3 10:33:32 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Mar  3 10:33:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7694fb94

dev-tcltk/tkimg: Stabilize 1.4.15 x86, #925556

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.15.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
index 844f570b1b03..d2e13e9f38e1 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 
1-2)/${PN}%20${PV}/${MYP}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2024-03-02 Thread Sam James
commit: 2a93223671ea4dbfc8cb962baec2e8e6c3f948fa
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar  3 02:31:40 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  3 02:31:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a932236

dev-tcltk/tkimg: Stabilize 1.4.15 arm64, #925556

Signed-off-by: Sam James  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.15.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
index d57d34cbc131..844f570b1b03 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 
1-2)/${PN}%20${PV}/${MYP}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2024-03-02 Thread Sam James
commit: cd7e4685bf8b6c4c0f165bd9ef6cad1ae69e9417
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar  2 22:07:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar  2 22:07:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd7e4685

dev-tcltk/tkimg: Stabilize 1.4.15 ppc, #925556

Signed-off-by: Sam James  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.15.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
index 42fd29efcaa0..d57d34cbc131 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 
1-2)/${PN}%20${PV}/${MYP}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2024-02-27 Thread Alfredo Tupone
commit: 19bec25da062afec2afdc1083fac95210299a02a
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Tue Feb 27 13:05:22 2024 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Tue Feb 27 13:05:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19bec25d

dev-tcltk/tkimg: update SRC_URI

Closes: https://bugs.gentoo.org/925614
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.16.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
index 314a997d59a9..05382e66b0ca 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
@@ -9,7 +9,7 @@ MYP=Img-${PV}
 
 DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
 HOMEPAGE="http://tkimg.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 
1-2)/${P}/${MYP}-Source.tar.gz
+SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 
1-2)/${PN}%20${PV}/${MYP}-Source.tar.gz
https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.14-patchset-1.tar.gz;
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2024-02-27 Thread Alfredo Tupone
commit: 6e4a4c382a911861fdbb544ecdf72b83d6cb1be5
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Tue Feb 27 09:27:58 2024 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Tue Feb 27 09:28:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4a4c38

dev-tcltk/tkimg: destabilize 1.4.16 for ~amd64

Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.16.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
index 5c282a5cadad..314a997d59a9 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 
1-2)/${P}/${MYP}-Source.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/, dev-tcltk/tkimg/files/

2024-02-27 Thread Alfredo Tupone
commit: 81ceaa07c8315216e3d9c7b1e0529a3206e81b7f
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Tue Feb 27 08:21:14 2024 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Tue Feb 27 08:21:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ceaa07

dev-tcltk/tkimg: add 1.4.16, drop 1.4.9, 1.4.13

Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/Manifest   |   5 +-
 dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch   |  18 
 dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch  |  11 ---
 dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch |  11 ---
 ...{tkimg-1.4.13-r3.ebuild => tkimg-1.4.16.ebuild} |  41 ++--
 dev-tcltk/tkimg/tkimg-1.4.9-r1.ebuild  | 105 -
 6 files changed, 33 insertions(+), 158 deletions(-)

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 855dd78a5a97..7391afe1f2f9 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,7 +1,4 @@
-DIST Img-1.4.13-Source.tar.gz 8366556 BLAKE2B 
9e9ddeb5681300fdb320a7f428cf1c30bccee51c9b204690c82f37a72283e1f5300227463d878eb9aa3ea92ddab666d1e8aa4e51bf8fbf219058109b8c76432f
 SHA512 
922d22a664a1cab06932361a25d26c23f282037eb342dcc96a60c5a40f40d7e546ce6154d56552a7722c071a004c12a45cc687fc8e139f3edd3a7c7443f3861b
 DIST Img-1.4.14-Source.tar.gz 9844859 BLAKE2B 
f373859104c7f1b2d2b5c10adf6b8d3349e22765936916b493589772d2b56e1717cbecf074034989e7e927df16d387ff6533170a1ae9f677ea358a96a86fe67d
 SHA512 
41bfc6909a6836cbdce34f5e5672a02ac67e6d7263a97d48b564994462cc089905a082bd849b6d228750bf09f0cf617989dc9008705938a283fa4e5f1b45
 DIST Img-1.4.15-Source.tar.gz 12108837 BLAKE2B 
b423457f7edceeff38389644e206f2a96204d5f3202a5eb224d9f9a3e4fd2a031c6efb9b53ed72a53441b4d306f4bcdc3ece5d7a08b19e478ed2c74ad66d870e
 SHA512 
f034f7b1cf8b02e0fb80f723927c8512ca67de661b21ee53ea4cf0ec8c09a151466fae0e90395f140834e46e4c231dbce8fefaf870fab41c9dd5a1995fe0d978
-DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 
958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b
 SHA512 
c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
-DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 
3b172f4a5cae4d9ee0668957a5991317e4ae882f450335412488fd408971717facb0c1e1760dc55c20b14e315246017975699d3c1ff9968c3f8182198d85c62a
 SHA512 
a9b9d9b7d0a1faeb7da02a5c7f2ee363e4cb68914ec5c39867ab6ee35b6df988e36d653536b48512361d3a0130c38683f72bb6a76a251820d8689398de3e73ee
+DIST Img-1.4.16-Source.tar.gz 12129708 BLAKE2B 
5da76a42a1643d759d765ade01a8a9e9782cba21d30f5ec95693364d80aca32fa54f610081833d44bf5723e6901d7577e93bd4d4285880e855e835ae6a901f4b
 SHA512 
622549749d41c7c026053cf82b4c434602ff541b9ee7f6f15c2450fcf3cfb34eb8277432267c78adc3dcc60e53fa2d84b7cf98c5fd5a6c3cfbcf0f60746cd227
 DIST tkimg-1.4.14-patchset-1.tar.gz 3256 BLAKE2B 
8f182365b70b4d7a3f4d9002618285b11293644755304600d302fbb8cf8945cd4bd4eb45e66ed0aec93d19e42556ef294508587f7d4e66821ad960ea5c26c7b6
 SHA512 
8c93e2b669b56ce5621a4d6d96e7412f623bd42dd777a99ec74741621a5be84f24f47149efae58baa874f49088b053b8466d16dffd79edf9594195ff41c38c0e
-DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B 
c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5
 SHA512 
596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8

diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch 
b/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch
deleted file mode 100644
index 23000ac7922c..
--- a/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix build with jpeg-9, bug #520886
-
 a/jpeg/jpeg.c  2010-06-17 15:40:24.0 +0200
-+++ b/jpeg/jpeg.c  2018-02-07 23:26:38.050073397 +0100
-@@ -53,6 +53,13 @@
-  */
- 
- #include "tkimg.h"
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+#define HAVE_BOOLEAN
- #include "jpegtcl.h"
- 
- static int SetupJPegLibrary(Tcl_Interp *interp);

diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch 
b/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch
deleted file mode 100644
index 840e013b6915..
--- a/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/Makefile.in  2022-02-17 20:34:02.134144390 +0100
-+++ b/Makefile.in  2022-02-17 20:32:31.957625786 +0100
-@@ -109,7 +109,7 @@
-   do  \
-   here=`pwd` && \
-   cd $$sub && \
--  $(MAKE) top_builddir=$$here test || exit $$? && \
-+  $(MAKE) top_builddir=$$here libdir=.. test || exit $$? && \
-   cd $$here ; \
-   done
- 

diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch 
b/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch
deleted file mode 100644
index 

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2024-02-26 Thread Sam James
commit: b77b5ea6f7edd3569acc3fdbacbcb5ddd3dc2573
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 26 21:27:52 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 26 21:27:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b77b5ea6

dev-tcltk/tkimg: Stabilize 1.4.15 amd64, #925556

Signed-off-by: Sam James  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.15.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.15.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
index f72a321af1bd..42fd29efcaa0 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 
1-2)/${PN}%20${PV}/${MYP}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/, dev-tcltk/tkimg/files/

2023-09-30 Thread Alfredo Tupone
commit: 1b9df78966c36c607d25f97f10fd66189d083479
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Sat Sep 30 18:26:26 2023 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sat Sep 30 18:28:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b9df789

dev-tcltk/tkimg: add 1.4.15

Closes: https://bugs.gentoo.org/911324
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/Manifest   |   1 +
 dev-tcltk/tkimg/files/tkimg-1.4.15-gcc11.patch |  10 +++
 dev-tcltk/tkimg/tkimg-1.4.15.ebuild| 120 +
 3 files changed, 131 insertions(+)

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 7018b4f78e30..855dd78a5a97 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,5 +1,6 @@
 DIST Img-1.4.13-Source.tar.gz 8366556 BLAKE2B 
9e9ddeb5681300fdb320a7f428cf1c30bccee51c9b204690c82f37a72283e1f5300227463d878eb9aa3ea92ddab666d1e8aa4e51bf8fbf219058109b8c76432f
 SHA512 
922d22a664a1cab06932361a25d26c23f282037eb342dcc96a60c5a40f40d7e546ce6154d56552a7722c071a004c12a45cc687fc8e139f3edd3a7c7443f3861b
 DIST Img-1.4.14-Source.tar.gz 9844859 BLAKE2B 
f373859104c7f1b2d2b5c10adf6b8d3349e22765936916b493589772d2b56e1717cbecf074034989e7e927df16d387ff6533170a1ae9f677ea358a96a86fe67d
 SHA512 
41bfc6909a6836cbdce34f5e5672a02ac67e6d7263a97d48b564994462cc089905a082bd849b6d228750bf09f0cf617989dc9008705938a283fa4e5f1b45
+DIST Img-1.4.15-Source.tar.gz 12108837 BLAKE2B 
b423457f7edceeff38389644e206f2a96204d5f3202a5eb224d9f9a3e4fd2a031c6efb9b53ed72a53441b4d306f4bcdc3ece5d7a08b19e478ed2c74ad66d870e
 SHA512 
f034f7b1cf8b02e0fb80f723927c8512ca67de661b21ee53ea4cf0ec8c09a151466fae0e90395f140834e46e4c231dbce8fefaf870fab41c9dd5a1995fe0d978
 DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 
958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b
 SHA512 
c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
 DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 
3b172f4a5cae4d9ee0668957a5991317e4ae882f450335412488fd408971717facb0c1e1760dc55c20b14e315246017975699d3c1ff9968c3f8182198d85c62a
 SHA512 
a9b9d9b7d0a1faeb7da02a5c7f2ee363e4cb68914ec5c39867ab6ee35b6df988e36d653536b48512361d3a0130c38683f72bb6a76a251820d8689398de3e73ee
 DIST tkimg-1.4.14-patchset-1.tar.gz 3256 BLAKE2B 
8f182365b70b4d7a3f4d9002618285b11293644755304600d302fbb8cf8945cd4bd4eb45e66ed0aec93d19e42556ef294508587f7d4e66821ad960ea5c26c7b6
 SHA512 
8c93e2b669b56ce5621a4d6d96e7412f623bd42dd777a99ec74741621a5be84f24f47149efae58baa874f49088b053b8466d16dffd79edf9594195ff41c38c0e

diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.15-gcc11.patch 
b/dev-tcltk/tkimg/files/tkimg-1.4.15-gcc11.patch
new file mode 100644
index ..72f529482709
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.15-gcc11.patch
@@ -0,0 +1,10 @@
+--- a/tiff/tiffZip.c   2023-03-14 19:04:42.869354563 +0100
 b/tiff/tiffZip.c   2023-03-14 19:05:14.768849607 +0100
+@@ -22,6 +22,7 @@
+  * OF THIS SOFTWARE.
+  */
+ 
++#include 
+ #include "tiffInt.h"
+ 
+ /*

diff --git a/dev-tcltk/tkimg/tkimg-1.4.15.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
new file mode 100644
index ..f72a321af1bd
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4.15.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools edos2unix prefix toolchain-funcs virtualx
+
+MYP=Img-${PV}-Source
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://tkimg.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 
1-2)/${PN}%20${PV}/${MYP}.tar.gz
+   https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.14-patchset-1.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test static-libs"
+
+RDEPEND="
+   dev-lang/tk:=
+   dev-tcltk/tcllib
+   media-libs/tiff:=
+   media-libs/libpng:0=
+   sys-libs/zlib:=
+   x11-libs/libX11
+   media-libs/libjpeg-turbo:="
+DEPEND="${RDEPEND}
+   test? (
+   x11-apps/xhost
+   media-fonts/font-misc-misc
+   media-fonts/font-cursor-misc )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+   "${WORKDIR}"/patchset-1
+   "${FILESDIR}"/${P}-gcc11.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+   stat64 # used to test for Large File Support
+   glBegin # used to test for openGL support
+   glutMainLoop # used to test for glut support
+)
+
+src_prepare() {
+   edos2unix \
+   libjpeg/jpegtclDecls.h \
+   zlib/zlibtclDecls.h \
+   libpng/pngtclDecls.h \
+   tiff/tiffZip.c \
+   tiff/tiffPixar.c \
+   libtiff/tifftclDecls.h
+
+   # libtiff/jpeg unbundle is problematic
+   rm 

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2023-06-04 Thread Arthur Zamarin
commit: c6a1d81d1f24dc12ce80e6e4a225075121e46791
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun  4 16:04:36 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun  4 16:04:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6a1d81d

dev-tcltk/tkimg: Keyword 1.4.14-r2 arm64, #907772

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild
index 38c87072f7ed..db2b40b81a2e 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 
1-2)/${PN}%20${PV}/${MYP}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/files/, dev-tcltk/tkimg/

2023-03-16 Thread Alfredo Tupone
commit: 2f0b759b1aa4bcea8226682f257cf77625db2667
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Thu Mar 16 07:45:09 2023 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Thu Mar 16 07:45:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f0b759b

dev-tcltk/tkimg: fix line endings

Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch | 98 +-
 dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild |  2 +
 2 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch 
b/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
index 6f9e575db2ac..9b889315efb3 100644
--- a/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
@@ -16,59 +16,59 @@
 --- a/tiff/tiffZip.c   2023-03-14 19:04:42.869354563 +0100
 +++ b/tiff/tiffZip.c   2023-03-14 19:05:14.768849607 +0100
 @@ -22,6 +22,7 @@
-  * OF THIS SOFTWARE.
-  */
- 
-+#include 
- #include "tiffInt.h"
- 
- /*
+  * OF THIS SOFTWARE.
+  */
+ 
++#include 
+ #include "tiffInt.h"
+ 
+ /*
 @@ -233,7 +234,7 @@
-   we need to simplify this code to reflect a ZLib that is likely 
updated
-   to deal with 8byte memory sizes, though this code will respond
-   appropriately even before we simplify it */
--  sp->stream.avail_out = (uint64)tif->tif_rawdatasize <= 0xU ? 
(uInt)tif->tif_rawdatasize : 0xU;
-+  sp->stream.avail_out = (uint64_t)tif->tif_rawdatasize <= 0xU ? 
(uInt)tif->tif_rawdatasize : 0xU;
-   return (deflateReset(>stream) == Z_OK);
- }
- 
+   we need to simplify this code to reflect a ZLib that is likely 
updated
+   to deal with 8byte memory sizes, though this code will respond
+   appropriately even before we simplify it */
+-  sp->stream.avail_out = (uint64)tif->tif_rawdatasize <= 0xU ? 
(uInt)tif->tif_rawdatasize : 0xU;
++  sp->stream.avail_out = (uint64_t)tif->tif_rawdatasize <= 0xU ? 
(uInt)tif->tif_rawdatasize : 0xU;
+   return (deflateReset(>stream) == Z_OK);
+ }
+ 
 --- a/tiff/tiffPixar.c 2023-03-14 20:52:33.865532115 +0100
 +++ b/tiff/tiffPixar.c 2023-03-14 20:54:14.606973646 +0100
 @@ -592,8 +592,8 @@
- #define DecoderState(tif) ((PixarLogState*) (tif)->tif_data)
- #define EncoderState(tif) ((PixarLogState*) (tif)->tif_data)
- 
--static int PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s);
--static int PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s);
-+static int PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s);
-+static int PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s);
- 
- #define PIXARLOGDATAFMT_UNKNOWN   -1
- 
+ #define DecoderState(tif) ((PixarLogState*) (tif)->tif_data)
+ #define EncoderState(tif) ((PixarLogState*) (tif)->tif_data)
+ 
+-static int PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s);
+-static int PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s);
++static int PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s);
++static int PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s);
+ 
+ #define PIXARLOGDATAFMT_UNKNOWN   -1
+ 
 @@ -747,7 +747,7 @@
- }
- 
- static int
--PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s)
-+PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s)
- {
-   static const char module[] = "PixarLogDecode";
-   TIFFDirectory *td = >tif_dir;
+ }
+ 
+ static int
+-PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s)
++PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s)
+ {
+   static const char module[] = "PixarLogDecode";
+   TIFFDirectory *td = >tif_dir;
 @@ -,7 +,7 @@
-  * Encode a chunk of pixels.
-  */
- static int
--PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s)
-+PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s)
- {
-   static const char module[] = "PixarLogEncode";
-   TIFFDirectory *td = >tif_dir;
+  * Encode a chunk of pixels.
+  */
+ static int
+-PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s)
++PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s)
+ {
+   static const char module[] = "PixarLogEncode";
+   TIFFDirectory *td = >tif_dir;
 @@ -1411,7 +1411,7 @@
-   /*
-* Allocate state block so tag methods have storage to record values.
-*/
--  tif->tif_data = (uint8_t) TkimgTIFFmalloc(sizeof (PixarLogState));
-+  tif->tif_data = (uint8_t *) TkimgTIFFmalloc(sizeof (PixarLogState));
-   if (tif->tif_data == NULL)
-   goto bad;
-   sp = (PixarLogState*) tif->tif_data;
+   /*
+* Allocate state block so tag methods have storage to record values.
+*/
+-  tif->tif_data = (uint8_t) TkimgTIFFmalloc(sizeof (PixarLogState));
++  tif->tif_data = 

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/files/, dev-tcltk/tkimg/

2023-03-14 Thread Alfredo Tupone
commit: 38f7fe2ccd1202077ddc49cb4de13f77a42f80f1
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Tue Mar 14 20:29:02 2023 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Tue Mar 14 20:29:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38f7fe2c

dev-tcltk/tkimg: fix gcc13 compilation

Closes: https://bugs.gentoo.org/895822
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch | 74 ++
 ...img-1.4.14-r1.ebuild => tkimg-1.4.14-r2.ebuild} | 17 -
 2 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch 
b/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
new file mode 100644
index ..6f9e575db2ac
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
@@ -0,0 +1,74 @@
+--- a/libtiff/tifftclDecls.h   2023-03-14 18:53:43.978820056 +0100
 b/libtiff/tifftclDecls.h   2023-03-14 18:54:32.583047764 +0100
+@@ -169,10 +169,10 @@
+ TIFFTCLAPI intTIFFReadRGBATile(TIFF *tiffptr, uint32_t a,
+   uint32_t b, uint32_t *c);
+ /* 57 */
+-TIFFTCLAPI intTIFFRGBAImageOK(TIFF *tiffptr, char *a);
++TIFFTCLAPI intTIFFRGBAImageOK(TIFF *tiffptr, char a[1024]);
+ /* 58 */
+ TIFFTCLAPI intTIFFRGBAImageBegin(TIFFRGBAImage *a, TIFF 
*tiffptr,
+-  int b, char *c);
++  int b, char c[1024]);
+ /* 59 */
+ TIFFTCLAPI intTIFFRGBAImageGet(TIFFRGBAImage *d, uint32_t *c,
+   uint32_t b, uint32_t a);
+--- a/tiff/tiffZip.c   2023-03-14 19:04:42.869354563 +0100
 b/tiff/tiffZip.c   2023-03-14 19:05:14.768849607 +0100
+@@ -22,6 +22,7 @@
+  * OF THIS SOFTWARE.
+  */
+ 
++#include 
+ #include "tiffInt.h"
+ 
+ /*
+@@ -233,7 +234,7 @@
+   we need to simplify this code to reflect a ZLib that is likely 
updated
+   to deal with 8byte memory sizes, though this code will respond
+   appropriately even before we simplify it */
+-  sp->stream.avail_out = (uint64)tif->tif_rawdatasize <= 0xU ? 
(uInt)tif->tif_rawdatasize : 0xU;
++  sp->stream.avail_out = (uint64_t)tif->tif_rawdatasize <= 0xU ? 
(uInt)tif->tif_rawdatasize : 0xU;
+   return (deflateReset(>stream) == Z_OK);
+ }
+ 
+--- a/tiff/tiffPixar.c 2023-03-14 20:52:33.865532115 +0100
 b/tiff/tiffPixar.c 2023-03-14 20:54:14.606973646 +0100
+@@ -592,8 +592,8 @@
+ #define DecoderState(tif) ((PixarLogState*) (tif)->tif_data)
+ #define EncoderState(tif) ((PixarLogState*) (tif)->tif_data)
+ 
+-static int PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s);
+-static int PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s);
++static int PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s);
++static int PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s);
+ 
+ #define PIXARLOGDATAFMT_UNKNOWN   -1
+ 
+@@ -747,7 +747,7 @@
+ }
+ 
+ static int
+-PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s)
++PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s)
+ {
+   static const char module[] = "PixarLogDecode";
+   TIFFDirectory *td = >tif_dir;
+@@ -,7 +,7 @@
+  * Encode a chunk of pixels.
+  */
+ static int
+-PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s)
++PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s)
+ {
+   static const char module[] = "PixarLogEncode";
+   TIFFDirectory *td = >tif_dir;
+@@ -1411,7 +1411,7 @@
+   /*
+* Allocate state block so tag methods have storage to record values.
+*/
+-  tif->tif_data = (uint8_t) TkimgTIFFmalloc(sizeof (PixarLogState));
++  tif->tif_data = (uint8_t *) TkimgTIFFmalloc(sizeof (PixarLogState));
+   if (tif->tif_data == NULL)
+   goto bad;
+   sp = (PixarLogState*) tif->tif_data;

diff --git a/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild
similarity index 89%
rename from dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
rename to dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild
index c92ed64bf558..904cc6621894 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild
@@ -35,7 +35,10 @@ RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MYP}"
 
-PATCHES=( "${WORKDIR}"/patchset-1 )
+PATCHES=(
+   "${WORKDIR}"/patchset-1
+   "${FILESDIR}"/${P}-gcc11.patch
+)
 
 QA_CONFIG_IMPL_DECL_SKIP=(
stat64 # used to test for Large File Support
@@ -50,6 +53,9 @@ src_prepare() {
libpng/pngtclDecls.h \
libtiff/tifftclDecls.h
 
+   # libtiff unbundle is problematic
+   rm ../patchset-1/tkimg-1.4.12-tiff.patch || die
+
default
 
echo "unknown" > manifest.uuid || die
@@ -69,6 +75,15 @@ src_prepare() {
tc-export AR
 }
 
+src_configure() {
+   

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2023-03-12 Thread Alfredo Tupone
commit: cc47d347d4a8aee71fc55cb51374532dadc438d9
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Sun Mar 12 08:05:02 2023 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sun Mar 12 08:06:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc47d347

dev-tcltk/tkimg: stat64, glBegin, glutMainLoop checks are allowed

Closes: https://bugs.gentoo.org/898808
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
index 6d568a5b72c4..c92ed64bf558 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
@@ -37,6 +37,12 @@ S="${WORKDIR}/${MYP}"
 
 PATCHES=( "${WORKDIR}"/patchset-1 )
 
+QA_CONFIG_IMPL_DECL_SKIP=(
+   stat64 # used to test for Large File Support
+   glBegin # used to test for openGL support
+   glutMainLoop # used to test for glut support
+)
+
 src_prepare() {
edos2unix \
libjpeg/jpegtclDecls.h \



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2023-01-17 Thread Alfredo Tupone
commit: b9a559caf019d5428edb76d805ecf669fd09c8bc
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Tue Jan 17 20:11:21 2023 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Tue Jan 17 20:12:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9a559ca

dev-tcltk/tkimg: fix sed warning

Closes: https://bugs.gentoo.org/885669
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
index c10f8384040a..ba356225e0c5 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
@@ -55,7 +55,7 @@ src_prepare() {
 
eautoreconf
for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap 
png\
-   ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
+   ppm ps sgi sun tga tiff window xbm xpm dted raw flir 
compat/libtiff ; do
(cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
done
 



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2023-01-06 Thread Alfredo Tupone
commit: 0ad115377e221fe210690ad36fea6de7a2e076fd
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Sat Jan  7 05:14:43 2023 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sat Jan  7 05:15:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad11537

dev-tcltk/tkimg: better fix for svn

Closes: https://bugs.gentoo.org/889900
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
index b5a52d0b6d6b..fcbe6aadd947 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
@@ -46,7 +46,7 @@ src_prepare() {
 
default
 
-   echo "#define TKIMG_VERSION_UUID unknown" > base/tkimgUuid.h || die
+   echo "unknown" > manifest.uuid || die
 
find compat/libtiff/config -name ltmain.sh -delete || die
sed -i \



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2023-01-06 Thread Alfredo Tupone
commit: 21eb8e7ffc42bd0754b989ae73cac04165c1f766
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Fri Jan  6 19:13:59 2023 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Fri Jan  6 19:14:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21eb8e7f

dev-tcltk/tkimg: avoid use of svn

Closes: https://bugs.gentoo.org/889938
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/{tkimg-1.4.14.ebuild => tkimg-1.4.14-r1.ebuild} | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.14.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
similarity index 96%
rename from dev-tcltk/tkimg/tkimg-1.4.14.ebuild
rename to dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
index 9596578dcdb3..b5a52d0b6d6b 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.14.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.14-r1.ebuild
@@ -46,6 +46,8 @@ src_prepare() {
 
default
 
+   echo "#define TKIMG_VERSION_UUID unknown" > base/tkimgUuid.h || die
+
find compat/libtiff/config -name ltmain.sh -delete || die
sed -i \
-e 's:"--with-CC=$TIFFCC"::' \



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2023-01-06 Thread Alfredo Tupone
commit: cb9cfd13df65ec2274f153e8a833811676a53344
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Fri Jan  6 08:54:52 2023 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Fri Jan  6 08:55:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb9cfd13

dev-tcltk/tkimg: add 1.4.14

Closes: https://bugs.gentoo.org/889778
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/Manifest|  2 +
 dev-tcltk/tkimg/tkimg-1.4.14.ebuild | 94 +
 2 files changed, 96 insertions(+)

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index e526bed615b5..7018b4f78e30 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,4 +1,6 @@
 DIST Img-1.4.13-Source.tar.gz 8366556 BLAKE2B 
9e9ddeb5681300fdb320a7f428cf1c30bccee51c9b204690c82f37a72283e1f5300227463d878eb9aa3ea92ddab666d1e8aa4e51bf8fbf219058109b8c76432f
 SHA512 
922d22a664a1cab06932361a25d26c23f282037eb342dcc96a60c5a40f40d7e546ce6154d56552a7722c071a004c12a45cc687fc8e139f3edd3a7c7443f3861b
+DIST Img-1.4.14-Source.tar.gz 9844859 BLAKE2B 
f373859104c7f1b2d2b5c10adf6b8d3349e22765936916b493589772d2b56e1717cbecf074034989e7e927df16d387ff6533170a1ae9f677ea358a96a86fe67d
 SHA512 
41bfc6909a6836cbdce34f5e5672a02ac67e6d7263a97d48b564994462cc089905a082bd849b6d228750bf09f0cf617989dc9008705938a283fa4e5f1b45
 DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 
958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b
 SHA512 
c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
 DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 
3b172f4a5cae4d9ee0668957a5991317e4ae882f450335412488fd408971717facb0c1e1760dc55c20b14e315246017975699d3c1ff9968c3f8182198d85c62a
 SHA512 
a9b9d9b7d0a1faeb7da02a5c7f2ee363e4cb68914ec5c39867ab6ee35b6df988e36d653536b48512361d3a0130c38683f72bb6a76a251820d8689398de3e73ee
+DIST tkimg-1.4.14-patchset-1.tar.gz 3256 BLAKE2B 
8f182365b70b4d7a3f4d9002618285b11293644755304600d302fbb8cf8945cd4bd4eb45e66ed0aec93d19e42556ef294508587f7d4e66821ad960ea5c26c7b6
 SHA512 
8c93e2b669b56ce5621a4d6d96e7412f623bd42dd777a99ec74741621a5be84f24f47149efae58baa874f49088b053b8466d16dffd79edf9594195ff41c38c0e
 DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B 
c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5
 SHA512 
596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8

diff --git a/dev-tcltk/tkimg/tkimg-1.4.14.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.14.ebuild
new file mode 100644
index ..9596578dcdb3
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4.14.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools edos2unix prefix toolchain-funcs virtualx
+
+MYP=Img-${PV}-Source
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://tkimg.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 
1-2)/${PN}%20${PV}/${MYP}.tar.gz
+   https://dev.gentoo.org/~tupone/distfiles/${P}-patchset-1.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test static-libs"
+
+RDEPEND="
+   dev-lang/tk:=
+   dev-tcltk/tcllib
+   media-libs/tiff:=
+   media-libs/libpng:0=
+   sys-libs/zlib:=
+   x11-libs/libX11
+   media-libs/libjpeg-turbo:="
+DEPEND="${RDEPEND}
+   test? (
+   x11-apps/xhost
+   media-fonts/font-misc-misc
+   media-fonts/font-cursor-misc )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=( "${WORKDIR}"/patchset-1 )
+
+src_prepare() {
+   edos2unix \
+   libjpeg/jpegtclDecls.h \
+   zlib/zlibtclDecls.h \
+   libpng/pngtclDecls.h \
+   libtiff/tifftclDecls.h
+
+   default
+
+   find compat/libtiff/config -name ltmain.sh -delete || die
+   sed -i \
+   -e 's:"--with-CC=$TIFFCC"::' \
+   libtiff/configure.ac || die
+
+   eautoreconf
+   for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap 
png\
+   ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
+   (cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
+   done
+
+   eprefixify */*.h
+   tc-export AR
+}
+
+src_test() {
+   virtx default
+}
+
+src_install() {
+   local l bl
+
+   emake \
+   DESTDIR="${D}" \
+   INSTALL_ROOT="${D}" \
+   install
+
+   if ! use static-libs; then
+   find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || 
die
+   fi
+
+   # Make library links
+   for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
+

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2022-12-06 Thread Arthur Zamarin
commit: 735fdbd2464c310406c762de0523bae5f2a68fe4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Dec  6 15:18:12 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Dec  6 15:18:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735fdbd2

dev-tcltk/tkimg: Stabilize 1.4.13-r1 amd64, #882559

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
index e9ef037f8455..9dbed868fcf9 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 
1-2)/${PN}%20${PV}/${MYP}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2022-12-02 Thread Arthur Zamarin
commit: a5d2d83de71246bd65cf6db17668fb3656aaf2a5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  2 12:15:49 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  2 12:15:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d2d83d

dev-tcltk/tkimg: Stabilize 1.4.13-r1 x86, #882559

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
index 390b303ad9a9..e9ef037f8455 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 
1-2)/${PN}%20${PV}/${MYP}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2022-11-22 Thread Arthur Zamarin
commit: b407d9d6e3c361c6ddb36f9236d740f3e6b216cc
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Nov 23 05:28:16 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Nov 23 05:28:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b407d9d6

dev-tcltk/tkimg: Stabilize 1.4.13-r1 ppc, #882559

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
index db7ad94098e9..390b303ad9a9 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 
1-2)/${PN}%20${PV}/${MYP}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2022-05-16 Thread Alfredo Tupone
commit: b18643fc6c64a8731d43b173915521d53958b102
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Mon May 16 18:57:38 2022 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Mon May 16 18:57:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b18643fc

dev-tcltk/tkimg: deprecated virtual/jpeg

remove olds

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/Manifest   |   3 -
 dev-tcltk/tkimg/tkimg-1.4.11.ebuild|  98 
 dev-tcltk/tkimg/tkimg-1.4.12.ebuild| 103 -
 ...{tkimg-1.4.13.ebuild => tkimg-1.4.13-r1.ebuild} |   2 +-
 4 files changed, 1 insertion(+), 205 deletions(-)

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 333af997c684..e526bed615b5 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,7 +1,4 @@
-DIST Img-1.4.11-Source.tar.gz 7610956 BLAKE2B 
f461ddb07681c15ca68f8a023808c1c9aec63eefe434c46e09b22f48025b3ec4b095fa44092e30799af3a0435562fd1917613a7ed3f9612d166014cd34834142
 SHA512 
792223fdb310370937669ef537662947f087131a001281e8923095892b585354690612a339d03f3939b91870016256c37e41aa6305db70e8db1b5ab590610751
-DIST Img-1.4.12-Source.tar.gz 8363871 BLAKE2B 
ba33908be9d44979e6f97c9194dde6ba30fe15593d80fe47cfad22d1d9e81a9e2ca3f2f19adf2c851fb89ad543f28be7e519ed822d3497b073ec93525272e60b
 SHA512 
40602443657c7c0c7196cfad73ca83e3e473c9d08a1f378a6371a61a8eb98dd90ad8cf9aaf4c54fe6388d4abd969b2643029453871dee6dbcf909fa85b039a1a
 DIST Img-1.4.13-Source.tar.gz 8366556 BLAKE2B 
9e9ddeb5681300fdb320a7f428cf1c30bccee51c9b204690c82f37a72283e1f5300227463d878eb9aa3ea92ddab666d1e8aa4e51bf8fbf219058109b8c76432f
 SHA512 
922d22a664a1cab06932361a25d26c23f282037eb342dcc96a60c5a40f40d7e546ce6154d56552a7722c071a004c12a45cc687fc8e139f3edd3a7c7443f3861b
 DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 
958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b
 SHA512 
c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
-DIST tkimg-1.4.11-patchset-1.tar.gz 9864 BLAKE2B 
bee2ddd4b0ada51f9aeffc1e4ddcb9ea2d3fec37eccdaf9a1d26551e7e2dd01a466cad91ea33635ce674261d92fc1dc1fa80f3d19dffd92bb5f9bb5425820318
 SHA512 
013a70826c5a7b083479e6a4cb56421384400dda9ca05b7216b877b9a79d009ee0f80db25c0b0e51b05904b7d74f4d0220cdb92e819404422743c06a1199245f
 DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 
3b172f4a5cae4d9ee0668957a5991317e4ae882f450335412488fd408971717facb0c1e1760dc55c20b14e315246017975699d3c1ff9968c3f8182198d85c62a
 SHA512 
a9b9d9b7d0a1faeb7da02a5c7f2ee363e4cb68914ec5c39867ab6ee35b6df988e36d653536b48512361d3a0130c38683f72bb6a76a251820d8689398de3e73ee
 DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B 
c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5
 SHA512 
596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8

diff --git a/dev-tcltk/tkimg/tkimg-1.4.11.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
deleted file mode 100644
index aeaed13849ef..
--- a/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools edos2unix prefix toolchain-funcs
-
-MYP=Img-${PV}-Source
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://tkimg.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
-   https://dev.gentoo.org/~tupone/distfiles/${P}-patchset-1.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test static-libs"
-
-RDEPEND="
-   dev-lang/tk:=
-   >=dev-tcltk/tcllib-1.11
-   media-libs/tiff:0=
-   >=media-libs/libpng-1.6:0=
-   >=sys-libs/zlib-1.2.7:=
-   x11-libs/libX11
-   virtual/jpeg:="
-DEPEND="${RDEPEND}
-   test? (
-   x11-apps/xhost
-   media-fonts/font-misc-misc
-   media-fonts/font-cursor-misc )"
-
-# Fails tests
-RESTRICT="test"
-
-S="${WORKDIR}/Img-${PV}"
-
-PATCHES=( "${WORKDIR}"/patchset-1 )
-
-src_prepare() {
-   edos2unix \
-   libjpeg/jpegtclDecls.h \
-   libjpeg/Makefile.in \
-   zlib/Makefile.in \
-   zlib/zlibtcl.decls \
-   zlib/zlibtclDecls.h \
-   libpng/Makefile.in \
-   libpng/pngtclDecls.h \
-   libtiff/Makefile.in \
-   libtiff/tifftclDecls.h \
-   libtiff/tifftclStubInit.c \
-   tiff/tiff.c \
-   jpeg/jpeg.c
-
-   default
-
-   find . -name configure -delete || die
-   find 

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/files/, dev-tcltk/tkimg/

2022-02-17 Thread Alfredo Tupone
commit: 4204f6e8cd2485fa224b25bd2be8182f578608b9
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Thu Feb 17 19:38:52 2022 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Thu Feb 17 19:38:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4204f6e8

dev-tcltk/tkimg: fix test when not installed

Closes: https://bugs.gentoo.org/804106
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch | 11 +++
 dev-tcltk/tkimg/tkimg-1.4.13.ebuild   |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch 
b/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch
new file mode 100644
index ..840e013b6915
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.13-test.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in  2022-02-17 20:34:02.134144390 +0100
 b/Makefile.in  2022-02-17 20:32:31.957625786 +0100
+@@ -109,7 +109,7 @@
+   do  \
+   here=`pwd` && \
+   cd $$sub && \
+-  $(MAKE) top_builddir=$$here test || exit $$? && \
++  $(MAKE) top_builddir=$$here libdir=.. test || exit $$? && \
+   cd $$here ; \
+   done
+ 

diff --git a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
index feba8d5b635d..1c8ec49d4031 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,6 +37,7 @@ S="${WORKDIR}/Img-${PV}"
 
 PATCHES=(
"${WORKDIR}"/patchset-1
+   "${FILESDIR}"/${P}-test.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2021-09-18 Thread Alfredo Tupone
commit: 38311978ebda6eb23d1209a1156abd649786826b
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Sat Sep 18 16:42:35 2021 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sat Sep 18 16:51:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38311978

dev-tcltk/tkimg: UnusedInherits

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.11.ebuild | 2 +-
 dev-tcltk/tkimg/tkimg-1.4.9.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.11.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
index 8d8832a9133..aeaed13849e 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools edos2unix prefix toolchain-funcs virtualx
+inherit autotools edos2unix prefix toolchain-funcs
 
 MYP=Img-${PV}-Source
 

diff --git a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
index f4ada05bc3e..f021bfd25d4 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools edos2unix prefix toolchain-funcs virtualx
+inherit autotools edos2unix prefix toolchain-funcs
 
 MYP=Img-${PV}-Source
 



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2021-01-23 Thread Alfredo Tupone
commit: d0947972a50854d235d67dac26c6e3cf26335b21
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Sat Jan 23 12:37:41 2021 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sat Jan 23 12:37:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0947972

dev-tcltk/tkimg: fix unrecognized configure options

Closes: https://bugs.gentoo.org/766591
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.13.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
index bf3fb5a99df..2ca0ab7549a 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
@@ -46,6 +46,9 @@ src_prepare() {
libtiff/tifftclDecls.h
default
find compat/libtiff/config -name ltmain.sh -delete
+   sed -i \
+   -e 's:"--with-CC=$TIFFCC"::' \
+   libtiff/configure.ac || die
 
eautoreconf
for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap 
png\



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2021-01-22 Thread Alfredo Tupone
commit: 8cb1c2e4afdd54bca1e8291b3827bc89515ea552
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Fri Jan 22 18:23:52 2021 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Fri Jan 22 18:23:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb1c2e4

dev-tcltk/tkimg: version bump to 1.4.13

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/Manifest|  1 +
 dev-tcltk/tkimg/tkimg-1.4.13.ebuild | 90 +
 2 files changed, 91 insertions(+)

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 9324e540ae5..333af997c68 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,5 +1,6 @@
 DIST Img-1.4.11-Source.tar.gz 7610956 BLAKE2B 
f461ddb07681c15ca68f8a023808c1c9aec63eefe434c46e09b22f48025b3ec4b095fa44092e30799af3a0435562fd1917613a7ed3f9612d166014cd34834142
 SHA512 
792223fdb310370937669ef537662947f087131a001281e8923095892b585354690612a339d03f3939b91870016256c37e41aa6305db70e8db1b5ab590610751
 DIST Img-1.4.12-Source.tar.gz 8363871 BLAKE2B 
ba33908be9d44979e6f97c9194dde6ba30fe15593d80fe47cfad22d1d9e81a9e2ca3f2f19adf2c851fb89ad543f28be7e519ed822d3497b073ec93525272e60b
 SHA512 
40602443657c7c0c7196cfad73ca83e3e473c9d08a1f378a6371a61a8eb98dd90ad8cf9aaf4c54fe6388d4abd969b2643029453871dee6dbcf909fa85b039a1a
+DIST Img-1.4.13-Source.tar.gz 8366556 BLAKE2B 
9e9ddeb5681300fdb320a7f428cf1c30bccee51c9b204690c82f37a72283e1f5300227463d878eb9aa3ea92ddab666d1e8aa4e51bf8fbf219058109b8c76432f
 SHA512 
922d22a664a1cab06932361a25d26c23f282037eb342dcc96a60c5a40f40d7e546ce6154d56552a7722c071a004c12a45cc687fc8e139f3edd3a7c7443f3861b
 DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 
958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b
 SHA512 
c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
 DIST tkimg-1.4.11-patchset-1.tar.gz 9864 BLAKE2B 
bee2ddd4b0ada51f9aeffc1e4ddcb9ea2d3fec37eccdaf9a1d26551e7e2dd01a466cad91ea33635ce674261d92fc1dc1fa80f3d19dffd92bb5f9bb5425820318
 SHA512 
013a70826c5a7b083479e6a4cb56421384400dda9ca05b7216b877b9a79d009ee0f80db25c0b0e51b05904b7d74f4d0220cdb92e819404422743c06a1199245f
 DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 
3b172f4a5cae4d9ee0668957a5991317e4ae882f450335412488fd408971717facb0c1e1760dc55c20b14e315246017975699d3c1ff9968c3f8182198d85c62a
 SHA512 
a9b9d9b7d0a1faeb7da02a5c7f2ee363e4cb68914ec5c39867ab6ee35b6df988e36d653536b48512361d3a0130c38683f72bb6a76a251820d8689398de3e73ee

diff --git a/dev-tcltk/tkimg/tkimg-1.4.13.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
new file mode 100644
index 000..bf3fb5a99df
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4.13.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils multilib prefix toolchain-funcs virtualx
+
+MYP=Img-${PV}-Source
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://tkimg.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
+   https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.12-patchset-1.tar.gz;
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test static-libs"
+
+RDEPEND="
+   dev-lang/tk:=
+   dev-tcltk/tcllib
+   media-libs/tiff:0=
+   media-libs/libpng:0=
+   sys-libs/zlib:=
+   x11-libs/libX11
+   virtual/jpeg:="
+DEPEND="${RDEPEND}
+   test? (
+   x11-apps/xhost
+   media-fonts/font-misc-misc
+   media-fonts/font-cursor-misc )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/Img-${PV}"
+
+PATCHES=(
+   "${WORKDIR}"/patchset-1
+)
+
+src_prepare() {
+   edos2unix \
+   libjpeg/jpegtclDecls.h \
+   zlib/zlibtclDecls.h \
+   libpng/pngtclDecls.h \
+   libtiff/tifftclDecls.h
+   default
+   find compat/libtiff/config -name ltmain.sh -delete
+
+   eautoreconf
+   for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap 
png\
+   ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
+   (cd $dir; AT_NOELIBTOOLIZE=yes eautoreconf)
+   done
+
+   eprefixify */*.h
+   tc-export AR
+}
+
+src_test() {
+   virtx default
+}
+
+src_install() {
+   local l bl
+
+   emake \
+   DESTDIR="${D}" \
+   INSTALL_ROOT="${D}" \
+   install
+
+   if ! use static-libs; then
+   find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || 
die
+   fi
+
+   # Make library links
+   for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
+   bl=$(basename $l)
+   dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
+   done
+
+   

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2021-01-21 Thread Alfredo Tupone
commit: f7b59183a354a8659ed29264bb527f2ae7bc6d3e
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Thu Jan 21 22:02:39 2021 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Thu Jan 21 22:02:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7b59183

dev-tcltk/tkimg: version bump to 1.4.12

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/Manifest|  2 +
 dev-tcltk/tkimg/tkimg-1.4.12.ebuild | 98 +
 2 files changed, 100 insertions(+)

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 3a5908c7bc7..9324e540ae5 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,4 +1,6 @@
 DIST Img-1.4.11-Source.tar.gz 7610956 BLAKE2B 
f461ddb07681c15ca68f8a023808c1c9aec63eefe434c46e09b22f48025b3ec4b095fa44092e30799af3a0435562fd1917613a7ed3f9612d166014cd34834142
 SHA512 
792223fdb310370937669ef537662947f087131a001281e8923095892b585354690612a339d03f3939b91870016256c37e41aa6305db70e8db1b5ab590610751
+DIST Img-1.4.12-Source.tar.gz 8363871 BLAKE2B 
ba33908be9d44979e6f97c9194dde6ba30fe15593d80fe47cfad22d1d9e81a9e2ca3f2f19adf2c851fb89ad543f28be7e519ed822d3497b073ec93525272e60b
 SHA512 
40602443657c7c0c7196cfad73ca83e3e473c9d08a1f378a6371a61a8eb98dd90ad8cf9aaf4c54fe6388d4abd969b2643029453871dee6dbcf909fa85b039a1a
 DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 
958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b
 SHA512 
c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
 DIST tkimg-1.4.11-patchset-1.tar.gz 9864 BLAKE2B 
bee2ddd4b0ada51f9aeffc1e4ddcb9ea2d3fec37eccdaf9a1d26551e7e2dd01a466cad91ea33635ce674261d92fc1dc1fa80f3d19dffd92bb5f9bb5425820318
 SHA512 
013a70826c5a7b083479e6a4cb56421384400dda9ca05b7216b877b9a79d009ee0f80db25c0b0e51b05904b7d74f4d0220cdb92e819404422743c06a1199245f
+DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 
3b172f4a5cae4d9ee0668957a5991317e4ae882f450335412488fd408971717facb0c1e1760dc55c20b14e315246017975699d3c1ff9968c3f8182198d85c62a
 SHA512 
a9b9d9b7d0a1faeb7da02a5c7f2ee363e4cb68914ec5c39867ab6ee35b6df988e36d653536b48512361d3a0130c38683f72bb6a76a251820d8689398de3e73ee
 DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B 
c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5
 SHA512 
596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8

diff --git a/dev-tcltk/tkimg/tkimg-1.4.12.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.12.ebuild
new file mode 100644
index 000..397231bc70a
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4.12.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils multilib prefix toolchain-funcs virtualx
+
+MYP=Img-${PV}-Source
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://tkimg.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
+   https://dev.gentoo.org/~tupone/distfiles/${P}-patchset-1.tar.gz;
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test static-libs"
+
+RDEPEND="
+   dev-lang/tk:=
+   >=dev-tcltk/tcllib-1.11
+   media-libs/tiff:0=
+   >=media-libs/libpng-1.6:0=
+   >=sys-libs/zlib-1.2.7:=
+   x11-libs/libX11
+   virtual/jpeg:="
+DEPEND="${RDEPEND}
+   test? (
+   x11-apps/xhost
+   media-fonts/font-misc-misc
+   media-fonts/font-cursor-misc )"
+
+S="${WORKDIR}/Img-${PV}"
+
+PATCHES=(
+   "${WORKDIR}"/patchset-1
+)
+
+src_prepare() {
+   edos2unix \
+   libjpeg/jpegtclDecls.h \
+   libjpeg/Makefile.in \
+   zlib/Makefile.in \
+   zlib/zlibtcl.decls \
+   zlib/zlibtclDecls.h \
+   libpng/Makefile.in \
+   libpng/pngtclDecls.h \
+   libtiff/Makefile.in \
+   libtiff/tifftclDecls.h \
+   libtiff/tifftclStubInit.c \
+   tiff/tiff.c \
+   jpeg/jpeg.c
+   default
+   find compat/libtiff/config -name ltmain.sh -delete
+
+   #rm -r compat/{libjpeg,libpng,zlib} || die
+
+   eautoreconf
+   for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap 
png\
+   ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
+   (cd $dir; AT_NOELIBTOOLIZE=yes eautoreconf)
+   done
+
+   eprefixify */*.h
+   tc-export AR
+}
+
+src_test() {
+   virtx default
+}
+
+src_install() {
+   local l bl
+
+   emake \
+   DESTDIR="${D}" \
+   INSTALL_ROOT="${D}" \
+   install
+

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2021-01-18 Thread David Seifert
commit: ea3b4feb333eca4b957020d824ec89323a6c40d6
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Jan 18 11:36:00 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jan 18 11:36:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea3b4feb

dev-tcltk/tkimg: Remove old

Bug: https://bugs.gentoo.org/763561
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-tcltk/tkimg/Manifest   |  1 -
 dev-tcltk/tkimg/tkimg-1.4.7.ebuild | 89 --
 2 files changed, 90 deletions(-)

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 0d13fffd72d..3a5908c7bc7 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,5 +1,4 @@
 DIST Img-1.4.11-Source.tar.gz 7610956 BLAKE2B 
f461ddb07681c15ca68f8a023808c1c9aec63eefe434c46e09b22f48025b3ec4b095fa44092e30799af3a0435562fd1917613a7ed3f9612d166014cd34834142
 SHA512 
792223fdb310370937669ef537662947f087131a001281e8923095892b585354690612a339d03f3939b91870016256c37e41aa6305db70e8db1b5ab590610751
 DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 
958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b
 SHA512 
c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
-DIST Img-Source-1.4.7.tar.gz 7259144 BLAKE2B 
48794a21564864c5b20953d1504acde5512be4aaa8db0834f63b15431af0bfa8bb2050f241e7b2d9b383480b59e17567f26f45c91e9f9a7fc58600cfe6ef6595
 SHA512 
6a395d6263e2f46151d0d3f5c6044d87a933617981200d2663328b8c7993b8a3aacba45568cee7aa2f5d8c8d020cb63956179aab5147d25d91b8834c0dfa4b9d
 DIST tkimg-1.4.11-patchset-1.tar.gz 9864 BLAKE2B 
bee2ddd4b0ada51f9aeffc1e4ddcb9ea2d3fec37eccdaf9a1d26551e7e2dd01a466cad91ea33635ce674261d92fc1dc1fa80f3d19dffd92bb5f9bb5425820318
 SHA512 
013a70826c5a7b083479e6a4cb56421384400dda9ca05b7216b877b9a79d009ee0f80db25c0b0e51b05904b7d74f4d0220cdb92e819404422743c06a1199245f
 DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B 
c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5
 SHA512 
596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8

diff --git a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
deleted file mode 100644
index 77643a72c84..000
--- a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib prefix toolchain-funcs virtualx
-
-MYP=Img-Source-$PV
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://tkimg.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
-   https://dev.gentoo.org/~tupone/distfiles/${P}-patchset-1.tar.xz;
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test static-libs"
-
-RDEPEND="
-   dev-lang/tk:=
-   >=dev-tcltk/tcllib-1.11
-   media-libs/tiff:0=
-   >=media-libs/libpng-1.6:0=
-   >=sys-libs/zlib-1.2.7:=
-   x11-libs/libX11
-   virtual/jpeg:="
-DEPEND="${RDEPEND}
-   test? (
-   x11-apps/xhost
-   media-fonts/font-misc-misc
-   media-fonts/font-cursor-misc )"
-
-# Fails tests
-RESTRICT="test"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
-   "${WORKDIR}"/${P}-tclconfig.patch
-   "${WORKDIR}"/${P}-jpeg.patch
-   "${WORKDIR}"/${P}-zlib.patch
-   "${WORKDIR}"/${P}-png.patch
-   "${WORKDIR}"/${P}-tiff.patch
-   "${FILESDIR}"/${PN}-1.4-jpeg-9.patch
-)
-
-src_prepare() {
-   default
-   find . -name configure -delete
-   eautoreconf
-   for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap 
png\
-   ppm ps sgi sun tga tiff window xbm xpm dted raw ; do
-   (cd $dir; eautoreconf)
-   done
-
-   find compat/{libjpeg,libpng,zlib,libtiff} -delete
-
-   eprefixify */*.h
-   tc-export AR
-}
-
-src_install() {
-   local l bl
-
-   emake \
-   DESTDIR="${D}" \
-   INSTALL_ROOT="${D}" \
-   install
-
-   if ! use static-libs; then
-   find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || 
die
-   fi
-
-   # Make library links
-   for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-   bl=$(basename $l)
-   dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
-   done
-
-   dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
-
-   if use doc; then
-   docompress -x usr/share/doc/${PF}/demo.tcl
-   dodoc demo.tcl
-   docinto html
-   dodoc -r doc/*
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2021-01-07 Thread Sam James
commit: f59448fc352bc3855faae9f64f2161bf5cf5e512
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  7 11:35:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  7 11:35:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f59448fc

dev-tcltk/tkimg: Stabilize 1.4.9 ppc, #763561

Signed-off-by: Sam James  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
index f5d9ed4a67d..666a9ea9803 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.7-patchset-1.tar.xz;
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2021-01-06 Thread Alfredo Tupone
commit: 476ed9fbabac452f6be29cbc5b5b44bd9d28
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Wed Jan  6 11:31:52 2021 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Wed Jan  6 11:32:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=476ed9fb

dev-tcltk/tkimg: version bump to 1.4.11

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/Manifest|  2 +
 dev-tcltk/tkimg/tkimg-1.4.11.ebuild | 95 +
 2 files changed, 97 insertions(+)

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 83f12e9da11..0d13fffd72d 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,3 +1,5 @@
+DIST Img-1.4.11-Source.tar.gz 7610956 BLAKE2B 
f461ddb07681c15ca68f8a023808c1c9aec63eefe434c46e09b22f48025b3ec4b095fa44092e30799af3a0435562fd1917613a7ed3f9612d166014cd34834142
 SHA512 
792223fdb310370937669ef537662947f087131a001281e8923095892b585354690612a339d03f3939b91870016256c37e41aa6305db70e8db1b5ab590610751
 DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 
958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b
 SHA512 
c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
 DIST Img-Source-1.4.7.tar.gz 7259144 BLAKE2B 
48794a21564864c5b20953d1504acde5512be4aaa8db0834f63b15431af0bfa8bb2050f241e7b2d9b383480b59e17567f26f45c91e9f9a7fc58600cfe6ef6595
 SHA512 
6a395d6263e2f46151d0d3f5c6044d87a933617981200d2663328b8c7993b8a3aacba45568cee7aa2f5d8c8d020cb63956179aab5147d25d91b8834c0dfa4b9d
+DIST tkimg-1.4.11-patchset-1.tar.gz 9864 BLAKE2B 
bee2ddd4b0ada51f9aeffc1e4ddcb9ea2d3fec37eccdaf9a1d26551e7e2dd01a466cad91ea33635ce674261d92fc1dc1fa80f3d19dffd92bb5f9bb5425820318
 SHA512 
013a70826c5a7b083479e6a4cb56421384400dda9ca05b7216b877b9a79d009ee0f80db25c0b0e51b05904b7d74f4d0220cdb92e819404422743c06a1199245f
 DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B 
c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5
 SHA512 
596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8

diff --git a/dev-tcltk/tkimg/tkimg-1.4.11.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
new file mode 100644
index 000..674cef238a5
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4.11.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils multilib prefix toolchain-funcs virtualx
+
+MYP=Img-${PV}-Source
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://tkimg.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
+   https://dev.gentoo.org/~tupone/distfiles/${P}-patchset-1.tar.gz;
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test static-libs"
+
+RDEPEND="
+   dev-lang/tk:=
+   >=dev-tcltk/tcllib-1.11
+   media-libs/tiff:0=
+   >=media-libs/libpng-1.6:0=
+   >=sys-libs/zlib-1.2.7:=
+   x11-libs/libX11
+   virtual/jpeg:="
+DEPEND="${RDEPEND}
+   test? (
+   x11-apps/xhost
+   media-fonts/font-misc-misc
+   media-fonts/font-cursor-misc )"
+
+# Fails tests
+RESTRICT="test"
+
+S="${WORKDIR}/Img-${PV}"
+
+PATCHES=( "${WORKDIR}"/patchset-1 )
+
+src_prepare() {
+   edos2unix \
+   libjpeg/jpegtclDecls.h \
+   libjpeg/Makefile.in \
+   zlib/Makefile.in \
+   zlib/zlibtcl.decls \
+   zlib/zlibtclDecls.h \
+   libpng/Makefile.in \
+   libpng/pngtclDecls.h \
+   libtiff/Makefile.in \
+   libtiff/tifftclDecls.h \
+   libtiff/tifftclStubInit.c \
+   tiff/tiff.c \
+   jpeg/jpeg.c
+   default
+   find . -name configure -delete
+
+   find compat/{libjpeg,libpng,zlib,libtiff} -delete
+
+   eautoreconf
+   for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap 
png\
+   ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
+   (cd $dir; eautoreconf)
+   done
+
+   eprefixify */*.h
+   tc-export AR
+}
+
+src_install() {
+   local l bl
+
+   emake \
+   DESTDIR="${D}" \
+   INSTALL_ROOT="${D}" \
+   install
+
+   if ! use static-libs; then
+   find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || 
die
+   fi
+
+   # Make library links
+   for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
+   bl=$(basename $l)
+   dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
+   done
+
+   dodoc ChangeLog README 

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/files/, dev-tcltk/tkimg/

2020-04-13 Thread Alfredo Tupone
commit: 5f4b367799f0fc945ff6399b985755088abe02b4
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Mon Apr 13 18:23:49 2020 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Mon Apr 13 18:23:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4b3677

dev-tcltk/tkimg: build with fno-common

Closes: https://bugs.gentoo.org/706838
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch | 11 +++
 dev-tcltk/tkimg/tkimg-1.4.9.ebuild |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch 
b/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch
new file mode 100644
index 000..307dfe31437
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/libpng/pngtclDecls.h 2020-04-13 20:16:18.542559383 +0200
 b/libpng/pngtclDecls.h 2020-04-13 20:16:33.921314336 +0200
+@@ -1369,6 +1369,8 @@
+ 
+ #ifdef __cplusplus
+ extern "C" {
++#else
++extern
+ #endif
+ PNG_IMPEXP const PngtclStubs *pngtclStubsPtr;
+ #ifdef __cplusplus

diff --git a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
index d2c7d256208..e5bccdee84c 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.9.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
@@ -42,6 +42,7 @@ PATCHES=(
"${WORKDIR}"/${PN}-1.4.7-png.patch
"${WORKDIR}"/${PN}-1.4.7-tiff.patch
"${FILESDIR}"/${PN}-1.4-jpeg-9.patch
+   "${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2020-02-02 Thread Alfredo Tupone
commit: d6557826c6920c6b4fcb4ea2d07629ed924268fe
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Sun Feb  2 20:42:38 2020 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sun Feb  2 20:42:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6557826

dev-tcltk/tkimg: RedundantLongDescription

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dev-tcltk/tkimg/metadata.xml b/dev-tcltk/tkimg/metadata.xml
index b1e9347d617..049c6b2f95b 100644
--- a/dev-tcltk/tkimg/metadata.xml
+++ b/dev-tcltk/tkimg/metadata.xml
@@ -5,9 +5,6 @@
tc...@gentoo.org
Gentoo Tcltk Project

-   
-   The "Img" package adds a lot of image formats to Tcl/Tk.
-   

tkimg




[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2019-12-28 Thread Alfredo Tupone
commit: 9d19aa352700bfed7525d02796a64d6a99e049b0
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Sat Dec 28 19:37:23 2019 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sat Dec 28 19:37:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d19aa35

dev-tcltk/tkimg: fix symlinks

Closes: https://bugs.gentoo.org/704052
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.7.ebuild | 2 +-
 dev-tcltk/tkimg/tkimg-1.4.9.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
index 7b359e02e9f..77643a72c84 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
@@ -75,7 +75,7 @@ src_install() {
# Make library links
for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
bl=$(basename $l)
-   dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
+   dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
done
 
dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE

diff --git a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
index e4eace19f9a..d2c7d256208 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
@@ -88,7 +88,7 @@ src_install() {
# Make library links
for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
bl=$(basename $l)
-   dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
+   dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
done
 
dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/files/, dev-tcltk/tkimg/

2019-12-15 Thread Alfredo Tupone
commit: d44b99f7d815de683b403b10707917fcb4799dc7
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Sun Dec 15 21:33:01 2019 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sun Dec 15 21:33:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d44b99f7

dev-tcltk/tkimg: remove old versions

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/Manifest   |  2 -
 dev-tcltk/tkimg/files/tkimg-1.4-png2.patch | 36 
 dev-tcltk/tkimg/tkimg-1.4-r9.ebuild| 90 --
 3 files changed, 128 deletions(-)

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index e5443095dbe..83f12e9da11 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,5 +1,3 @@
 DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 
958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b
 SHA512 
c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
 DIST Img-Source-1.4.7.tar.gz 7259144 BLAKE2B 
48794a21564864c5b20953d1504acde5512be4aaa8db0834f63b15431af0bfa8bb2050f241e7b2d9b383480b59e17567f26f45c91e9f9a7fc58600cfe6ef6595
 SHA512 
6a395d6263e2f46151d0d3f5c6044d87a933617981200d2663328b8c7993b8a3aacba45568cee7aa2f5d8c8d020cb63956179aab5147d25d91b8834c0dfa4b9d
-DIST tkimg-1.4-patchset-1.tar.xz 17956 BLAKE2B 
f6d3e5e5f258434bd02e21271357f2e2013ce7c90f2d1862e8e7ac0f1cf235d39b1713434a00261ec442c1843a70194b4d14081a5d4cec07c8ad6bf45bbf1db3
 SHA512 
bd20e0beaa224c42e856e6d44d86c2a5f04c28d096c561f44c4afcf8c821bf859c602156a9be60f23f906e8da2f43c89ca358d32e8f9497296e7c5a5bf23ed69
 DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B 
c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5
 SHA512 
596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8
-DIST tkimg1.4.tar.bz2 4912894 BLAKE2B 
630ce6b95f42f0883373970ff919493d34cf4a61119af9520702079c6272f9b6ddbc6241197b39ac509d9b2c76c6f3d3bd29944acea4cdc1c82134cba473818a
 SHA512 
b03aba6e21e35b8733dbc4fa66fae67284a05e68248e5afb2a85c1520c74d0c6c5091860a3ab682f4a662a318c562339e9b7b82f050e63bbf48d1b4757d379a1

diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-png2.patch 
b/dev-tcltk/tkimg/files/tkimg-1.4-png2.patch
deleted file mode 100644
index 195e9be43fa..000
--- a/dev-tcltk/tkimg/files/tkimg-1.4-png2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
 png/png.c.orig 2010-06-17 06:40:24.0 -0700
-+++ png/png.c  2013-04-23 20:57:32.0 -0700
-@@ -332,6 +332,16 @@
-   png_set_expand(png_ptr);
- }
- 
-+if (png_get_sRGB && png_get_sRGB(png_ptr, info_ptr, )) {
-+  png_set_sRGB(png_ptr, info_ptr, intent);
-+} else if (png_get_gAMA) {
-+  double gamma;
-+  if (!png_get_gAMA(png_ptr, info_ptr, )) {
-+  gamma = 0.45455;
-+  }
-+  png_set_gamma(png_ptr, 1.0, gamma);
-+}
-+
- png_read_update_info(png_ptr,info_ptr);
- block.pixelSize = png_get_channels(png_ptr, info_ptr);
- block.pitch = png_get_rowbytes(png_ptr, info_ptr);
-@@ -353,16 +363,6 @@
-   block.offset[3] = 0;
- }
- 
--if (png_get_sRGB && png_get_sRGB(png_ptr, info_ptr, )) {
--  png_set_sRGB(png_ptr, info_ptr, intent);
--} else if (png_get_gAMA) {
--  double gamma;
--  if (!png_get_gAMA(png_ptr, info_ptr, )) {
--  gamma = 0.45455;
--  }
--  png_set_gamma(png_ptr, 1.0, gamma);
--}
--
- png_data= (char **) ckalloc(sizeof(char *) * info_height +
-   info_height * block.pitch);
- 

diff --git a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
deleted file mode 100644
index 155c4483e32..000
--- a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib prefix toolchain-funcs virtualx
-
-MYP="${PN}${PV}"
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://tkimg.sourceforge.net/;
-SRC_URI="
-   https://dev.gentoo.org/~jlec/distfiles/${P}-patchset-1.tar.xz
-   mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test static-libs"
-
-RDEPEND="
-   dev-lang/tk:=
-   >=dev-tcltk/tcllib-1.11
-   media-libs/tiff:0=
-   >=media-libs/libpng-1.6:0=
-   >=sys-libs/zlib-1.2.7:=
-   x11-libs/libX11
-   virtual/jpeg:="
-DEPEND="${RDEPEND}
-   test? (
-   x11-apps/xhost
-   media-fonts/font-misc-misc
-   media-fonts/font-cursor-misc )"
-
-# Fails with jpeg-turbo silently, #386253
-#RESTRICT="test"
-
-S="${WORKDIR}/${MYP}"
-

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2019-12-15 Thread Alfredo Tupone
commit: 501be1cc05aaf285edbd65ca68d8c02da3bca53d
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Sun Dec 15 20:11:13 2019 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sun Dec 15 20:11:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=501be1cc

dev-tcltk/tkimg: fix DeprecatedInsinto

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.7.ebuild |  8 
 dev-tcltk/tkimg/tkimg-1.4.9.ebuild | 10 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
index 20537261f03..7b359e02e9f 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
@@ -81,9 +81,9 @@ src_install() {
dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
 
if use doc; then
-   insinto /usr/share/doc/${PF}
-   doins demo.tcl
-   insinto /usr/share/doc/${PF}/html
-   doins -r doc/*
+   docompress -x usr/share/doc/${PF}/demo.tcl
+   dodoc demo.tcl
+   docinto html
+   dodoc -r doc/*
fi
 }

diff --git a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
index 2746c0ba15e..e4eace19f9a 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools eutils multilib prefix toolchain-funcs virtualx
 
@@ -94,9 +94,9 @@ src_install() {
dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
 
if use doc; then
-   insinto /usr/share/doc/${PF}
-   doins demo.tcl
-   insinto /usr/share/doc/${PF}/html
-   doins -r doc/*
+   docompress -x usr/share/doc/${PF}/demo.tcl
+   dodoc demo.tcl
+   docinto html
+   dodoc -r doc/*
fi
 }



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2019-12-15 Thread Agostino Sarubbo
commit: a4d3fb669a83e6b5d790b2bb3f559a90353cb02d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Dec 15 18:02:38 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Dec 15 18:02:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d3fb66

dev-tcltk/tkimg: x86 stable wrt bug #702934

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
index 107524465fb..20537261f03 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2019-12-15 Thread Agostino Sarubbo
commit: 6a33aea292dbbdc10642157c703193d25ecd4423
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Dec 15 14:06:23 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Dec 15 14:07:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a33aea2

dev-tcltk/tkimg: ppc stable wrt bug #702934

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
index 135cc968aff..107524465fb 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2019-12-15 Thread Agostino Sarubbo
commit: edb7390109f4622c8d96053d694598a9fca3410f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Dec 15 14:02:16 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Dec 15 14:02:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edb73901

dev-tcltk/tkimg: amd64 stable wrt bug #702934

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4.7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
index 7166b860906..135cc968aff 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2019-12-14 Thread Alfredo Tupone
commit: 872f7207c94766b47f154865b623cd6d917981cc
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Sat Dec 14 21:48:04 2019 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sat Dec 14 21:54:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872f7207

dev-tcltk/tkimg: Version bump to 1.4.9

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tkimg/Manifest   |   1 +
 dev-tcltk/tkimg/tkimg-1.4.9.ebuild | 102 +
 2 files changed, 103 insertions(+)

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index ce77ff44bca..e5443095dbe 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,3 +1,4 @@
+DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 
958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b
 SHA512 
c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
 DIST Img-Source-1.4.7.tar.gz 7259144 BLAKE2B 
48794a21564864c5b20953d1504acde5512be4aaa8db0834f63b15431af0bfa8bb2050f241e7b2d9b383480b59e17567f26f45c91e9f9a7fc58600cfe6ef6595
 SHA512 
6a395d6263e2f46151d0d3f5c6044d87a933617981200d2663328b8c7993b8a3aacba45568cee7aa2f5d8c8d020cb63956179aab5147d25d91b8834c0dfa4b9d
 DIST tkimg-1.4-patchset-1.tar.xz 17956 BLAKE2B 
f6d3e5e5f258434bd02e21271357f2e2013ce7c90f2d1862e8e7ac0f1cf235d39b1713434a00261ec442c1843a70194b4d14081a5d4cec07c8ad6bf45bbf1db3
 SHA512 
bd20e0beaa224c42e856e6d44d86c2a5f04c28d096c561f44c4afcf8c821bf859c602156a9be60f23f906e8da2f43c89ca358d32e8f9497296e7c5a5bf23ed69
 DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B 
c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5
 SHA512 
596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8

diff --git a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
new file mode 100644
index 000..2746c0ba15e
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils multilib prefix toolchain-funcs virtualx
+
+MYP=Img-${PV}-Source
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://tkimg.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
+   https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.7-patchset-1.tar.xz;
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test static-libs"
+
+RDEPEND="
+   dev-lang/tk:=
+   >=dev-tcltk/tcllib-1.11
+   media-libs/tiff:0=
+   >=media-libs/libpng-1.6:0=
+   >=sys-libs/zlib-1.2.7:=
+   x11-libs/libX11
+   virtual/jpeg:="
+DEPEND="${RDEPEND}
+   test? (
+   x11-apps/xhost
+   media-fonts/font-misc-misc
+   media-fonts/font-cursor-misc )"
+
+# Fails tests
+RESTRICT="test"
+
+S="${WORKDIR}/Img-${PV}"
+
+PATCHES=(
+   "${WORKDIR}"/${PN}-1.4.7-tclconfig.patch
+   "${WORKDIR}"/${PN}-1.4.7-jpeg.patch
+   "${WORKDIR}"/${PN}-1.4.7-zlib.patch
+   "${WORKDIR}"/${PN}-1.4.7-png.patch
+   "${WORKDIR}"/${PN}-1.4.7-tiff.patch
+   "${FILESDIR}"/${PN}-1.4-jpeg-9.patch
+)
+
+src_prepare() {
+   edos2unix \
+   libjpeg/jpegtclDecls.h \
+   libjpeg/Makefile.in \
+   zlib/Makefile.in \
+   zlib/zlibtcl.decls \
+   zlib/zlibtclDecls.h \
+   libpng/Makefile.in \
+   libpng/pngtclDecls.h \
+   libtiff/Makefile.in \
+   libtiff/tifftclDecls.h \
+   libtiff/tifftclStubInit.c \
+   tiff/tiff.c \
+   jpeg/jpeg.c
+   default
+   find . -name configure -delete
+
+   find compat/{libjpeg,libpng,zlib,libtiff} -delete
+
+   eautoreconf
+   for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap 
png\
+   ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
+   (cd $dir; eautoreconf)
+   done
+
+   eprefixify */*.h
+   tc-export AR
+}
+
+src_install() {
+   local l bl
+
+   emake \
+   DESTDIR="${D}" \
+   INSTALL_ROOT="${D}" \
+   install
+
+   if ! use static-libs; then
+   find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || 
die
+   fi
+
+   # Make library links
+   for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
+   bl=$(basename $l)
+   dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
+   done
+
+   dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
+
+   if use doc; then
+

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/, dev-tcltk/tkimg/files/

2018-11-03 Thread Alfredo Tupone
commit: c7440022b6226bc29679d55522e522bb2b64be20
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Sat Nov  3 21:10:48 2018 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sat Nov  3 21:10:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7440022

dev-tcltk/tkimg: reduce size of filesdir

Signed-off-by: Alfredo Tupone  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 dev-tcltk/tkimg/Manifest  |   1 +
 dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg-9.patch|  18 -
 dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg.patch  |  63 --
 dev-tcltk/tkimg/files/tkimg-1.4.7-png.patch   |  80 ---
 dev-tcltk/tkimg/files/tkimg-1.4.7-tclconfig.patch |  39 --
 dev-tcltk/tkimg/files/tkimg-1.4.7-tiff.patch  | 806 --
 dev-tcltk/tkimg/files/tkimg-1.4.7-zlib.patch  |  90 ---
 dev-tcltk/tkimg/tkimg-1.4.7.ebuild|  17 +-
 8 files changed, 10 insertions(+), 1104 deletions(-)

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 1e2e1025891..ce77ff44bca 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,3 +1,4 @@
 DIST Img-Source-1.4.7.tar.gz 7259144 BLAKE2B 
48794a21564864c5b20953d1504acde5512be4aaa8db0834f63b15431af0bfa8bb2050f241e7b2d9b383480b59e17567f26f45c91e9f9a7fc58600cfe6ef6595
 SHA512 
6a395d6263e2f46151d0d3f5c6044d87a933617981200d2663328b8c7993b8a3aacba45568cee7aa2f5d8c8d020cb63956179aab5147d25d91b8834c0dfa4b9d
 DIST tkimg-1.4-patchset-1.tar.xz 17956 BLAKE2B 
f6d3e5e5f258434bd02e21271357f2e2013ce7c90f2d1862e8e7ac0f1cf235d39b1713434a00261ec442c1843a70194b4d14081a5d4cec07c8ad6bf45bbf1db3
 SHA512 
bd20e0beaa224c42e856e6d44d86c2a5f04c28d096c561f44c4afcf8c821bf859c602156a9be60f23f906e8da2f43c89ca358d32e8f9497296e7c5a5bf23ed69
+DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B 
c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5
 SHA512 
596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8
 DIST tkimg1.4.tar.bz2 4912894 BLAKE2B 
630ce6b95f42f0883373970ff919493d34cf4a61119af9520702079c6272f9b6ddbc6241197b39ac509d9b2c76c6f3d3bd29944acea4cdc1c82134cba473818a
 SHA512 
b03aba6e21e35b8733dbc4fa66fae67284a05e68248e5afb2a85c1520c74d0c6c5091860a3ab682f4a662a318c562339e9b7b82f050e63bbf48d1b4757d379a1

diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg-9.patch 
b/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg-9.patch
deleted file mode 100644
index 23000ac7922..000
--- a/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg-9.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix build with jpeg-9, bug #520886
-
 a/jpeg/jpeg.c  2010-06-17 15:40:24.0 +0200
-+++ b/jpeg/jpeg.c  2018-02-07 23:26:38.050073397 +0100
-@@ -53,6 +53,13 @@
-  */
- 
- #include "tkimg.h"
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+#define HAVE_BOOLEAN
- #include "jpegtcl.h"
- 
- static int SetupJPegLibrary(Tcl_Interp *interp);

diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg.patch 
b/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg.patch
deleted file mode 100644
index 969b953a19a..000
--- a/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg.patch
+++ /dev/null
@@ -1,63 +0,0 @@
- libjpeg/Makefile.in|  2 +-
- libjpeg/configure.in   | 19 ---
- libjpeg/jpegtclDecls.h |  4 ++--
- 4 files changed, 4 insertions(+), 39 deletions(-)
-
-diff --git a/libjpeg/Makefile.in b/libjpeg/Makefile.in
-index cf2aca8..2d937b1 100644
 a/libjpeg/Makefile.in
-+++ b/libjpeg/Makefile.in
-@@ -107,7 +107,7 @@ RANLIB = @RANLIB@
- RANLIB_STUB   = @RANLIB_STUB@
- SHLIB_CFLAGS  = @SHLIB_CFLAGS@
- SHLIB_LD  = @SHLIB_LD@
--SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
-+SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -ljpeg
- STLIB_LD  = @STLIB_LD@
- TCL_DEFS  = @TCL_DEFS@
- TCL_BIN_DIR   = @TCL_BIN_DIR@
-diff --git a/libjpeg/configure.in b/libjpeg/configure.in
-index 378806d..327e2bd 100644
 a/libjpeg/configure.in
-+++ b/libjpeg/configure.in
-@@ -54,25 +54,6 @@ JPEG_CC=$CC
- 
- TEA_ADD_SOURCES([jpegtcl.c jpegtclStubInit.c])
- 
--TEA_ADD_SOURCES([
--  ../compat/libjpeg/jcapimin.c../compat/libjpeg/jcapistd.c
../compat/libjpeg/jccoefct.c
--  ../compat/libjpeg/jccolor.c ../compat/libjpeg/jcdctmgr.c
../compat/libjpeg/jchuff.c
--  ../compat/libjpeg/jcinit.c  ../compat/libjpeg/jcmainct.c
../compat/libjpeg/jcmarker.c
--  ../compat/libjpeg/jcmaster.c../compat/libjpeg/jcomapi.c 
../compat/libjpeg/jcparam.c
--  ../compat/libjpeg/jcarith.c ../compat/libjpeg/jcprepct.c
../compat/libjpeg/jcsample.c
--  ../compat/libjpeg/jctrans.c ../compat/libjpeg/jdapimin.c
../compat/libjpeg/jdapistd.c
--  ../compat/libjpeg/jdatadst.c../compat/libjpeg/jdatasrc.c
../compat/libjpeg/jdcoefct.c
--  ../compat/libjpeg/jdcolor.c ../compat/libjpeg/jddctmgr.c
../compat/libjpeg/jdhuff.c
--   

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/files/, dev-tcltk/tkimg/

2018-10-02 Thread Alfredo Tupone
commit: 380691910358a36cb69a08221b55caa89a1bffc5
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Tue Oct  2 17:02:30 2018 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Tue Oct  2 17:02:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38069191

dev-tcltk/tkimg: Version bump to 1.4.7

Closes: https://bugs.gentoo.org/504968
Signed-off-by: Alfredo Tupone  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-tcltk/tkimg/Manifest  |   1 +
 dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg-9.patch|  18 +
 dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg.patch  |  63 ++
 dev-tcltk/tkimg/files/tkimg-1.4.7-png.patch   |  80 +++
 dev-tcltk/tkimg/files/tkimg-1.4.7-tclconfig.patch |  39 ++
 dev-tcltk/tkimg/files/tkimg-1.4.7-tiff.patch  | 806 ++
 dev-tcltk/tkimg/files/tkimg-1.4.7-zlib.patch  |  90 +++
 dev-tcltk/tkimg/tkimg-1.4.7.ebuild|  88 +++
 8 files changed, 1185 insertions(+)

diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index a1285ebbc33..1e2e1025891 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,2 +1,3 @@
+DIST Img-Source-1.4.7.tar.gz 7259144 BLAKE2B 
48794a21564864c5b20953d1504acde5512be4aaa8db0834f63b15431af0bfa8bb2050f241e7b2d9b383480b59e17567f26f45c91e9f9a7fc58600cfe6ef6595
 SHA512 
6a395d6263e2f46151d0d3f5c6044d87a933617981200d2663328b8c7993b8a3aacba45568cee7aa2f5d8c8d020cb63956179aab5147d25d91b8834c0dfa4b9d
 DIST tkimg-1.4-patchset-1.tar.xz 17956 BLAKE2B 
f6d3e5e5f258434bd02e21271357f2e2013ce7c90f2d1862e8e7ac0f1cf235d39b1713434a00261ec442c1843a70194b4d14081a5d4cec07c8ad6bf45bbf1db3
 SHA512 
bd20e0beaa224c42e856e6d44d86c2a5f04c28d096c561f44c4afcf8c821bf859c602156a9be60f23f906e8da2f43c89ca358d32e8f9497296e7c5a5bf23ed69
 DIST tkimg1.4.tar.bz2 4912894 BLAKE2B 
630ce6b95f42f0883373970ff919493d34cf4a61119af9520702079c6272f9b6ddbc6241197b39ac509d9b2c76c6f3d3bd29944acea4cdc1c82134cba473818a
 SHA512 
b03aba6e21e35b8733dbc4fa66fae67284a05e68248e5afb2a85c1520c74d0c6c5091860a3ab682f4a662a318c562339e9b7b82f050e63bbf48d1b4757d379a1

diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg-9.patch 
b/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg-9.patch
new file mode 100644
index 000..23000ac7922
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg-9.patch
@@ -0,0 +1,18 @@
+Fix build with jpeg-9, bug #520886
+
+--- a/jpeg/jpeg.c  2010-06-17 15:40:24.0 +0200
 b/jpeg/jpeg.c  2018-02-07 23:26:38.050073397 +0100
+@@ -53,6 +53,13 @@
+  */
+ 
+ #include "tkimg.h"
++#ifndef FALSE
++#define FALSE 0
++#endif
++#ifndef TRUE
++#define TRUE 1
++#endif
++#define HAVE_BOOLEAN
+ #include "jpegtcl.h"
+ 
+ static int SetupJPegLibrary(Tcl_Interp *interp);

diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg.patch 
b/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg.patch
new file mode 100644
index 000..969b953a19a
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.7-jpeg.patch
@@ -0,0 +1,63 @@
+ libjpeg/Makefile.in|  2 +-
+ libjpeg/configure.in   | 19 ---
+ libjpeg/jpegtclDecls.h |  4 ++--
+ 4 files changed, 4 insertions(+), 39 deletions(-)
+
+diff --git a/libjpeg/Makefile.in b/libjpeg/Makefile.in
+index cf2aca8..2d937b1 100644
+--- a/libjpeg/Makefile.in
 b/libjpeg/Makefile.in
+@@ -107,7 +107,7 @@ RANLIB = @RANLIB@
+ RANLIB_STUB   = @RANLIB_STUB@
+ SHLIB_CFLAGS  = @SHLIB_CFLAGS@
+ SHLIB_LD  = @SHLIB_LD@
+-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -ljpeg
+ STLIB_LD  = @STLIB_LD@
+ TCL_DEFS  = @TCL_DEFS@
+ TCL_BIN_DIR   = @TCL_BIN_DIR@
+diff --git a/libjpeg/configure.in b/libjpeg/configure.in
+index 378806d..327e2bd 100644
+--- a/libjpeg/configure.in
 b/libjpeg/configure.in
+@@ -54,25 +54,6 @@ JPEG_CC=$CC
+ 
+ TEA_ADD_SOURCES([jpegtcl.c jpegtclStubInit.c])
+ 
+-TEA_ADD_SOURCES([
+-  ../compat/libjpeg/jcapimin.c../compat/libjpeg/jcapistd.c
../compat/libjpeg/jccoefct.c
+-  ../compat/libjpeg/jccolor.c ../compat/libjpeg/jcdctmgr.c
../compat/libjpeg/jchuff.c
+-  ../compat/libjpeg/jcinit.c  ../compat/libjpeg/jcmainct.c
../compat/libjpeg/jcmarker.c
+-  ../compat/libjpeg/jcmaster.c../compat/libjpeg/jcomapi.c 
../compat/libjpeg/jcparam.c
+-  ../compat/libjpeg/jcarith.c ../compat/libjpeg/jcprepct.c
../compat/libjpeg/jcsample.c
+-  ../compat/libjpeg/jctrans.c ../compat/libjpeg/jdapimin.c
../compat/libjpeg/jdapistd.c
+-  ../compat/libjpeg/jdatadst.c../compat/libjpeg/jdatasrc.c
../compat/libjpeg/jdcoefct.c
+-  ../compat/libjpeg/jdcolor.c ../compat/libjpeg/jddctmgr.c
../compat/libjpeg/jdhuff.c
+-  ../compat/libjpeg/jdinput.c ../compat/libjpeg/jdmainct.c
../compat/libjpeg/jdmarker.c
+-  ../compat/libjpeg/jdmaster.c../compat/libjpeg/jdmerge.c 
../compat/libjpeg/jdarith.c
+-  ../compat/libjpeg/jdpostct.c../compat/libjpeg/jdsample.c
../compat/libjpeg/jdtrans.c
+-   

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/, dev-tcltk/tkimg/files/

2018-02-10 Thread Andreas Sturmlechner
commit: 9a70af76fe322c95aa102aa684f9d49281513c29
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb  7 22:35:15 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 10 12:45:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a70af76

dev-tcltk/tkimg: Fix build with jpeg-9

Closes: https://bugs.gentoo.org/520886
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch | 18 ++
 dev-tcltk/tkimg/tkimg-1.4-r9.ebuild  |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch 
b/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch
new file mode 100644
index 000..23000ac7922
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch
@@ -0,0 +1,18 @@
+Fix build with jpeg-9, bug #520886
+
+--- a/jpeg/jpeg.c  2010-06-17 15:40:24.0 +0200
 b/jpeg/jpeg.c  2018-02-07 23:26:38.050073397 +0100
+@@ -53,6 +53,13 @@
+  */
+ 
+ #include "tkimg.h"
++#ifndef FALSE
++#define FALSE 0
++#endif
++#ifndef TRUE
++#define TRUE 1
++#endif
++#define HAVE_BOOLEAN
+ #include "jpegtcl.h"
+ 
+ static int SetupJPegLibrary(Tcl_Interp *interp);

diff --git a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
index 9b621a465ef..155c4483e32 100644
--- a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -40,6 +40,7 @@ S="${WORKDIR}/${MYP}"
 src_prepare() {
epatch \
"${WORKDIR}"/${P}-jpeg.patch \
+   "${FILESDIR}"/${P}-jpeg-9.patch \
"${WORKDIR}"/${P}-tiff.patch \
"${WORKDIR}"/${P}-png.patch \
"${FILESDIR}"/${P}-png2.patch \



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2015-11-27 Thread Justin Lecher
commit: 54d1812b5911ea415f16d8290b182a817b80a313
Author: Justin Lecher  gentoo  org>
AuthorDate: Fri Nov 27 07:42:11 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Nov 27 07:42:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d1812b

dev-tcltk/tkimg: Drop obsolete VIRTUALX_USE

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4-r9.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
index 2362d61..b790b45 100644
--- a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-VIRTUALX_USE=test
-
 inherit eutils multilib prefix toolchain-funcs virtualx
 
 MYP="${PN}${PV}"



[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tkimg/

2015-11-27 Thread Justin Lecher
commit: cc5148d05b8a5c1c32cca3a13d87a76b7d687c41
Author: Justin Lecher  gentoo  org>
AuthorDate: Fri Nov 27 07:43:10 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Nov 27 07:43:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc5148d0

dev-tcltk/tkimg: Add slot operators

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher  gentoo.org>

 dev-tcltk/tkimg/tkimg-1.4-r9.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild 
b/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
index b790b45..eab2297 100644
--- a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
@@ -20,13 +20,13 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="
-   dev-lang/tk
+   dev-lang/tk:=
>=dev-tcltk/tcllib-1.11
media-libs/tiff:0=
>=media-libs/libpng-1.6:0=
>=sys-libs/zlib-1.2.7:=
x11-libs/libX11
-   virtual/jpeg"
+   virtual/jpeg:="
 DEPEND="${RDEPEND}
test? (
x11-apps/xhost