From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- media-gfx/xpaint/Manifest | 13 ++++ media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch | 67 ++++++++++++++++ media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch | 37 +++++++++ .../xpaint-2.9.10.3-Fix-build-with-clang.patch | 25 ++++++ media-gfx/xpaint/files/xpaint-2.9.9.4-QA1.patch | 91 ++++++++++++++++++++++ .../files/xpaint-2.9.9.4-parallel-make.patch | 25 ++++++ .../xpaint/files/xpaint-2.9.9.4-submake.patch | 29 +++++++ media-gfx/xpaint/metadata.xml | 30 +++++++ media-gfx/xpaint/xpaint-2.9.10.2.ebuild | 84 ++++++++++++++++++++ media-gfx/xpaint/xpaint-2.9.10.3.ebuild | 85 ++++++++++++++++++++ 10 files changed, 486 insertions(+) create mode 100644 media-gfx/xpaint/Manifest create mode 100644 media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch create mode 100644 media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch create mode 100644 media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch create mode 100644 media-gfx/xpaint/files/xpaint-2.9.9.4-QA1.patch create mode 100644 media-gfx/xpaint/files/xpaint-2.9.9.4-parallel-make.patch create mode 100644 media-gfx/xpaint/files/xpaint-2.9.9.4-submake.patch create mode 100644 media-gfx/xpaint/metadata.xml create mode 100644 media-gfx/xpaint/xpaint-2.9.10.2.ebuild create mode 100644 media-gfx/xpaint/xpaint-2.9.10.3.ebuild (limited to 'media-gfx/xpaint') diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest new file mode 100644 index 000000000000..de4919b7f975 --- /dev/null +++ b/media-gfx/xpaint/Manifest @@ -0,0 +1,13 @@ +AUX xpaint-2.9.10.2-QA2.patch 2235 SHA256 7bcb094de312522af55e6107a96cd9611da710d3b62dd681a7deef943dec1bc7 SHA512 5b8a34d8181f2b3b3b8459d4579b44e8a22807b25458401d3fe9243922ea1c7d565c25e938ff9506202ddd755e70ac103e70f9f258356ad0b240d8cbf2c53271 WHIRLPOOL 126983cf5b9ad0353fd931313526332473c7b50bec4b884554e63dcf846be708d11a41c94b94e37117c67c0d1bc1d1e5bbb45cd4271169e3ef8d448c9137a7ce +AUX xpaint-2.9.10.2-tiff.patch 860 SHA256 d60e1c2cbd0f4ba89f262ff471ad40bf7c640b6f4138b444b57a51ef4cf63b28 SHA512 38a34e3f317a3ac9a0ea5b8a62f3c93566c70889315ffa652c1dbec796e1448efabdcd58c8a7e67e70a4fa185871dfd6ca163bf38f50e9592ac792a4ca827dac WHIRLPOOL d7e6a5693de9b8492f1abaaf327fbed979dd39888bf992589422eb00a338b7aae2a312cc7aa39b8db0384d981aea74160634b250baab313261bc76afcbc565ae +AUX xpaint-2.9.10.3-Fix-build-with-clang.patch 669 SHA256 04213e1ce4ea8bbe5a4b9b9271d6fbf7e1da800971be53f67ba740c1ddeade41 SHA512 7a8138a82eb3d4824d138a21d03759986ad03d05d65d0ef24fb911b642e1906bc5b6aba7417836fa4756cb63ae09427b7ec2a05be1588fd86a1668b52418f9e7 WHIRLPOOL 3b98a7a88458314f38a1287098f9ee1d6f175ab3b3a2d7965071ac60f24b8d2e2075e4ecb12e613ad9e800d978b81fd1e7a7616b87952fcf4f34197ce5f0ebc6 +AUX xpaint-2.9.9.4-QA1.patch 3336 SHA256 ede53a3bde4eeaf267234fa918ad2ace481add0988eeab4818ef6a15353de522 SHA512 2760bd60bc1e6335c48ce4576e9176c5893e70568f99d535b48878e6917591258ff5d206851c312b3af6b1bcda93076a60bcb3452176a49f588d4ffa1ed69a79 WHIRLPOOL 498fea0ef4149181f9bbd057d3c5e75b161f7704531e7ba1b96ee2d44560fd07a2ef259d8c5dfe153b9b3d2a0fb366ad0bbe1f155537fd9cfc61408728089dc2 +AUX xpaint-2.9.9.4-parallel-make.patch 655 SHA256 1e416437a4c30d7bb6567baf6707a2dd32ad91e0ffc634cd4ac95a2a753568a1 SHA512 45161a7a76f05ebff009b8dda5c52baddcd936ee8c5984a3e0fa02d80a56947ba55df68c1241115dcce5a1f75d8993794b761ba0dbadb94b86b9c2ebfbe7c3d7 WHIRLPOOL 5ab4032ac7e81533dc2e51b235e8722f8ef491b0adccc40ea59c4c96d4157188d2f4b9c8c4202c2917e66e51ba33935f943a08bed05f4f39f7707907155102cf +AUX xpaint-2.9.9.4-submake.patch 747 SHA256 483e844cc41a6899f114d317a2a283748ff509c1523d49bf790e32bfbb456a4b SHA512 72525c5cd892772210cba85b0f5ff193a6474657d6ffbead23c711de3346c87f8d306e252fdd8b98ae136f32311d88be6107bbe72932039bf17e4c0c64b70bae WHIRLPOOL 3324a1663897e968c5d962341ddc0c71ff8e67728ac5e18ed6e23bc772e64454ff33a1fb05aae491abad39f035bcdb2292f1a9ac38c34686b66a0b6f8b882578 +DIST xpaint-2.9.10.2.tar.bz2 1245813 SHA256 7f1554c8390bc68da2bcc0449407b8cc69616ce5d2170f97d1b30aee9fcbdcf6 SHA512 8aa388d4b82b5867817eca2188f50734140c395efe663c290a78b4f24314754fb29257165a64c9b8a03634dede03d919d9a3a54c1d32049cc34216a1f3d4e499 WHIRLPOOL 5ffe99ba979590c1ad675f7cbd57e4dba92aa7c24a9600784224c913069cad1fa88a676180d60fc2cc60c6f7185056385ccb59f2725c9799781335ed38d8934a +DIST xpaint-2.9.10.3.tar.bz2 1283725 SHA256 9de0cb99557ea8329391b5d45ad59be080972924258aeb1b3c0c748bab9586c7 SHA512 d5d365e0308e50166e5ac70859e388436d8f0cb870b2dea0155fbc9a65a8377a861bea2217df2b5c016f8751c9ff1f74509eaff310acfaacd7b29c51cf726ac5 WHIRLPOOL 4d0ec766168fe329cba88506ff98f560f8fc4067245d1062ae9649db5bc3f380181e98eae0b443deb13f4f3de38c8239cc1d608499f61941cc18c18c70849d61 +EBUILD xpaint-2.9.10.2.ebuild 1635 SHA256 91a6219aca482b05a1551bd686b30dc864300fe0df9683ea52cc3db9b47b8e83 SHA512 63a3808cc6fba26a962f821d140aff7d756be1aa72211d29a2dc65e05dd841640b6a8b81fa6d3dedfff9a27d40936278d8d947052e82b30ef945eb41c62c066f WHIRLPOOL 0e53fc14548810012a05087e23188b0971fc8a48320ea45249a2aa337f9fd3b5fdb331e4d718cb5ec2e032815460aa61e40ae18d9e821d7f6da09fa64ec2a058 +EBUILD xpaint-2.9.10.3.ebuild 1700 SHA256 7dd71dea4c51b1309a3be8fdb69e4fd9787c7285ec3aeeb78555515ff617fff4 SHA512 767027b82623caaf63f312f534b6636dbe277b6ce9ce18ff119eabd6ebe0074ea59e4502afde67f69cbc76b3ff2972e96124537eaf5fddc0787b4d78e7897adc WHIRLPOOL 8cc17dfbe36a0941f7c77247a80edeee4dbf49ee3237dce80b287c86dca49970d9adc57f4b4861ac9345c0abcc8b1777b45021a1d13dfa8a934314342a21d501 +MISC ChangeLog 3111 SHA256 618ac1b48748ad326aa0a3e726bcc3125fc809f41541f77b8ace733038571f6e SHA512 97fd11ba29c3c5eefb5a5572ec2c7b7bff3e9fce578a76d6a044a6d7d8c88b777f23515bd7f548c2c98b81fd5cb872e0d483e39984da06ac63934e94833ff794 WHIRLPOOL 62100d1e0a89122cc79ed77fe9f36264fdbdcc303bfa46891fa9e43f2a0fb21801b17cabff6a6e392f1b17237f0a4c552e35907d0c764fb330fd61d08f24d6e3 +MISC ChangeLog-2015 1891 SHA256 b6da4668d1ba11a88fb90e9cdcd11151c7ca8de1f24a18f99c9af39bc217c6f8 SHA512 04ee75795ed83ec92708ff6cccdf06ccfaefb4aeb63f739935255d1d3f53626dda62b8cbb54902bdb10bbb82815bd47365671d2f971181185297dfae513a43c2 WHIRLPOOL ea229fe571955bed1ec87e3cf5313f412c74c9ce3d88308b7d166e4d6958d28ed1d1abd7da08ae49a48dfc7c17dba5c60f2c04c822a1c886a118a1dfd17063a4 +MISC metadata.xml 1204 SHA256 53840a7690c0e366ca740d38b7537f99868b21c9f00f54fd8ee076c6a207f93a SHA512 e2b37b1d3381dd97ecdd40f20535426539d7caff8032ffcb5e6b74d65968adb7319523a55e45d31a697a75b9aa384e0a5155059237730ea080cf46532da12c22 WHIRLPOOL ec87e13cfd7ad21b00a67fd2aec272c9ba03e98769b73c82e4d8df19da61519f2338906fa1f651606210e4edb4a61b91b395edc20b3f524005ad8bdf90308742 diff --git a/media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch b/media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch new file mode 100644 index 000000000000..9179585974c2 --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch @@ -0,0 +1,67 @@ +From 08bdf5f5d0c64384b2be16bd8ac68244675388d5 Mon Sep 17 00:00:00 2001 +From: hasufell +Date: Sun, 6 Oct 2013 21:13:51 +0200 +Subject: [PATCH] respect CFLAGS + +--- + Makefile.am | 2 +- + configure.ac | 2 +- + rw/Makefile.am | 2 +- + rw/configure.ac | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 4cf1753..414597f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -26,7 +26,7 @@ EXTERN_VIEWER = display + ## -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ + ## -DFUNCPROTO=15 -DNARROWPROTO + +-ARCH_DEFINES = -g -O2 -fno-strict-aliasing -fPIC ++ARCH_DEFINES = -fno-strict-aliasing -fPIC + + ## + ## Specific xpaint options +diff --git a/configure.ac b/configure.ac +index e058529..3979075 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -29,7 +29,7 @@ AC_TYPE_UINT16_T + AC_TYPE_UINT32_T + AC_TYPE_UINT64_T + +-CFLAGS="-I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" ++CFLAGS="$CFLAGS -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" + LIBS="$LIBS -lm" + echo "VERSION = $VERSION" > .version + +diff --git a/rw/Makefile.am b/rw/Makefile.am +index d91d5d5..2f50253 100644 +--- a/rw/Makefile.am ++++ b/rw/Makefile.am +@@ -10,7 +10,7 @@ SHAREDIR = $(prefix)/share/xpaint + ## -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ + ## -DFUNCPROTO=15 -DNARROWPROTO + +-ARCH_DEFINES = -g -O2 -fno-strict-aliasing -fPIC ++ARCH_DEFINES = -fno-strict-aliasing -fPIC + + ## + ## Specific xpaint options +diff --git a/rw/configure.ac b/rw/configure.ac +index fb4f3d4..d9c7601 100644 +--- a/rw/configure.ac ++++ b/rw/configure.ac +@@ -29,7 +29,7 @@ AC_TYPE_UINT16_T + AC_TYPE_UINT32_T + AC_TYPE_UINT64_T + +-CFLAGS="-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFUNCPROTO=15 -DNARROWPROTO -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" ++CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFUNCPROTO=15 -DNARROWPROTO -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" + LIBS="$LIBS -lm" + + dnl check X11 +-- +1.8.3.2 + diff --git a/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch b/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch new file mode 100644 index 000000000000..20e59872b84d --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch @@ -0,0 +1,37 @@ +From: Julian Ospald +Date: Fri Jun 20 13:52:42 UTC 2014 +Subject: fix tiff build switch + +--- xpaint-2.9.10.2/configure.ac ++++ xpaint-2.9.10.2/configure.ac +@@ -125,9 +125,11 @@ + with_libtiff="yes" + tiff_header_found="no" + # +-AC_ARG_ENABLE(tiff, ++AC_ARG_ENABLE([tiff], + [ --enable-tiff[=[yes|no]] Build with TIFF support [ [default=yes] ]], +-test "$enable_tiff" = "no" && with_libtiff="no") ++ [with_libtiff=$enableval], ++ [with_libtiff=yes] ++) + # + if test "x$with_libtiff" = xyes ; then + #TIFF compiled with JPEG and JBIG support? +--- xpaint-2.9.10.2/rw/readWriteTIFF.c ++++ xpaint-2.9.10.2/rw/readWriteTIFF.c +@@ -14,6 +14,8 @@ + + /* $Id$ */ + ++#ifdef HAVE_TIFF ++ + #include + #include + #include "tiffio.h" +@@ -527,3 +529,5 @@ int WriteTIFF(char *file, Image * image) + + return 0; + } ++ ++#endif /* HAVE_TIFF */ diff --git a/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch b/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch new file mode 100644 index 000000000000..a5a26214409e --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch @@ -0,0 +1,25 @@ +From 69a76e5f4a72d83635cd413b7460df4776b2605f Mon Sep 17 00:00:00 2001 +From: hasufell +Date: Sun, 16 Aug 2015 16:51:26 +0200 +Subject: [PATCH] Fix build with clang + +--- + rw/readWriteTGA.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rw/readWriteTGA.c b/rw/readWriteTGA.c +index 306a751..9046ee3 100644 +--- a/rw/readWriteTGA.c ++++ b/rw/readWriteTGA.c +@@ -607,7 +607,7 @@ int WriteTGA(char *file_name, Image * image) + int tga_defdir = 1; + int transparency = -1; + +- if (!image) return; ++ if (!image) return -1; + w = image->width; + h = image->height; + bpp = image->scale; +-- +2.5.0 + diff --git a/media-gfx/xpaint/files/xpaint-2.9.9.4-QA1.patch b/media-gfx/xpaint/files/xpaint-2.9.9.4-QA1.patch new file mode 100644 index 000000000000..31e3a38ba005 --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.9.4-QA1.patch @@ -0,0 +1,91 @@ +From 2987bfa203a8467a697efffa211b90b12858b40b Mon Sep 17 00:00:00 2001 +From: hasufell +Date: Sun, 6 Oct 2013 20:37:28 +0200 +Subject: [PATCH] respect flags, add WITH_PGF option, fix echo + +--- + util/Makefile | 56 +++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 35 insertions(+), 21 deletions(-) + +diff --git a/util/Makefile b/util/Makefile +index e6af415..21a0d17 100644 +--- a/util/Makefile ++++ b/util/Makefile +@@ -1,39 +1,53 @@ +-GCC = gcc +-CPP = g++ -fpermissive ++# set to anything but "no" to enable ++WITH_PGF=no + ++ifneq ($(WITH_PGF),no) + all: pdfconcat ppmtops pgf2pnm ++else ++all: pdfconcat ppmtops ++endif + + pdfconcat: +- $(GCC) -O3 -s -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat ++ $(CC) $(CFLAGS) -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat $(LDFLAGS) + + ppmtops: +- $(GCC) ppmtops.c -o ppmtops ++ $(CC) $(CFLAGS) ppmtops.c -o ppmtops $(LDFLAGS) + ++ifneq ($(WITH_PGF),no) + pgf2pnm: main.cpp pnm.cpp + @if [ -x /usr/include/libpgf ] ; then \ +- $(CPP) -c main.cpp -o main.o -I/usr/include/libpgf ; \ +- $(CPP) -c pnm.cpp -o pnm.o -I/usr/include/libpgf ; \ +- $(CPP) -o pgf2pnm main.o pnm.o -lpgf ; \ ++ $(CXX) $(CXXFLAGS) -fpermissive -c main.cpp -o main.o -I/usr/include/libpgf ; \ ++ $(CXX) $(CXXFLAGS) -fpermissive -c pnm.cpp -o pnm.o -I/usr/include/libpgf ; \ ++ $(CXX) $(CXXFLAGS) -fpermissive -o pgf2pnm main.o pnm.o $(LDFLAGS) -lpgf ; \ + else \ +- @echo "libpgf not installed !!" ; \ ++ echo "libpgf not installed !!" ; \ + fi ++endif + +-install: ++install-common: + @if [ -x pdfconcat ] ; then \ +- mkdir -p $(DESTDIR)/usr/bin ; \ +- install -c pdfconcat $(DESTDIR)/usr/bin ; \ +- echo "install -c pdfconcat $(DESTDIR)/usr/bin" ; \ +- mkdir -p $(DESTDIR)/usr/share/man/man1 ; \ +- install -c -m 644 pdfconcat.1 $(DESTDIR)/usr/share/man/man1 ; \ +- echo "install -c pdfconcat.1 $(DESTDIR)/usr/share/man/man1" ; fi ++ mkdir -p "$(DESTDIR)"/usr/bin ; \ ++ install -c pdfconcat "$(DESTDIR)"/usr/bin ; \ ++ echo "install -c pdfconcat "$(DESTDIR)"/usr/bin" ; \ ++ mkdir -p "$(DESTDIR)"/usr/share/man/man1 ; \ ++ install -c -m 644 pdfconcat.1 "$(DESTDIR)"/usr/share/man/man1 ; \ ++ echo "install -c pdfconcat.1 "$(DESTDIR)"/usr/share/man/man1" ; fi + @if [ -x ppmtops ] ; then \ +- mkdir -p $(DESTDIR)/usr/bin ; \ +- install -c ppmtops $(DESTDIR)/usr/bin ; \ +- echo "install -c ppmtops $(DESTDIR)/usr/bin" ; fi ++ mkdir -p "$(DESTDIR)"/usr/bin ; \ ++ install -c ppmtops "$(DESTDIR)"/usr/bin ; \ ++ echo "install -c ppmtops "$(DESTDIR)"/usr/bin" ; fi ++ ++install-pgf: + @if [ -x pgf2pnm ] ; then \ +- mkdir -p $(DESTDIR)/usr/bin ; \ +- install -c pgf2pnm $(DESTDIR)/usr/bin ; \ +- echo "install -c pgf2pnm $(DESTDIR)/usr/bin" ; fi ++ mkdir -p "$(DESTDIR)"/usr/bin ; \ ++ install -c pgf2pnm "$(DESTDIR)"/usr/bin ; \ ++ echo "install -c pgf2pnm "$(DESTDIR)"/usr/bin" ; fi ++ ++ifneq ($(WITH_PGF),no) ++install: install-common install-pgf ++else ++install: install-common ++endif + + clean: + rm -f core *~ *.o pdfconcat ppmtops pgf2pnm +-- +1.8.3.2 + diff --git a/media-gfx/xpaint/files/xpaint-2.9.9.4-parallel-make.patch b/media-gfx/xpaint/files/xpaint-2.9.9.4-parallel-make.patch new file mode 100644 index 000000000000..250f634f9973 --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.9.4-parallel-make.patch @@ -0,0 +1,25 @@ +From ae11f5cb975749bd8d6ffda48301eb4aadfee35d Mon Sep 17 00:00:00 2001 +From: hasufell +Date: Sun, 6 Oct 2013 21:02:12 +0200 +Subject: [PATCH] fix parallel make + +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index b2285a0..4cf1753 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -112,7 +112,7 @@ XPaint.ad: app-defaults + XPaint.ad.h: substads XPaint.ad + ./substads -ad2c XPaint.ad $@ + +-xpaint.1: xpaint.1.in version.h ++xpaint.1: substads xpaint.1.in version.h + ./substads -single xpaint.1.in xpaint.1 XPAINT_VERSION $(PACKAGE_VERSION) + + install-exec-hook: +-- +1.8.3.2 + diff --git a/media-gfx/xpaint/files/xpaint-2.9.9.4-submake.patch b/media-gfx/xpaint/files/xpaint-2.9.9.4-submake.patch new file mode 100644 index 000000000000..e218eb4c75e9 --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.9.4-submake.patch @@ -0,0 +1,29 @@ +From 11b369b69c4637431b139960391bded531a9f652 Mon Sep 17 00:00:00 2001 +From: hasufell +Date: Sun, 6 Oct 2013 20:25:14 +0200 +Subject: [PATCH] don't run submake + +--- + Makefile.am | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 5b2caec..b2285a0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -139,11 +139,6 @@ install-exec-hook: + mkdir -p $(DESTDIR)$(SHAREDIR)/messages + cd share/messages ; $(RM) -f *~ ; cp -f Messages* $(DESTDIR)$(SHAREDIR)/messages + chmod -R a+r $(DESTDIR)$(SHAREDIR)/ +- cd util ; make ; make install DESTDIR=$(DESTDIR)$ + + clean-local: + rm -f xaw_incdir +- cd util ; make clean +- +-distclean-local: +- cd util ; make distclean +\ No newline at end of file +-- +1.8.3.2 + diff --git a/media-gfx/xpaint/metadata.xml b/media-gfx/xpaint/metadata.xml new file mode 100644 index 000000000000..8165ff483f18 --- /dev/null +++ b/media-gfx/xpaint/metadata.xml @@ -0,0 +1,30 @@ + + + + + + XPaint is an X Window System color image bitmap editing program. + It also supports advanced features, such as image processing + algorithms, scripting and batch jobs. XPaint allows the edition + of multiple images simultaneously and supports a wide variety of + image formats, including: GIF, JPG, PNG, PPM, TIFF, XBM, XPM, + etc. + + xpaint is now fully UTF8 compliant, and is capable of using + antialiased truetype fonts in its operations and in the menus + (in particular, translating to oriental languages should now be + quite easy - also the X core font protocol is no longer used + anywhere.) + + xpaint also offers optional editing features based on + programmable filters and user defined procedures written as + scripts in plain C. The package includes a substantial list of + examples and some support for batch processing. + + + Support for loading PGF images + + + sf-xpaint + + diff --git a/media-gfx/xpaint/xpaint-2.9.10.2.ebuild b/media-gfx/xpaint/xpaint-2.9.10.2.ebuild new file mode 100644 index 000000000000..3e5f5b70aa0d --- /dev/null +++ b/media-gfx/xpaint/xpaint-2.9.10.2.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit autotools eutils + +DESCRIPTION="Image editor with tiff, jpeg and png support" +HOMEPAGE="http://sf-xpaint.sourceforge.net/" +SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="jpeg2k pgf tiff" + +RDEPEND=" + media-libs/fontconfig + media-libs/freetype + media-libs/libpng:0 + x11-libs/libICE + x11-libs/libX11 + >=x11-libs/libXaw3dXft-1.6.2c + x11-libs/libXext + x11-libs/libXft + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXt + sys-libs/zlib + virtual/jpeg + jpeg2k? ( media-libs/openjpeg:0 ) + pgf? ( media-libs/libpgf ) + tiff? ( + media-libs/jbigkit:0 + media-libs/tiff:0 + )" +DEPEND="${RDEPEND} + sys-devel/flex + sys-devel/bison + virtual/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.9.9.4-{QA1,submake,parallel-make}.patch \ + "${FILESDIR}"/${PN}-2.9.10.2-{QA2,tiff}.patch + eautoreconf +} + +src_configure() { + econf \ + $(use_enable tiff) \ + $(use_enable jpeg2k libopenjpeg) +} + +src_compile() { + # clean up + emake clean + emake -C util clean + + # parallel make still fails sometimes + emake substads + emake xpaint.1 + + default + emake \ + WITH_PGF="$(usex pgf "yes" "no")" \ + CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ + -C util +} + +src_install() { + default + emake \ + WITH_PGF="$(usex pgf "yes" "no")" \ + DESTDIR="${ED}" \ + -C util install +} + +pkg_postinst() { + elog "optional dependencies:" + elog " app-text/gv (external viewer for PostScript output)" + elog " media-gfx/imagemagick (external viewer for pixel graphics)" + elog " net-print/cups (printing)" +} diff --git a/media-gfx/xpaint/xpaint-2.9.10.3.ebuild b/media-gfx/xpaint/xpaint-2.9.10.3.ebuild new file mode 100644 index 000000000000..f75912276e09 --- /dev/null +++ b/media-gfx/xpaint/xpaint-2.9.10.3.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit autotools eutils + +DESCRIPTION="Image editor with tiff, jpeg and png support" +HOMEPAGE="http://sf-xpaint.sourceforge.net/" +SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="jpeg2k pgf tiff" + +RDEPEND=" + media-libs/fontconfig + media-libs/freetype + media-libs/libpng:0 + x11-libs/libICE + x11-libs/libX11 + >=x11-libs/libXaw3dXft-1.6.2c + x11-libs/libXext + x11-libs/libXft + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXt + sys-libs/zlib + virtual/jpeg:62 + jpeg2k? ( media-libs/openjpeg:0 ) + pgf? ( media-libs/libpgf ) + tiff? ( + media-libs/jbigkit:0 + media-libs/tiff:0 + )" +DEPEND="${RDEPEND} + sys-devel/flex + sys-devel/bison + virtual/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.9.9.4-{QA1,submake,parallel-make}.patch \ + "${FILESDIR}"/${PN}-2.9.10.2-{QA2,tiff}.patch \ + "${FILESDIR}"/${PN}-2.9.10.3-Fix-build-with-clang.patch + eautoreconf +} + +src_configure() { + econf \ + $(use_enable tiff) \ + $(use_enable jpeg2k libopenjpeg) +} + +src_compile() { + # clean up + emake clean + emake -C util clean + + # parallel make still fails sometimes + emake substads + emake xpaint.1 + + default + emake \ + WITH_PGF="$(usex pgf "yes" "no")" \ + CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ + -C util +} + +src_install() { + default + emake \ + WITH_PGF="$(usex pgf "yes" "no")" \ + DESTDIR="${ED}" \ + -C util install +} + +pkg_postinst() { + elog "optional dependencies:" + elog " app-text/gv (external viewer for PostScript output)" + elog " media-gfx/imagemagick (external viewer for pixel graphics)" + elog " net-print/cups (printing)" +} -- cgit v1.2.3