diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-02 17:36:40 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-02 17:36:40 +0100 |
| commit | 171a011ad3a131671aeb5a98b9e3adf219ad2865 (patch) | |
| tree | 0c877a3d1a37f10e37ad7168cfc52054aa0948a7 /media-gfx | |
| parent | 75fc75ae1f0481ffdb78450e801a9b443ba641bd (diff) | |
gentoo resync : 02.04.2018
Diffstat (limited to 'media-gfx')
47 files changed, 646 insertions, 950 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 7409fc15cb4c..4e9f4779135d 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest index 1ae056cde90c..8ff0bcff6700 100644 --- a/media-gfx/curaengine/Manifest +++ b/media-gfx/curaengine/Manifest @@ -1,10 +1,13 @@ AUX curaengine-0.15.04.6-cflags.patch 750 BLAKE2B dfa1e1a0c855768387375ac3c0caa16de43a1b4009b68b4b54ca5cd5666818e863570ddebbeccf6a7c5f14dcabc1bd12c87738278cd78fa29b3409f7e85e11e6 SHA512 2109a1d1b07b97769347af7af58921b6d234c4a4bdc8ab8ab1aa0a0f3aac08b3f5e9f99fbb99001e1d505cee89fff30be40a20ba853ee6a3cdcdd98f5ad7058c +AUX curaengine-2.3.1-remove-gcodeplannertest.patch 370 BLAKE2B fbc5ed6858fe3e951a3eba93ecfef792d5f36e5e863793bff022a9591156c407ae4a1fff13042d9eee7dae3b4ab88b878d8a1904ad240bc7775114772d483b56 SHA512 f4a57be7e472b637635f035999d370c7bd09449f530d8f34d61c0a1fa353233b7f8c8578ebca582f5dbee8b714c7f67b09a8823da3d9360c6034acb1202c39f1 DIST curaengine-0.15.04.6.tar.gz 107970 BLAKE2B cf72d74acbc5df4e46c066e27c36957380dee8a40301f0d489b23c0ab2f231bf4f3b7d953964fa7eb073c816a7f7aff755f25380d86bee37a61e1d0bd2ae3b68 SHA512 150e93dca08c57bc37af4c3232c0d18aed93347657d7261f89d7d8352d2774ac7a2a944c3b1efce432b507674f5e99981844823b792ec3fbe47799d2487e899d DIST curaengine-2.1.0_beta.tar.gz 33322580 BLAKE2B dac6b108caddb006348b184465727fba311ee6b35c992db44bef1a0a129c8b5daebc8315ac1654120404a30c4a4851ee37d0c12e17886539f8f57572a26fa520 SHA512 23b1e1116fad8e75354a92b8320a228a0b7acb03bcdffa175b8b6f47af0b8af099efdc3c75f840d172fc157d432a05c741a5028f3b8da1e7fc1dd8cf158115fb DIST curaengine-2.3.1.tar.gz 712429 BLAKE2B 9971468b9eb8aac12426a1483adf904825bc142e25010ba6ba989b94095ac92b10ad91a7fe5a486b823f9238813e986b58bb744e71209542c965cbd43486f56e SHA512 3d247048e51c7aca33b71d7d2382d673e7b4d547cb9fcbf639c9bbc801db067ea010c04a6fd4e88b87e00d9069f7a70019612148ae2b50095514b85078e71220 DIST curaengine-2.6.0.tar.gz 828387 BLAKE2B db3db01a4c66d4a6ca7c6da1997c0a7250877568a4e93bb86393c777c368d22b73e85ad918b65d502670d2d483cb909b5fdae75b17081b04e2091d1498d9a6c8 SHA512 3991127ba3005b93f02ab72fd6c9208b153d5419145edb84f187e1fa32d03220001d8be958847360f7eaa75336ed44f3f7158cedea82d33450992145dfd0a0d9 EBUILD curaengine-0.15.04.6.ebuild 1023 BLAKE2B a30c9939fecc1e1a58dd91f9e21137ccb9c9234da1b0bfc800698585806917cbc8cdf9e598e3dbf9be4c6d283c30b6f39849bc6821342d78ca4d20b0539892cb SHA512 21dcd8a630df89c8c89e70fc21b3509b1e7972985ba72afcc961d90990e382fe9d07d63c8013315b6afe14650e8e58134d74123e5920a019cfd0293a4192485e EBUILD curaengine-2.1.0_beta.ebuild 883 BLAKE2B 30fa9f20814894981f4428ae61988dba2486790393a5c3652f251cdd2e35aa0677a8e21edfdbc694697aab948da4a34ae3b39af7e97308fce9273230accf36ad SHA512 2ef7bc68b8e893ef30704fddcf4c0740e9ed74c320313acc9a7f88bfd4346731f2c140a3b2038d833ed9f5d43b2a32df6006c2da9629c887b7b0eab88d56a16f +EBUILD curaengine-2.3.1-r1.ebuild 1015 BLAKE2B 146e167fe405ce0aa4dbb77bf52899bbde55113e5248b8f6654c663628c9e8f07ce89ede7b815b5bfcaa13f2279bb8f8e6c353ef8dd172ec209bb5658af95e73 SHA512 db7d3bb6818af0d9c6121348cb6bfbc256135cb42b1677893b891d3970e20e1b0729f382ef3d7f3c5965efb86193fa8eb18d5b5f73023ca6cb35912e70da9765 EBUILD curaengine-2.3.1.ebuild 883 BLAKE2B 30fa9f20814894981f4428ae61988dba2486790393a5c3652f251cdd2e35aa0677a8e21edfdbc694697aab948da4a34ae3b39af7e97308fce9273230accf36ad SHA512 2ef7bc68b8e893ef30704fddcf4c0740e9ed74c320313acc9a7f88bfd4346731f2c140a3b2038d833ed9f5d43b2a32df6006c2da9629c887b7b0eab88d56a16f +EBUILD curaengine-2.6.0-r1.ebuild 954 BLAKE2B a7f9f5739a50032a9f4f3aad2cf891cc2d5ac0076d1df49f72e94c354587b82690b7d6b57584990aafa54ba84ff14d75b3f02614cf61794a273412016fb2da3b SHA512 c7daaee08dc5db670f02c8fdf104f8c331ee0ec1d7db11a57ebae52e7626abd6f8ece20c6510b2a43509229dd5cd18979e80478516ce53169064bfe42eb2be70 EBUILD curaengine-2.6.0.ebuild 883 BLAKE2B fc00d7c53904e98a422867a41a5864205d66ff7ef423564226be2eb7bd8f111c41bf8bc8e31b0e937b97305141e4e12b2e4d2bcd51b3b7ee127127d053830660 SHA512 8e29ef18e30c7c3383aabe2bfc98c3eaf2299d83a5824150baacad8a48257873705ce850a9a7cecb5f6669a9fcd15986e1411ad060137713d5253d8df670b623 MISC metadata.xml 584 BLAKE2B de8f551ef73f75fde6a913a906ad9c8030d7567c1b19a21c85c64b2fd59bc9896bcd46aabd27177b09d22af3caefd6a5f8c897c9d75e0b7f0de44d89f57d87fb SHA512 d251db5b89731c9f3ab502140199261172e40ee224c34c0000ccafb121b4d5b4c80e67ea5eeacb3cfe5be97fbf01cf6d2a10916794482437b466d5b8bbc394e6 diff --git a/media-gfx/curaengine/curaengine-2.3.1-r1.ebuild b/media-gfx/curaengine/curaengine-2.3.1-r1.ebuild new file mode 100644 index 000000000000..ee9efe32b82a --- /dev/null +++ b/media-gfx/curaengine/curaengine-2.3.1-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit cmake-utils + +MY_PN=CuraEngine +MY_PV=${PV/_beta} + +DESCRIPTION="A 3D model slicing engine for 3D printing" +HOMEPAGE="https://github.com/Ultimaker/CuraEngine" +SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~x86" + +LICENSE="AGPL-3" +SLOT="0" +IUSE="doc test" + +RDEPEND="${PYTHON_DEPS} + dev-libs/libarcus:= + >=dev-libs/protobuf-3" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen + media-gfx/graphviz ) + test? ( dev-util/cppunit )" + +S="${WORKDIR}/${MY_PN}-${MY_PV}" +DOCS=( "README.md" ) +PATCHES=( "${FILESDIR}/${P}-remove-gcodeplannertest.patch" ) + +src_configure() { + local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_make + if use doc; then + doxygen || die + mv docs/html . || die + find html -name '*.md5' -or -name '*.map' -delete || die + HTML_DOCS=( html/. ) + fi +} diff --git a/media-gfx/curaengine/curaengine-2.6.0-r1.ebuild b/media-gfx/curaengine/curaengine-2.6.0-r1.ebuild new file mode 100644 index 000000000000..b6dbce74a56f --- /dev/null +++ b/media-gfx/curaengine/curaengine-2.6.0-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit cmake-utils + +MY_PN=CuraEngine +MY_PV=${PV/_beta} + +DESCRIPTION="A 3D model slicing engine for 3D printing" +HOMEPAGE="https://github.com/Ultimaker/CuraEngine" +SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~x86" + +LICENSE="AGPL-3" +SLOT="0" +IUSE="doc test" + +RDEPEND="${PYTHON_DEPS} + dev-libs/libarcus:= + >=dev-libs/protobuf-3" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen + media-gfx/graphviz ) + test? ( dev-util/cppunit )" + +S="${WORKDIR}/${MY_PN}-${MY_PV}" +DOCS=( "README.md" ) + +src_configure() { + local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_make + if use doc; then + doxygen || die + mv docs/html . || die + find html -name '*.md5' -or -name '*.map' -delete || die + HTML_DOCS=( html/. ) + fi +} diff --git a/media-gfx/curaengine/files/curaengine-2.3.1-remove-gcodeplannertest.patch b/media-gfx/curaengine/files/curaengine-2.3.1-remove-gcodeplannertest.patch new file mode 100644 index 000000000000..351cebde493f --- /dev/null +++ b/media-gfx/curaengine/files/curaengine-2.3.1-remove-gcodeplannertest.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 47dcd2d1..c2316d68 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -110,9 +125,6 @@ set(engine_SRCS # Except main.cpp. + ) + + # List of tests. For each test there must be a file tests/${NAME}.cpp and a file tests/${NAME}.h. +-set(engine_TEST +- GCodePlannerTest +-) + set(engine_TEST_INFILL + ) + set(engine_TEST_UTILS diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index eb1f15e96dfa..a9d6a2574bb6 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -3,8 +3,8 @@ DIST darktable-2.2.5.tar.xz 3092540 BLAKE2B 8196ed501c96e6738057ee593c6437257b91 DIST darktable-2.4.0.tar.xz 3387972 BLAKE2B 9583dfac379430d21de798da922f747e066e237b87cc5f1f5934fad9cede181f1817ef451ddcb7790ca632d78c577d6651cd301083cbf1342003d9f413b31c4d SHA512 7bd73915f575e837aeee68e791280df01940daccb7efa14e78e38c53dd3f62dcbd1a7cea6ae86af05dfa31b0ed1a8ccbcdb108788668249d13bb7e55ec5ad5db DIST darktable-2.4.1.tar.xz 3396372 BLAKE2B 916a39b117c3af8bd81a1c6177929bdc0f756c79fef4e4994236569d46e2b770c85303e07c6937f670d0b657ba826cc7b0f1b8b713cdf66b11cd625865db525f SHA512 50de282d26b345deeca19ebacfd9eebcc8b1ef3eec4d73d7853e918eef0d23b5ddba96695e7084b808891f0778b5765dc6bf718b9f25c5e1ce5ed393c1421c94 DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20 -EBUILD darktable-2.2.5.ebuild 3829 BLAKE2B 67c3aa78c0173080e13a1d501a3fb01a07fd76f40ba1b1e956b5a51541c04d8bc98a806dce9d0efcf94aafb616fd43fe72bb8c031ead93452e80c026e33845c2 SHA512 f97928203c082af404054f9f0c36379f6103401ed8a7ffe6463c26656364ce373522175513ad6890b0884c8cd6bfb5447236c9b98c7771ba4ec868bcf77f091b -EBUILD darktable-2.4.0.ebuild 3963 BLAKE2B 7e5e439bb852372d18e48e9650ea6923f59a91ca5ee6701d1167aabf7fc0d0f2e325e678805af7a96bc8194495c2f2e4bca08db5e688fdf65f5c80fdb149d6e8 SHA512 bd51102f6d4cfbcae7bc68a70a70351010955642f0d2605e7d7eacaf58ebf59db2479d874dbff50f67aff19fdb6a73afb8cd3796c1bb68a9e88bf1d2ed737b24 -EBUILD darktable-2.4.1.ebuild 3963 BLAKE2B 7e5e439bb852372d18e48e9650ea6923f59a91ca5ee6701d1167aabf7fc0d0f2e325e678805af7a96bc8194495c2f2e4bca08db5e688fdf65f5c80fdb149d6e8 SHA512 bd51102f6d4cfbcae7bc68a70a70351010955642f0d2605e7d7eacaf58ebf59db2479d874dbff50f67aff19fdb6a73afb8cd3796c1bb68a9e88bf1d2ed737b24 -EBUILD darktable-9999.ebuild 3264 BLAKE2B 06aef5e59ed8218739fbf1ed9588aa0d0d22199352155445f6956eb8cefb3e1877741e9dddc373c241a48cd3ebac8793be07bc1a71ac5d83194ba6b5905b92cc SHA512 ed17c0d301da505e15616729189a6a1381850fcd4d77df157337b211b422b5ef680b2edf94eeaf0575ed7af8ea25813c4b9a4877b553b7f31649e853baa49ae8 -MISC metadata.xml 1001 BLAKE2B 7da2598419c82747ec5d95f1454c86ac276ee2df931c4e61d0f6c1b52e112d1f49944ed0c1fb7dc8d7390d1fab5117cf734e6a1fec70d31af01d28c9c50d580e SHA512 6d5d277e74c9c97a57a1cdb80c6b8ea300e90cb65a937fb69e682d8117acb4b6048fb4d0895769c5b5d84545f4ccad4edbfedc7b898bbb8292b161cea5588c88 +EBUILD darktable-2.2.5.ebuild 3865 BLAKE2B 840d9f1a6d2df0d2531bdf69909e15bc82253971a286159eb0e1d2e8e319ca39a2b5f69732191b852c7706c441e29f232c9a3f773205c34b2916e12dcb92051f SHA512 7f9f2e38f942c2eaa90f5d26269d0dfdf393b16b68454b717334b7736da09556287b5cff1eed2d61ae02e1fb36ae5b117e9d32cb84bd3762390ff10f7c795612 +EBUILD darktable-2.4.0.ebuild 3999 BLAKE2B 902a5b16ca824ed39ab8774130c7c61ca501079cb1af3bd0e4191631fc18cc932beb1b89a16c11be8f7888189b936e3a8ad528065046e6e69a3cb04ebbcbe42c SHA512 a710ebc30b04bcc6ea70ed75cb0280563ac29218ed25a2f404c86ae50fc5a321b1e8a3bf84e49624232578223fc1e800c90096b778f0375f4b9bf93445d0a088 +EBUILD darktable-2.4.1.ebuild 3999 BLAKE2B 902a5b16ca824ed39ab8774130c7c61ca501079cb1af3bd0e4191631fc18cc932beb1b89a16c11be8f7888189b936e3a8ad528065046e6e69a3cb04ebbcbe42c SHA512 a710ebc30b04bcc6ea70ed75cb0280563ac29218ed25a2f404c86ae50fc5a321b1e8a3bf84e49624232578223fc1e800c90096b778f0375f4b9bf93445d0a088 +EBUILD darktable-9999.ebuild 3434 BLAKE2B 3f4354c3815fdb84a0ff0b4362e1426d54cc8a9244cc39f3a760bcbc199044c1e8591ecdf8b581335f9e60a793f2519e39285ab50bfdd7542dc57f7a0601c913 SHA512 d814738b460f2e18847b52a2559ecd4479e45862209648badacab847b3dd0a002e4c168a69c69b1e416d5d68537f3fb19ae3f47006695572ea950e736d6c7bc7 +MISC metadata.xml 925 BLAKE2B 5f8855e5d645a30a6a4fdd5049e04f2269df88b042f69321677733d00b56d5e77b9084d996ab7c08340d24f14fdaea3080962465807266d435a954f0f4ca5dbf SHA512 f247ae77eba5dcebc3381cf6fabc68565dc6880c1b3aa5d90311864d78ba9868eb6848a960ead426c006e1e4c5f7d76baee256c948b68ad44785adf45215d09b diff --git a/media-gfx/darktable/darktable-2.2.5.ebuild b/media-gfx/darktable/darktable-2.2.5.ebuild index 7c7b70ce4474..a8a7aa1b9a0f 100644 --- a/media-gfx/darktable/darktable-2.2.5.ebuild +++ b/media-gfx/darktable/darktable-2.2.5.ebuild @@ -19,7 +19,7 @@ SLOT="0" KEYWORDS="amd64 x86" LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk" # TODO add lua once dev-lang/lua-5.2 is unmasked -IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret +IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet nls opencl openmp openexr pax_kernel webp ${LANGS// / l10n_}" @@ -48,11 +48,11 @@ CDEPEND=" colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) - geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) + geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) + gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) - libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= )" @@ -87,9 +87,9 @@ src_configure() { -DUSE_FLICKR=$(usex flickr) -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) -DUSE_KWALLET=$(usex kwallet) - -DUSE_LIBSECRET=$(usex libsecret) + -DUSE_LIBSECRET=$(usex gnome-keyring) -DUSE_LUA=OFF - -DUSE_MAP=$(usex geo) + -DUSE_MAP=$(usex geolocation) -DUSE_NLS=$(usex nls) -DUSE_OPENCL=$(usex opencl) -DUSE_OPENEXR=$(usex openexr) diff --git a/media-gfx/darktable/darktable-2.4.0.ebuild b/media-gfx/darktable/darktable-2.4.0.ebuild index db708727b58a..29265f5ebb36 100644 --- a/media-gfx/darktable/darktable-2.4.0.ebuild +++ b/media-gfx/darktable/darktable-2.4.0.ebuild @@ -19,7 +19,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk" # TODO add lua once dev-lang/lua-5.2 is unmasked -IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret +IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet nls opencl openmp openexr pax_kernel webp ${LANGS// / l10n_}" @@ -47,11 +47,11 @@ CDEPEND=" colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) - geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) + geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) + gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) - libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= )" @@ -92,9 +92,9 @@ src_configure() { -DUSE_FLICKR=$(usex flickr) -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) -DUSE_KWALLET=$(usex kwallet) - -DUSE_LIBSECRET=$(usex libsecret) + -DUSE_LIBSECRET=$(usex gnome-keyring) -DUSE_LUA=OFF - -DUSE_MAP=$(usex geo) + -DUSE_MAP=$(usex geolocation) -DUSE_NLS=$(usex nls) -DUSE_OPENCL=$(usex opencl) -DUSE_OPENEXR=$(usex openexr) diff --git a/media-gfx/darktable/darktable-2.4.1.ebuild b/media-gfx/darktable/darktable-2.4.1.ebuild index db708727b58a..29265f5ebb36 100644 --- a/media-gfx/darktable/darktable-2.4.1.ebuild +++ b/media-gfx/darktable/darktable-2.4.1.ebuild @@ -19,7 +19,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk" # TODO add lua once dev-lang/lua-5.2 is unmasked -IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret +IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet nls opencl openmp openexr pax_kernel webp ${LANGS// / l10n_}" @@ -47,11 +47,11 @@ CDEPEND=" colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) - geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) + geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) + gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) - libsecret? ( >=app-crypt/libsecret-0.18 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= )" @@ -92,9 +92,9 @@ src_configure() { -DUSE_FLICKR=$(usex flickr) -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) -DUSE_KWALLET=$(usex kwallet) - -DUSE_LIBSECRET=$(usex libsecret) + -DUSE_LIBSECRET=$(usex gnome-keyring) -DUSE_LUA=OFF - -DUSE_MAP=$(usex geo) + -DUSE_MAP=$(usex geolocation) -DUSE_NLS=$(usex nls) -DUSE_OPENCL=$(usex opencl) -DUSE_OPENEXR=$(usex openexr) diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild index 0a707bfeba93..ffbe61010f4d 100644 --- a/media-gfx/darktable/darktable-9999.ebuild +++ b/media-gfx/darktable/darktable-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime git-r3 pax-utils eutils versionator +inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils xdg-utils git-r3 pax-utils eutils versionator EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git" @@ -15,7 +15,7 @@ SLOT="0" #KEYWORDS="~amd64 ~x86" LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk" # TODO add lua once dev-lang/lua-5.2 is unmasked -IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret +IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet nls opencl openmp openexr pax_kernel webp ${LANGS// / l10n_}" @@ -35,20 +35,19 @@ CDEPEND=" media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl + sys-libs/zlib:= virtual/jpeg:0 - virtual/glu - virtual/opengl x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) - geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) + geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) + gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) - jpeg2k? ( media-libs/openjpeg:0 ) - libsecret? ( >=app-crypt/libsecret-0.18 ) + jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= )" @@ -57,7 +56,11 @@ RDEPEND="${CDEPEND} DEPEND="${CDEPEND} dev-util/intltool virtual/pkgconfig - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) + opencl? ( + >=sys-devel/clang-4 + >=sys-devel/llvm-4 + )" pkg_pretend() { if use openmp ; then @@ -81,9 +84,9 @@ src_configure() { -DUSE_FLICKR=$(usex flickr) -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) -DUSE_KWALLET=$(usex kwallet) - -DUSE_LIBSECRET=$(usex libsecret) + -DUSE_LIBSECRET=$(usex gnome-keyring) -DUSE_LUA=OFF - -DUSE_MAP=$(usex geo) + -DUSE_MAP=$(usex geolocation) -DUSE_NLS=$(usex nls) -DUSE_OPENCL=$(usex opencl) -DUSE_OPENEXR=$(usex openexr) @@ -91,11 +94,13 @@ src_configure() { -DUSE_OPENMP=$(usex openmp) -DUSE_WEBP=$(usex webp) ) + CMAKE_BUILD_TYPE="RELWITHDEBINFO" cmake-utils_src_configure } src_install() { cmake-utils_src_install + use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf for lang in ${LANGS} ; do use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_} @@ -117,10 +122,10 @@ pkg_preinst() { pkg_postinst() { gnome2_icon_cache_update - fdo-mime_desktop_database_update + xdg_desktop_database_update } pkg_postrm() { gnome2_icon_cache_update - fdo-mime_desktop_database_update + xdg_desktop_database_update } diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml index 8dc052cec1b8..e363ebddb751 100644 --- a/media-gfx/darktable/metadata.xml +++ b/media-gfx/darktable/metadata.xml @@ -8,9 +8,8 @@ <use> <flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag> <flag name="flickr">Add support for uploading photos to flickr</flag> - <flag name="geo">Enable geotagging support</flag> + <flag name="geolocation">Enable geotagging support</flag> <flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag> - <flag name="libsecret">Enable libsecret support to store login credentials</flag> <flag name="opencl">Enable opencl support</flag> <flag name="pax_kernel">Triggers paxmarking of main darktable binary</flag> <flag name="webp">Enable WebP export support</flag> diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index cb3e9f67245a..239010898e59 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -11,8 +11,8 @@ AUX gimp-2.8.22-cve-2017-17789.patch 1245 BLAKE2B 14d519b8b024e51b452806b4acb6f0 AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a51038aeb146779268f78fb2f0a24ef912468510de2a0f640c5f905fe9959581686f55bccc022633b6f2a3a93ab3f12848 SHA512 5bc928860b2f2b53cc72c9c3caf6a532cf7e61b02e0716ee99a5166a07b01bdd46edfeae7bf6e333ce14ca11b5fcb963cbd42005e02f914d909431bf201dc6d5 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02 -EBUILD gimp-2.8.22-r1.ebuild 5179 BLAKE2B bbedc5492bc0eb4f25b50c174c0586012643288fc79a01b5c6aaf6edd3ac783769cad66ed038c021d35f99d62d3f86f7c8c0dec3adcbe12bd576ae2254032d9c SHA512 56cc49d5636c4bd75d1a0b04e2fe40a2c0dfa201ce1837217fa006ff7ed71208c2aef50e0f08b14ca43bb7a82714105807782037c98033a2a31f5a0a215dd446 +EBUILD gimp-2.8.22-r1.ebuild 5186 BLAKE2B 10a8d7c1074b14a4a7b79ec2e157a189597d16caaa1c225704f3c1c7a348cfaa53e711e7e8977f5eb21bf36d5bb2e465e4218e17402858484592c5c10a3b699b SHA512 ccfc14a7e358d66e100a5a4d2d47818a049eb93f64c01ec67f431e7113c4b23355420524413981d68ea4fd53545c9f126867201f0bebe57abfdf7ab3ee337d56 EBUILD gimp-2.8.22.ebuild 4739 BLAKE2B 1f9f5b643fa9c061a1b8bb982df80261c481b362ea7140f4f6921419fa6fa23487df7547976dfbdae9a61eed461199ed0059ab68ce6748f1169b637750638dd4 SHA512 6c6e4c124eb106a22d6a3149e190cb0e3acaad34948e46c3de6be581641667e5841e844f3f79ecd05d67706de5a96d33b098baf8ca9066040200288e3d627e9d -EBUILD gimp-2.9.8-r1.ebuild 5771 BLAKE2B aa74cd5e32232a29079f86f2f6577e291adcd5692af7844d67089e5e81af64ad27f5f88c0d153f55970607d36ae745d88b1e54658faf79a89ffe9633eda966c8 SHA512 9317cdbf53a6784f54463e4950718cab918c6225855b7113c4e1f569b90cd255cc1767a4a9da782872b26292b29681f13ba13de4cc3f98717a4765a897919216 +EBUILD gimp-2.9.8-r1.ebuild 5778 BLAKE2B 98759f612229ee280a0c0ae29a5b131ff311930670f8ab6cd23f7644a934a21d54741bf07f056daf64c1e7afc06ec2a4816623dce733f2f4477588ea02f49d39 SHA512 9d8a678cf5a1a5c1bcd96baa9c46eb3b5c3ce29752323868607d134ebc7e0709099a7bd8f26707fcbb2ebf35c8aa99ca31209329a3164b56d8223cb35ea0185c EBUILD gimp-9999.ebuild 5375 BLAKE2B 1a33e0b4106e98872afaf1c664b72a8b88c813575121d1538fd63fa3b52b6915868f1b432d85e51cf0800bc12aff6adaa8ad84015015e25616ef325703faeace SHA512 b9c0c738acebae699385af18cfdfd9f200a616cb48e565b40768f96d5bbce80914a81a1066de5116ba750d46a2ad3c3b51dc04604dd8e3eaf77aab3084dfd2e5 MISC metadata.xml 388 BLAKE2B 2e779c672c788e3631b0532be9a6081767215bf9687cb2546c92d3c6f4a00d8e8f6e32cca607019847200ed416336f752cfbfaf43b2f600b4bea63eb985e63d5 SHA512 e3a626ac39cea422d1b4660731048d764c4b6f1985e09577865f0047ecbc61c8677d6f15626dbbc03ceb3cb18887ba58747df5d91f5f4b2126afb9ad12eaccb0 diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r1.ebuild index d6bb54b19a9c..1a41cc78f453 100644 --- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild +++ b/media-gfx/gimp/gimp-2.8.22-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://www.gimp.org/" SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2" LICENSE="GPL-3 LGPL-3" SLOT="2" -KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW" IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm" diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild index d83d00807585..fc1d80723b35 100644 --- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild +++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://www.gimp.org/" SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2" LICENSE="GPL-3 LGPL-3" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW" IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm" diff --git a/media-gfx/gtkimageview/Manifest b/media-gfx/gtkimageview/Manifest index 255a1ed243a7..ae6318933c9c 100644 --- a/media-gfx/gtkimageview/Manifest +++ b/media-gfx/gtkimageview/Manifest @@ -1,3 +1,3 @@ DIST gtkimageview-1.6.4.tar.gz 1158138 BLAKE2B b59abcbac71d4bd039bf9f3fc2f25f6590f91c4cc320cea90243a4889e020f1a54a3ca5d8a843f7482551ce8da6fafe6e3ce4fbc5a5e32fd6ceb4367b5abb9db SHA512 6378c640006e73aa1ffbf92eb9d4e42570707bc159f0a657b11f027d328088f5e89fc334de170de5ab1a39bed588b0b76f4633688a894cb7def16f1dea9f8e39 -EBUILD gtkimageview-1.6.4.ebuild 1233 BLAKE2B 7708f35eb3fb56b3e03e6a8c72fcd54616c146614c93da43a6257f9d9e51277b76fcbf0834316d1459fdd0b7aa091d79f547847a2d76684773195a91a24303a3 SHA512 e6d9c1938faa96d5bbd712da9376382c21c66742040c77baed0cd237bb5f85f52038256665f13a52efed153f362e74ecbb7092d2bb1940b799db1264d2db2273 +EBUILD gtkimageview-1.6.4.ebuild 1239 BLAKE2B 2ffab934aa73c1231667cbc1114d84d8a64875a82222ce81780d1fdc8d36d4db142f42f116423f47eec67b684b48f6f94a2aa7aab9c2122ad3fcc3d855ff620e SHA512 bc61f7430b735786cb6358e7d8f2ac6c95b6f8b22a95d2bf522ddc199d419af1972581ece8a1c4c4b9527595a3465bde3d06d7cf9bfd7ea26c65c45ecb46f6b2 MISC metadata.xml 259 BLAKE2B 0a31c91e9ff9700c8a5c77c6eb9ddad55c6b78e7e583213c20adc8e73248c7e8b31c9a11702a0b5a8b665acd2753c145362974d6c5c6aae1979c7845ab4b01d8 SHA512 6744883613ae3b83c57ec9604c5f31717ab714b4f3e7f4f680e4b9e54f622f8e5f753b3cd666862f0e3e6dc4223aee87b89aba472d9f20e1b317595e06aeae30 diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild index f3789f949bf4..75cf22ae35f4 100644 --- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild +++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="examples static-libs" # tests are severely broken, bug #483952 diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest index b79f45ec9325..7b98012b8a79 100644 --- a/media-gfx/libimagequant/Manifest +++ b/media-gfx/libimagequant/Manifest @@ -1,5 +1,5 @@ DIST libimagequant-2.11.4.tar.gz 74117 BLAKE2B 5d42dc876c77694a1d4576e633d2e3aa1e531061aa849a683542cf11b14333f65125bbae699f927bf42896a934ade6d745aa517d6cbc4b7097d96c7579532ec9 SHA512 e9d2aaac2f37968dc93ba0da7d03f0fcf60b3f17d9a0b9edfd6930eade25844dd603de74492d8e1de8dc2da4e7f3e47959a558b5a67588d71e9e1db035eca1cc DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172 EBUILD libimagequant-2.11.4.ebuild 1175 BLAKE2B 45ebfb632526601318788fded0c26678026dd518e4168213a523e7baba7a46742fae05cb7db89fa8bca4f7687bdb5faff62da218d236f35c109392d90d7b93c8 SHA512 342ad821a2c7581c1fe603fdbacbe8b72d6f5ee2c3e41c56075056678a9fcaebeba79aa2b68f3c83f8115e1f2b6d2fb839842f67defd9a9fb7f35e30acb80f38 -EBUILD libimagequant-2.11.7.ebuild 1168 BLAKE2B a285163a05f6291ad8987edf4ecfbcd3c9ba8963ae5688f3122afdc1e8b08529f23efce3525c0129df69d1122100873fcb79d408eeddb859de08b10209938af3 SHA512 4048a1d58055a0db23e75b843f5865feb903d47e02f4a0fcb20e4d9508174011e1e984cf136b20378137fe75c0e35385fda698f83084fafd614d134a90ebbf5d +EBUILD libimagequant-2.11.7.ebuild 1175 BLAKE2B 75e2d3ec9994c0e9e644dbc1ddbc365add5f569591b9e8a68f1c30a395ba2aec18431472cd115282f0cf040073652550d1c5bd8d2db20ee3bd03b439a36866a5 SHA512 137eda25315e2e2e337127882db1bfaf4f54c0a47566ec0278f85eff0bc90588dfa83e9dd227a6bc36446cc444dee353a02c59b59e083db06a6656e26198d685 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11 diff --git a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild index 2d2db96f010b..1a83257c56cc 100644 --- a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild +++ b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0/0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="cpu_flags_x86_sse2 debug openmp static-libs" DEPEND="" diff --git a/media-gfx/nvidia-texture-tools/Manifest b/media-gfx/nvidia-texture-tools/Manifest index b460e0211dfd..a5ff6c592f32 100644 --- a/media-gfx/nvidia-texture-tools/Manifest +++ b/media-gfx/nvidia-texture-tools/Manifest @@ -1,9 +1,11 @@ AUX nvidia-texture-tools-2.0.8-cg.patch 1077 BLAKE2B 87b20084932013b969e1b497944f64eef7d017b300fc07afc37fc1b5f133062387f32bceced14ae4d93fa7567eb3e4a79f5ec7d1e69cb22883afad472bcc367d SHA512 9c528320efa9c274c805dd3202e6c44d1391486c5c3d574ce4a6264ee4013a8b215467fbd0a880193048a716365f499b4cb1e935bb6e49d165c674a03d45a387 AUX nvidia-texture-tools-2.0.8-clang.patch 684 BLAKE2B 0908b6509e94b8909e6af22f4f0e075ddcf41be883e82982edc270b97a71f504fc3281d4fc3b7995eda133376ad4ed4797f2a3e9bf4f41aaf7641b513f05d2ae SHA512 2e2f7645c8a29e6c158e054d27ccd270a5441d33254a0cc27c12aeb1b8c423374b0900a71ed87ef7bc055597302adfc0eeb27e1c788dca54850df53004c50822 AUX nvidia-texture-tools-2.0.8-cpp14.patch 1566 BLAKE2B b5ffbc9c4b680a46683a628cba25b582d5ee35eab521c63ee887dfbda77cb46e3d091c8b827273f3b8feb71051befdab1667a0083243deaaa880f2f940d6e48d SHA512 4234facfc77da76a5d1a394ba48a5d6cfc664b695af1e8fdd90e6bb51de6ce949061a9a30e32aa2d668d21fe41c31caae50dc6efa607a568e2ab1329c41f2ba5 +AUX nvidia-texture-tools-2.0.8-drop-qt4.patch 319 BLAKE2B 534bcddc9574a14ccd5a61f84f10289705624a8547f38f86df85fb0238581fcedbb6d0bb99483d3f2dfd5521a21006d6ba4a60c528ce1ed640e5bb01d2fa924c SHA512 1024d9890d55493cc92b6254047c19b5895b0ea2a6d9ae2b4e1dbf726a165f4a624ec8acca8655c4efed6c8bec52218ffcd116ef48d3bf68606f04107baab671 AUX nvidia-texture-tools-2.0.8-gcc-4.7.patch 406 BLAKE2B 8c17ed5fd7158f118b450f81c5fa77794db82c0d4de1b37e7b53c929eaadc9ece875cf529b3b3446b90623e563e255fcd90842038cebebf52ec0dda1b7835507 SHA512 1bcd69cbbbd01194bb68bff547b240cb196ef3aa73c73c401fb657c4ae7cd77f995fcd7d39f868d25c49994312b236210306aa577194fe756830a22f03da3e7b AUX nvidia-texture-tools-2.0.8-openexr.patch 2558 BLAKE2B 55694c275548dd9177991e008fe9a9c37c290d4e8b17e4dd91a0ec241dc75900e4b6f29f8650780af112ebffcc7ca04c617456b5e2186e590f3e2da705960a1e SHA512 f17a4f009298c65a06e536a434033db9735b0574c3fc2225bde2c86841c1ad8b35c6d9f5988a98285eb9e7b2e9832e8c9495a1a36e3dcf398101b08d59e87ade DIST nvidia-texture-tools-2.0.8-1.tar.gz 935227 BLAKE2B aef1801795f6102ac7c96df236de0e8534bfacfc72d297ff3bcd13b530829e8848f33065477a1fb2ffaa35d75bd9e34913d3551469aa814cab8cb76f2f04e721 SHA512 8e7ac79daaa10a2b1b64cfc8d6b37b37698e2a46f925cc33cdfd8e4b36705db8836edec6f98c5d6da475d7773f4a5826b5cebc120b7c5a6f9515906e2e4fae9d DIST nvidia-texture-tools-2.0.8-patchset-1.tar.xz 9688 BLAKE2B b64aec479779a9d3e0b01d13571c3bfadbcad75d3288c57524805a55b40d1a3a558ad166921fe45beb7cc9b961fe50bb6e02422eccab3ad3fbe19811082a6aa8 SHA512 36305036d178c4a9960148d4ae5fd72e866ebc3f193f7c75e720275f4fa11d4a1f9067f42309de739db84678c81cd921f117cfe5b2e6a78785cf35c7e3947c8b EBUILD nvidia-texture-tools-2.0.8-r3.ebuild 1700 BLAKE2B ab8efdf608ae02ed8352306cf5bf99c17a994d624bf1777f5c9755d1eb729759914ac05006cb138cd67f6b2b9055e14581aef54ceaa6f7cc67b02bc0b570667b SHA512 c3a0453d9d83c673f2b8457bacd9967b0f8fb3694269444276025e77f48ebe9253cc96c17ad14f6b9dd9e264e086f0d6e6f910083115793346d239f2975affbb +EBUILD nvidia-texture-tools-2.0.8-r4.ebuild 1529 BLAKE2B da69fe497b57b1462f54197e8fa116e0af0b9ca37fecf084b73e4d22ebc821018d32e7680cde0bab23db8af35f043a486fbd771169d1c214e93e8c8fa4b09262 SHA512 c2ae373f93e10713ce6a4e3f2d4326a67c4e8fd6fa65b7ff775fd22ff445269e4e9c61aeb4ae93361791b760a2a757f9e5c0ff159f1473f5f6099874bd9b5267 MISC metadata.xml 432 BLAKE2B 61cdc841e0492423330339399f620001ae3a7b176631dcfed14345e39bb02aaf28225bd5a469ad1da9341003a0a12f28d5dc0ed48bea94fc15c90711e56d0b27 SHA512 04ae34b58e838041211dfbb73bc88dd3f9d53f8eb6c8f8736e148790d5b3e50498c3e135c8333c37ca996378d0fc50d21b9e5ac8f7664cac868841fd66adbd0c diff --git a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-drop-qt4.patch b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-drop-qt4.patch new file mode 100644 index 000000000000..3fdb25a04ede --- /dev/null +++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-drop-qt4.patch @@ -0,0 +1,12 @@ +--- a/src/CMakeLists.txt~ 2018-04-02 11:18:57.000000000 +0200 ++++ b/src/CMakeLists.txt 2018-04-02 11:19:53.855751960 +0200 +@@ -118,9 +118,6 @@ + ENDIF(OPENEXR_FOUND) + ENDIF(OPENEXR) + +-# Qt +-FIND_PACKAGE(Qt4) +- + # Threads + FIND_PACKAGE(Threads REQUIRED) + MESSAGE(STATUS "Use thread library: ${CMAKE_THREAD_LIBS_INIT}") diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild new file mode 100644 index 000000000000..eaabe632f83e --- /dev/null +++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit cmake-utils eutils + +DESCRIPTION="A set of cuda-enabled texture tools and compressors" +HOMEPAGE="http://developer.nvidia.com/object/texture_tools.html" +SRC_URI="https://${PN}.googlecode.com/files/${P}-1.tar.gz + https://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cg glew glut openexr" + +RDEPEND=" + media-libs/ilmbase:= + media-libs/libpng:0= + media-libs/tiff:0 + sys-libs/zlib + virtual/jpeg:0 + virtual/opengl + x11-libs/libX11 + cg? ( media-gfx/nvidia-cg-toolkit ) + glew? ( media-libs/glew:0= ) + glut? ( media-libs/freeglut ) + openexr? ( media-libs/openexr:= ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${P}-cg.patch" # fix bug #414509 + "${FILESDIR}/${P}-gcc-4.7.patch" # fix bug #423965 + "${FILESDIR}/${P}-openexr.patch" # fix bug #462494 + "${FILESDIR}/${P}-clang.patch" # fix clang build + "${FILESDIR}/${P}-cpp14.patch" # fix bug #594938 + "${FILESDIR}/${P}-drop-qt4.patch" # fix bug #560248 +) + +S="${WORKDIR}/${PN}" + +src_prepare() { + edos2unix cmake/* + EPATCH_SUFFIX=patch epatch "${WORKDIR}/patches" + cmake-utils_src_prepare +} + +src_configure() { + # cuda support requires old gcc 4.5 that is hardmasked in current + # profiles + local mycmakeargs=( + -DCUDA=no + -DLIBDIR=$(get_libdir) + -DNVTT_SHARED=TRUE + -DCG=$(usex cg) + -DGLEW=$(usex glew) + -DGLUT=$(usex glut) + -DOPENEXR=$(usex openexr) + ) + cmake-utils_src_configure +} diff --git a/media-gfx/replicatorg/Manifest b/media-gfx/replicatorg/Manifest index 8e210e70e0a8..fac08f8b97c4 100644 --- a/media-gfx/replicatorg/Manifest +++ b/media-gfx/replicatorg/Manifest @@ -1,6 +1,6 @@ AUX replicatorg 52 BLAKE2B 165fed22febafa650c6a20085cf6709b9c93132068fb4af0208ee79c46923d0c7a1bf783d5eaa51ee85a3c53579c6a18d5c823a1b5bd7feaf3bdd9fcf751de71 SHA512 93e5c726d4252d1ebe9d8283d1bb9c0857c8a8385f35762a9ca972fb79fd9723b60faa39e2553cdf1da790405bbc74863e72da26c27081ed96d5d9ca4715c095 DIST replicatorg-0037-linux.tgz 52627038 BLAKE2B 04a11093da4c7ef57dce25648518d5a6233a95eb6733d128fdd1e6c16c1c2dae7314c00d3e151aaad92fe66687cad27f6c203a494a3235be7c1f9ab9cf8f20a4 SHA512 9fabfe64a6ff6c059abe66404349739cd74bcc244a4f37d020d506fd82d318f5103daeb289f615fe47203c43ea8842487acbe21b6cdbb9cdb4d9b20bfbfd845c DIST replicatorg-0040-linux.tgz 45962287 BLAKE2B 9aae435b150d96129be027658a3fd65ffc2f3335ecb40e219bff8919c9d14625ee059e899f576a8580d6fffdcea59e1d9e096377068a378a302ac82bd782df9c SHA512 c2be8679ebcb722a01f46bbd5a3dd771ebda0eb5e5546627f9064b412be0e5ae0b63f9d44dc7f03d9b3fb862c45dbe09edfb15018a075f39ca57d725ca804205 -EBUILD replicatorg-37-r2.ebuild 2513 BLAKE2B 4a48f8bd936b4e58fd2714b2d315aef5fea419f4cad3381658dca9a6df5d50f5d2ad9bc5d71e33ccc0edf818d15206a37ec3e4ea5614ebc8557c4a695c7b7c80 SHA512 21b131ff2316c73790abfdbaa2ba8dd24c8b50c0e26c2a3a2b73fcab5113c48f7ae96adfc81f572956a947db07334e102a0dfe679b786a93a97e7de547fe4e19 -EBUILD replicatorg-40-r1.ebuild 2502 BLAKE2B 46685a706d79ba17799caf7ec36362e3f1c3a86ad15bb4fac28f41431a017d4dbf8de0bb50cd9c36f5fd82da1a4f1ed552ff241c64c3f832d46e5ec80fba1d4d SHA512 1140a53c0135d7916fed6c930576bb886c4a19b6ef558bd5fde212d9502bc6e80f6c4685135659698cbd44d070d809c1e1af130521951226abf73ca7abe2f166 +EBUILD replicatorg-37-r3.ebuild 2552 BLAKE2B 55047f7bf450c60196c5f60bbf472b7f7cd9697293ae423e58438d51adb0b15047efef1cc7be945f1162faefce8c80c60cce0cb42fcc6927c48a0f20bdbf60b0 SHA512 18106d35768a4b9a9c416eb2d138e717d461203ce0f6b46127fba903e46d982ef014465278042b510cf6a1dc77c30c552b2c94762a987dd071ac21de53d9d8a4 +EBUILD replicatorg-40-r2.ebuild 2541 BLAKE2B 6c64fdf09201b81ecac18cffbc0d89c13148569375f0d2928b5b1dc027e5b34bd494b8764a8fdae7dac495064dec9644f560bfb6fcc9b3c578098736379801c5 SHA512 e948d106cc079c5868e6dee9b55a69e54bb1fe23c031059906086262446a517bd43651216dad04bd01e6b9a605493e0ca756a29b8e4c01f0a35630b3e1caf0d7 MISC metadata.xml 651 BLAKE2B 632ffdf62dcc19c95406d96667fb4f73fcb1d745840031227c31c4476f20207f93fc9f93eab8ed2730b4c36859e9443af33a1a95df6178a51616805265186bab SHA512 7174fd352ffee5c45009306a23db9dbe613c8045483df7ddefd6cb465161904d6055951c9d3b2a89cfff33726ac4601dd72f25a0b5331ec14b1e88602f181c7c diff --git a/media-gfx/replicatorg/replicatorg-37-r2.ebuild b/media-gfx/replicatorg/replicatorg-37-r3.ebuild index d2ec0905f939..2daae54f2969 100644 --- a/media-gfx/replicatorg/replicatorg-37-r2.ebuild +++ b/media-gfx/replicatorg/replicatorg-37-r3.ebuild @@ -17,7 +17,9 @@ KEYWORDS="~amd64 ~x86" IUSE="" COMMON_DEPEND="dev-java/oracle-jre-bin:*" -RDEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND} + gnome-base/gsettings-desktop-schemas +" DEPEND="${COMMON_DEPEND}" S="${WORKDIR}/${MY_P}" diff --git a/media-gfx/replicatorg/replicatorg-40-r1.ebuild b/media-gfx/replicatorg/replicatorg-40-r2.ebuild index 217806f00c47..7e12c97224b2 100644 --- a/media-gfx/replicatorg/replicatorg-40-r1.ebuild +++ b/media-gfx/replicatorg/replicatorg-40-r2.ebuild @@ -17,7 +17,9 @@ KEYWORDS="" IUSE="" COMMON_DEPEND="dev-java/oracle-jre-bin:*" -RDEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND} + gnome-base/gsettings-desktop-schemas +" DEPEND="${COMMON_DEPEND}" S="${WORKDIR}/${MY_P}" diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest index 5fc935b0f6e4..8bf6730485ba 100644 --- a/media-gfx/sane-backends/Manifest +++ b/media-gfx/sane-backends/Manifest @@ -1,10 +1,13 @@ AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 BLAKE2B dcf7cbd5787c7a225450e03663e7c1ca69dd40fc58e3de9d994fde6a66635d6a3ca20d2886fe7cbc6a7ed3202f8f3a8c7e3d9ea4072b4418a7a43048427a06c3 SHA512 49519b8fea68292b8cbd7bdcaf5b4803a1b890800e17015ace1d662e4503cc0844f191793c8f42cd6aa7e9922ee9f961d4784e30f22abc497973be1978bf1b24 +AUX sane-backends-1.0.27-canon-lide-100.patch 907 BLAKE2B 3e625443b48e2f03d1d095c1d3d2651abf1ea073ca7bbd439ef389906ed683d7f8b43123e7a9cc6360703f1b66886ff2cb6a7428984e4073496b890ed240e9bb SHA512 870dc11926df5ef0c38588336c8d69cfa11ebf9d3355f26eec4e5178fe2dac6e8ffc576980a4b5789cdb7155fbcc97a35300c63ba4e9e1ebbdd0702c563d09f3 AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515f5b6641c86e6d9035a588a776aaec26eaa4e10beebf0a9fd97da991646b7964a867c422da2bc1cf93560d1ba326f0086675036338ff00 SHA512 64cce489e87de31e1a865b86d5829ae4914a30f47e27b07fba68629261cefcd617b8eed272c94b7554545e4802283c5bd5b53f79f54403d875726b38378ae74d +AUX sane-backends-1.0.27-network.patch 1022 BLAKE2B bcc929635fe62af4201f474cddd141b95bf1b7520f7279b713771ed9614990b3331ec1b42f309d88e375d6c9cffacb7195e7e3f063e491bb9cd6e4ae39f79eea SHA512 04b65a06d2c76dde6fce501ba823e999eb89ea41573f887f9e7d5347f3aa5e35310fad69313e99f873640e29a9849372d2ff995678593a0781fba73b464bec0d AUX saned 150 BLAKE2B 306d57a0c09856b387c3c50eb27aaafdb194972c2fdb5d1cb7de3118f0c71cf234898ce958f0d6bd17a5e1f2b5bde458e014a7bfdec52403a6204ebf51aee039 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910 AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd747871165764e97ed368d10551075761c34ff01f51f7cae1b8a9c5692fb9666a300b45134fe255ea3c1 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751 AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b5a546d61133522cdc98c7011669feaadc2d030ffeb49a86130075f22a18edab5f4c925780681 SHA512 655200141339f14bf7fc6f4fff3403cf9504809b7f023aa5425aad691c5baa65772100da0a6311669f83ed1dce73b7d65ca20aa31345b13c48dfdb1b30ce5dbd AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5 +EBUILD sane-backends-1.0.27-r1.ebuild 7738 BLAKE2B d1762f06249a0e150259fe18704e10585b758754fde385b4470adce6e5df3a80d102fffc2c25a8ab753b2463a82a06e20ee30759f3361c329ed65cfd89e14a60 SHA512 e518104ed334885f03239833fc58c7f50e2818d2145cdb2c23940b497d2788b437134dd2b596eedbbedcffc8c8eefce8892e1369bfdec4c1c13b17b9a1912200 EBUILD sane-backends-1.0.27.ebuild 7913 BLAKE2B f6cdfc03d373fbad3872fdc6f7686d3b006e365860851f821eded0f0cbc661f8ed1d176f6032ca2abfd706afc2846185f09a134ace637e896f3c2e067b748385 SHA512 c228f459e1e62095aa57f75018cd63773cf6c55ef6e24ff28123476f43d8a9798d27d6cc2b6f4d85a79736d824ebc5ca4216199e527158781cf698bcc62b2620 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.27-canon-lide-100.patch b/media-gfx/sane-backends/files/sane-backends-1.0.27-canon-lide-100.patch new file mode 100644 index 000000000000..504f9e666e62 --- /dev/null +++ b/media-gfx/sane-backends/files/sane-backends-1.0.27-canon-lide-100.patch @@ -0,0 +1,17 @@ +diff -up sane-backends-1.0.27/backend/genesys.c.canon-lide-100 sane-backends-1.0.27/backend/genesys.c +--- sane-backends-1.0.27/backend/genesys.c.canon-lide-100 2018-02-01 10:37:26.160044539 +0100 ++++ sane-backends-1.0.27/backend/genesys.c 2018-02-01 10:45:44.616653277 +0100 +@@ -2070,11 +2070,9 @@ genesys_white_shading_calibration (Genes + dev->model->cmd_set->set_lamp_power (dev, dev->calib_reg, SANE_TRUE); + dev->model->cmd_set->set_motor_power (dev->calib_reg, motor); + +- /* if needed, go back before doin next scan, by using rewind, registers and +- * slopes table are kept intact from previous scan */ +- if (dev->model->flags & GENESYS_FLAG_SHADING_REPARK && dev->model->cmd_set->rewind) ++ if (dev->model->flags & GENESYS_FLAG_SHADING_REPARK) + { +- status = dev->model->cmd_set->rewind (dev); ++ status = dev->model->cmd_set->slow_back_home (dev, SANE_TRUE); + } + + status = diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.27-network.patch b/media-gfx/sane-backends/files/sane-backends-1.0.27-network.patch new file mode 100644 index 000000000000..2605ea83578d --- /dev/null +++ b/media-gfx/sane-backends/files/sane-backends-1.0.27-network.patch @@ -0,0 +1,42 @@ +diff --git a/sanei/sanei_tcp.c b/sanei/sanei_tcp.c +index a57d7c7..d0a1e92 100644 +--- a/sanei/sanei_tcp.c ++++ b/sanei/sanei_tcp.c +@@ -45,6 +45,7 @@ + #include <unistd.h> + #include <stdlib.h> + #include <string.h> ++#include <time.h> + + #ifdef HAVE_WINSOCK2_H + #include <winsock2.h> +@@ -123,14 +124,27 @@ sanei_tcp_write(int fd, const u_char * buf, int count) + ssize_t + sanei_tcp_read(int fd, u_char * buf, int count) + { +- ssize_t bytes_recv = 0, rc = 1; ++ ssize_t bytes_recv = 0, rc = 1; ++ int retry = 5; + + while (bytes_recv < count && rc > 0) + { + rc = recv(fd, buf+bytes_recv, count-bytes_recv, 0); ++ DBG(1, "%s: bytes received %d\n", __FUNCTION__, rc); + if (rc > 0) + bytes_recv += rc; +- ++ else { ++ if ( errno == EAGAIN && retry-- ) { ++ DBG(1, "%s: waiting %d\n", __FUNCTION__, retry); ++ /* wait for max 1s */ ++ struct timespec req; ++ struct timespec rem; ++ req.tv_sec = 0; ++ req.tv_nsec= 100000000; ++ nanosleep(&req, &rem); ++ rc = 1; ++ } ++ } + } + return bytes_recv; + } diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild new file mode 100644 index 000000000000..4b7b9d954cdb --- /dev/null +++ b/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild @@ -0,0 +1,340 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit flag-o-matic multilib-minimal systemd toolchain-funcs udev user xdg-utils + +# gphoto and v4l are handled by their usual USE flags. +# The pint backend was disabled because I could not get it to compile. +IUSE_SANE_BACKENDS=" + abaton + agfafocus + apple + artec + artec_eplus48u + as6e + avision + bh + canon + canon630u + canon_dr + canon_pp + cardscan + coolscan + coolscan2 + coolscan3 + dc210 + dc240 + dc25 + dell1600n_net + dmc + epjitsu + epson + epson2 + fujitsu + genesys + gt68xx + hp + hp3500 + hp3900 + hp4200 + hp5400 + hp5590 + hpljm1005 + hpsj5s + hs2p + ibm + kodak + kodakaio + kvs1025 + kvs20xx + kvs40xx + leo + lexmark + ma1509 + magicolor + matsushita + microtek + microtek2 + mustek + mustek_pp + mustek_usb + mustek_usb2 + nec + net + niash + p5 + pie + pixma + plustek + plustek_pp + pnm + qcam + ricoh + rts8891 + s9036 + sceptre + sharp + sm3600 + sm3840 + snapscan + sp15c + st400 + stv680 + tamarack + teco1 + teco2 + teco3 + test + u12 + umax + umax1220u + umax_pp + xerox_mfp" + +IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf" + +for backend in ${IUSE_SANE_BACKENDS}; do + case ${backend} in + # Disable backends that require parallel ports as no one has those anymore. + canon_pp|hpsj5s|mustek_pp|\ + pnm) + IUSE+=" -sane_backends_${backend}" + ;; + mustek_usb2|kvs40xx) + IUSE+=" sane_backends_${backend}" + ;; + *) + IUSE+=" +sane_backends_${backend}" + esac +done + +REQUIRED_USE=" + sane_backends_mustek_usb2? ( threads ) + sane_backends_kvs40xx? ( threads ) +" + +DESCRIPTION="Scanner Access Now Easy - Backends" +HOMEPAGE="http://www.sane-project.org/" +MY_P="${P}" +FRS_ID="4224" +SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz" + +LICENSE="GPL-2 public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + +RDEPEND=" + sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + sane_backends_dell1600n_net? ( + >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] + >=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}] + ) + sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] ) + gphoto2? ( + >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}] + >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] + ) + v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) + xinetd? ( sys-apps/xinetd ) + snmp? ( net-analyzer/net-snmp ) + systemd? ( sys-apps/systemd:0= ) + zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) +" + +DEPEND="${RDEPEND} + v4l? ( sys-kernel/linux-headers ) + >=sys-devel/gettext-0.18.1 + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +" + +# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device) +RDEPEND="${RDEPEND} + !<sys-fs/udev-114 +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/sane-config +) + +pkg_setup() { + enewgroup scanner + enewuser saned -1 -1 -1 scanner +} + +src_prepare() { + default + + xdg_environment_reset + + cat >> backend/dll.conf.in <<-EOF + # Add support for the HP-specific backend. Needs net-print/hplip installed. + hpaio + # Add support for the Epson-specific backend. Needs media-gfx/iscan installed. + epkowa + EOF + + eapply "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch + eapply "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch + + # From Arch + eapply "${FILESDIR}"/${PN}-1.0.27-network.patch + + # From Fedora + # Fix https://bugs.gentoo.org/635348 + eapply "${FILESDIR}"/${PN}-1.0.27-canon-lide-100.patch + + # Fix for "make check". Upstream sometimes forgets to update this. + local ver=$(./configure --version | awk '{print $NF; exit 0}') + sed -i \ + -e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \ + testsuite/tools/data/html* || die +} + +src_configure() { + append-flags -fno-strict-aliasing # From Fedora + + # if LINGUAS is set, just use the listed and supported localizations. + if [[ ${LINGUAS+set} == "set" ]]; then + mkdir -p po || die + strip-linguas -u po + printf '%s\n' ${LINGUAS} > po/LINGUAS + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + # the blank is intended - an empty string would result in building ALL backends. + local BACKENDS=" " + + use gphoto2 && BACKENDS="gphoto2" + use v4l && BACKENDS="${BACKENDS} v4l" + for backend in ${IUSE_SANE_BACKENDS}; do + if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then + BACKENDS="${BACKENDS} ${backend}" + fi + done + + local myconf=( + $(use_with usb) + $(multilib_native_use_with snmp) + ) + + # you can only enable this backend, not disable it... + if use sane_backends_pnm; then + myconf+=( --enable-pnm-backend ) + fi + if use sane_backends_mustek_pp; then + myconf+=( --enable-parport-directio ) + fi + if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then + myconf+=( sane_cv_use_libieee1284=no ) + fi + + # relative path must be used for tests to work properly + ECONF_SOURCE=${S} \ + SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ + BACKENDS="${BACKENDS}" \ + econf \ + $(use_with gphoto2) \ + $(multilib_native_use_with systemd) \ + $(use_with v4l) \ + $(use_enable ipv6) \ + $(use_enable threads pthread) \ + $(use_enable zeroconf avahi) \ + "${myconf[@]}" +} + +multilib_src_compile() { + emake VARTEXFONTS="${T}/fonts" + + if tc-is-cross-compiler; then + pushd "${BUILD_DIR}"/tools >/dev/null || die + + # The build system sucks and doesn't handle this properly. + # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 + tc-export_build_env BUILD_CC + ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \ + -I. -I../include -I"${S}"/include \ + "${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \ + "${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die + local dirs=( hal hotplug hotplug-ng udev ) + local targets=( + hal/libsane.fdi + hotplug/libsane.usermap + hotplug-ng/libsane.db + udev/libsane.rules + ) + mkdir -p "${dirs[@]}" || die + emake "${targets[@]}" + + popd >/dev/null + fi + + if use usb; then + sed -i -e '/^$/d' \ + tools/hotplug/libsane.usermap || die + fi +} + +multilib_src_install() { + emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \ + docdir="${EPREFIX}"/usr/share/doc/${PF} + + if multilib_is_native_abi; then + if use usb; then + insinto /etc/hotplug/usb + doins tools/hotplug/libsane.usermap + fi + + udev_newrules tools/udev/libsane.rules 41-libsane.rules + insinto "/usr/share/pkgconfig" + doins tools/sane-backends.pc + fi +} + +multilib_src_install_all() { + keepdir /var/lib/lock/sane + fowners root:scanner /var/lib/lock/sane + fperms g+w /var/lib/lock/sane + dodir /etc/env.d + + if use systemd; then + systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service" + systemd_newunit "${FILESDIR}"/saned.socket saned.socket + fi + + if use usb; then + exeinto /etc/hotplug/usb + doexe tools/hotplug/libusbscanner + newdoc tools/hotplug/README README.hotplug + fi + + dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux + find "${D}" -name '*.la' -delete || die + + if use xinetd; then + insinto /etc/xinetd.d + doins "${FILESDIR}"/saned + fi + + newinitd "${FILESDIR}"/saned.initd saned + newconfd "${FILESDIR}"/saned.confd saned +} + +pkg_postinst() { + if use xinetd; then + elog "If you want remote clients to connect, edit" + elog "/etc/sane.d/saned.conf and /etc/hosts.allow" + fi + + if ! use systemd; then + elog "If you are using a USB scanner, add all users who want" + elog "to access your scanner to the \"scanner\" group." + fi +} diff --git a/media-gfx/sane-frontends/Manifest b/media-gfx/sane-frontends/Manifest index 5ccaed2f6f99..00286547d8e0 100644 --- a/media-gfx/sane-frontends/Manifest +++ b/media-gfx/sane-frontends/Manifest @@ -1,5 +1,5 @@ AUX MissingCapsFlag.patch 417 BLAKE2B 5382644f1c8af41fb383bf9889528f279bbac0a18ee2e38f080769b653f24fc02dec53f88f364441d8ceb6d401ad70137215627a181434f6cfcf8245a1d6c37c SHA512 39790a52414a7edcfc4dd9379bd8f35ce91e932209ba9c2ab3f1cb9e5dd140b37f3bfed1e642050a142da43ae435329ab60e201f2934be76648380615a3f37ef DIST sane-frontends-1.0.14.tar.gz 231892 BLAKE2B 3d3af2ded774fa90ba4b9545a00df1f036fc72edb71a69f803dde84ca1e9d37b4d20ac91d046ce702c31eb7353d2d85b91cbf8bd53b84adea7f2e58f8be1a062 SHA512 51b24a9bd6889e99419c1d6abb30cb14d8f89b6196c5147044697bdb1b39ee029bdc0d7c6e1f1e800491988aa26f658bc974b25040c49d008ca8977673c78710 -EBUILD sane-frontends-1.0.14-r3.ebuild 1384 BLAKE2B 72e77d42ae9df9ca8f6d8208ff9fdfe144abbdf7af05fdbbc9bc8f5c884597a103bcf934d6eabf72b52f89649de82a8469db6e355e0c83de936b17850f79b6eb SHA512 2f3f8efb7ae76979b53116071095c74a339463b2bc00d77256d3420e518e91ca28268eeb538f489e8eeeffbb60d4c81ec08e6b20c9c7dce6d553679dc388a5a0 +EBUILD sane-frontends-1.0.14-r3.ebuild 1383 BLAKE2B 7d052cc6d4a264882a6c9911da71ee72cb95d3d3c721ebc6cf22fbdfc14707c30022bc7e68aaa1fb4c4eddfd96ccd64ea841e898d30cc02456d089a8f8645a5b SHA512 5eb78a706d3b41f60365e17fbc9f0c1ad619e8bc815c1e8615ea1cccd7050fa564e98dd33991f4f8cf2d9e862606d8351c3a17449d561e43a3f2b20ca3a98de7 EBUILD sane-frontends-1.0.14.ebuild 1430 BLAKE2B 9f579d1cc997961f304479a4070f2630fb0e34cfb128b64671ad4278b1fe4fd52ab227cbdb51941a04eb10051a19b1dc9ece6233e452b62f19e177afe4d79ec7 SHA512 0f433d8f9915d2ba644b3d76e04e9b3bd208a8c9f3c62067203e0e5b571deab87f2577114f846143d3ca860ecfca9b383a8a3d0f470047009754ae0853ca4e30 MISC metadata.xml 377 BLAKE2B 83b01e823ed6ad91413a2e23899b9fa78b3b3c6d84d52b0ee122976d1a2de2a21c5089ca0460aceb7a9d28f0cc854d3fc358e97c6f02f4116cc5b75a3ca802fd SHA512 57b14e3a91c20de45448332c24a3e681a48498a27244ac1a05e313a87081cb116f12f3fab170a18dca2b3fc55aca7785fc0713bccdad192ba7683982d83fda22 diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild index 1521775203a2..7a660c37865b 100644 --- a/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild +++ b/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild @@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~ppc ~ppc64 sparc x86" +KEYWORDS="alpha amd64 ~ppc ppc64 sparc x86" IUSE="gimp gtk" RDEPEND=" diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest index ba0de9878f0e..d6e83af1c72c 100644 --- a/media-gfx/ufraw/Manifest +++ b/media-gfx/ufraw/Manifest @@ -6,6 +6,6 @@ AUX ufraw-0.22-jasper-automagic.patch 613 BLAKE2B 100e6b31540030a20c8cff8e99329a AUX ufraw-0.22-jpeg9.patch 1076 BLAKE2B 84448c537706d7b29f54d4735a75bf9501eac7927529c6d8e43d6cd746763ab753715d54cf943bb8bb5ddd8a29891f7522a680426acd2eb52af450492656ae3e SHA512 520e9351d7b8aa84f79a7c2841c2f56eaca849e67e448dc9503d248e31c1aa9fecaa64a332c0a155b6ba1ab7debec8734f3f2ef710bcb534a5fca34e9b5c8f7c DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2 EBUILD ufraw-0.22-r1.ebuild 1942 BLAKE2B d9e275268bacb9820d75e04386f3b5152e93f72e6d06bc9a0cb1dd98ae6b8364d28167ac83cac70994f0b318bd6cfe36fa57dd1ace6f6a287a9fca5b13067ae3 SHA512 1b10bb5090511f5bed94145e7372b7a0b2828170bfceb02ca9cddf979e7327b4dc8bff85b91b9c40f09a36b3c7fbb20d5a9d894d7b323b1010d6ac5f00e97b8d -EBUILD ufraw-0.22-r2.ebuild 1965 BLAKE2B fc8e7247f651b5679eac63b76ed37b9939f5c97d0e1cda13f4be4ba9a30d163a536c0cddfe25f5b55c0d6ed617af658767e3d6121264971d2db0f872d031f738 SHA512 bf8ed4458c40811632f4545f24273c3bee714bbec090ec1887aface7f25c8e3f22b7a1c1f99e36fc90c894bcec4571b27b3bc2bf8acafe6d23eb28a3473585d4 +EBUILD ufraw-0.22-r2.ebuild 1969 BLAKE2B af42a710863a36e7dc7e7ba5a40dfde787a21af5023bfdb2d8d6bb2588498fbe04c3adfaa1f43cab90ab8d3272dc340d2cb3ab1c64c114bc551e9c16a5b36262 SHA512 c134d1dc3f46bb48712e223f00a36cd67d1f919f9e201b3c5e17dcb94bab17d2cab349b22139f6f8bf7acea5044aff1cd6e7adb061af4ab63d64162d9aebaa32 EBUILD ufraw-0.22.ebuild 1684 BLAKE2B 8af30a9b68373d19ae65485f0c424a73f72fa560030fd2ffcb8bdbc618e8bc8b315316c9afb3040e872bbe2109298a8f62c647e85b5e13da702967cb5fe92e32 SHA512 5c9374c8eaf5ac4cbd5aeedcc72de973b9160fbe0b7022ad86a690407b013c613dba97b2116dd1a54830ecec92b5793d6f21525fb75e62c060ae6be0729ef414 MISC metadata.xml 588 BLAKE2B 3e6ec0c8b11a3c30d1b20b5df4303fc1bc10b4e6459a24358ac50bcfaa414b307efe6d392d23fd7ce1443917865deae0dfa89cc7a068567f227cdc387f99d1cb SHA512 3d161ddfe0da5620312603d66acbc24244317da4dcb905558eddda9d54bf96024881ffbdcaa49f9daf73d779d5e7dbb47a523e05cc6c614756b468f14ef66ab9 diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild b/media-gfx/ufraw/ufraw-0.22-r2.ebuild index 8d52ba4acf84..0c33b6448d38 100644 --- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild +++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone" REQUIRED_USE="gimp? ( gtk )" diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest index 388230b80379..11523c5a547f 100644 --- a/media-gfx/xfig/Manifest +++ b/media-gfx/xfig/Manifest @@ -1,20 +1,6 @@ -AUX xfig-3.2.5b-app-defaults.patch 605 BLAKE2B b16238a4b90e331193a81023fd97bfa99698d065235c51b839d8a174366fb0cd46f78349f450f14bb9166bdf88fe89b525fcce6a04f2cadaae3560119a8565d1 SHA512 5ff467feffc307200812d7d0d9b165178953e9dcf540f6a87d5baa00308a96ea69d2073a64bcde231e6bb43ebd2e811e8e0d0ec8bcc8efa4180037828cc9dc0d -AUX xfig-3.2.5b-mkstemp.patch 983 BLAKE2B 94fe5ebf0ff138bdc4cf7c349c67b53eca8c11bae73cd6cc34ea501b6d7247be3dddb1814b5a3a60ebdad265f25a365c046c9776e2d8b4faf640c4b6734d8324 SHA512 e31590f180b44799d7f11707efa80a765fe5f2caf827f3c1070d4c1da7b4baa774e60249f92e4d1d62d47fe220bf69c1ab96f019211b9dfaec8b6372cfaaf02e -AUX xfig-3.2.5b-network_images.patch 11918 BLAKE2B b745e77f01dc01dacb6aca51921f39e81bc8cdb1ddb3219d79002a70e10f1328bb8d99fadc14a574cd917e42cf68e9c361c82546b550f8de8de48a4a2591af55 SHA512 17bf8519146b5085743d29959ad6416ed2a19da477d2aaa8d4cc82e0b53c060ee1ada036de1c79e4db91e5cc832978c80194b31b0444f0dcbb5edc1136c8afd3 -AUX xfig-3.2.5b-papersize_b1.patch 1127 BLAKE2B 7ad6dbb61944713e3d300be0696bfe153536f96f10b4b80753a6e46f93fec25332c246637e3c3d2d9c41d2192ef5e4cf2a51284bebe3b314e11436e0369002e5 SHA512 6f302560bb359d1ea8ddb902aec1536d757ccb4655124ba00a6cbcc951eb607475b5abe1ae208c91a034a652d29b85c753af91f936bf4bab8bf0b0b259de2404 -AUX xfig-3.2.5b-pdfimport_mediabox.patch 1245 BLAKE2B 94b8db15bead4c45a6c56dfe6cd71479427b498adc3cc79e9b833aadc537c6a9bbcf31ac9899758c5d5eec8375ec60f244bd50f975e8c103d3b948a1b2dd4ecc SHA512 88d1cd6fc81e975209b86c0aa656760bcd1d1bc2bc393f3af16c905b5991a469dcd35660300d7c0c84de42c98018922125d6ff757e4dcd707b09931ff49abd39 -AUX xfig-3.2.5b-solaris.patch 507 BLAKE2B 9a0bba08d77696cda3830f0c8ed6f42b18b89ac812c67ba94b8a09c04d51a50d365e1a2e766faf779c4286fee2ddc4ca18b9ee95d67fefa8d144d5f03bd74df6 SHA512 23cca988a45132e9a28657f3c03aa4c79d32cf4ed1875c210055e88ad07bf887843c13a7d02472af566493fd8a5f4acc533bcdc8e90ff907736b6a08073ca754 -AUX xfig-3.2.5b-urwfonts.patch 4925 BLAKE2B 975a7558f162daeadec40d922d69b2d0724abf66e47c45a29252caa6af3f0d55a149944d38863bbf65448a8e19e25d4b2501d4b010ff9f86e7adb7537a74fc25 SHA512 4b720e7f61b78ff10abbbfc78fc7749517555a6c6447667d629717bb843bc34a1c345640ba85b3f1aca0a35c189184d20148ed8baaf95f54b7172602d1e1c8f1 -AUX xfig-3.2.5c-XAW3D1_5E_notlocal.patch 1590 BLAKE2B 6474442a25bc2b13b3c2a3783047ea5bea3afe0233c34497940f879e2b9dce7e17b8a28736f3d650944d6ba4a8a5dcab64b36fcfb0e2854de4914b7a64f05d67 SHA512 493b34b167ed0807c6f417f6d468d73170d3246576320582e9e9c8a7bbb55a7a14820eb756f7f05a3d53d942b8b4ef63689744d77c4c554d6e35f9e2be64a482 -AUX xfig-3.2.5c-crash-on-exit.patch 526 BLAKE2B 8aefa2c4b7d4f4b7a4b89cf27fb7507dba837617912a57da86d8292c615526c589804b28336d66c6ae6a02f24c0dd19f6253254edd2ddb0ef70a2ba6ad0ca6e5 SHA512 e3e7baebab9b8efcb621971a873185ccf7202a98ba26ca505aeae1831e0f78ce87fb17f5c62ee646e5b21668922555f47817cf179796a02a53534e4648f0650e -AUX xfig-3.2.5c-darwin.patch 812 BLAKE2B 1b6de6896f99592855f14c60505c40fa3f5008ff54cb47cb73ba915917f85e971537a11b909e8b3e672974be4210f57bf0b9ada3388ba2d6b9ee15ecda74bbf0 SHA512 2aa3d845e8fa646cd8a4c0a6892d505c64c6750268b238e7327fb4fd4677401c1dbe976ae4abc5ebb1bb7b8f38e5b8f875b7051dd557eb33ea221489639d40de -AUX xfig-3.2.5c-spelling.patch 545 BLAKE2B 8a3e82f4cab421f8ec7802654eefa65bace2b075b557421137048af114b61d2d7ee3bc38726556318c863a1d8378315db09775f92eecd7d212d85755fcb57d9a SHA512 3e33470459b249acd65dec1f467e2527f05a625d5ec8d539d943144aedf784d231ed8750441b073e752dfaedda2aedb60bc64cb97b8ddafff72fca0f3f0325ab AUX xfig-3.2.6a-app-defaults.patch 502 BLAKE2B e7277af104c8fd9ed652e2ec6b175376157583f60659564f846348dbb5a205669989f7fd31e8069548af32a424be87548b6b3033d004bcd24e1a44d262a53c38 SHA512 4c5b523f17cacc85839eeb287a82192c9c3d8c704cca34c8de87d38aa05fb502afdadb9169a396573fb977e650ca7a1fabbdab067fb128be024dea724cb791be AUX xfig-3.2.6a-solaris.patch 523 BLAKE2B eeae0cc11ae6e3fd6e8c157648d8663131d0d11b020f5e64ec1a324f05ee5bd08be8c111c1ebe34065256d64d103619f61ff3f5524aa7636eb8f76e9aa64a714 SHA512 b2eb546b8fdd0d18bab3d9a2c183149fdb4fb278d5e2d8234f040c4fef727bec7461f861391027dea32028b822aa2e540824cb18af09769f32c7a1fb7bf48319 AUX xfig-3.2.6a-urwfonts.patch 4933 BLAKE2B eb1edf6b30966864dbdf3e932f2cde231ff5777cdc0dff34cf047a169335ba78e493b10817e39aac72221d17d491138c3c28a3b293582d3808255140d5df6762 SHA512 29fea111b6c07f6ea28bc46259c0dc8d20b1bbf86e33d550037744b93d4f4de7ec9c4ea7fa14c5f91a4278848216d183ac841970c798140359e1fc317baac468 DIST xfig-full-3.2.6a.tar.xz 5502944 BLAKE2B 3a83feeb5647ffa9586b9ce40116e9854a423c0cc90265ad78b27c0c82a15bbda9d9734475aba13f442c259cd0489a667242f319ac758ddbfea1a5b268e12550 SHA512 82e292e050213b6d22be5e174224308b446505e25208f29d4f4c5e760a87ff4104b9dcea0a332241c9bca358e1d44336bb38c316eb3f28130d7c8828c10a805f -DIST xfig.3.2.5c.full.tar.gz 6078933 BLAKE2B 44ccad26fa3d7a57b0e8798d6ebfe6682baf15046d9e360d7a7569cac54c403c0068671e27a5289dbb4f70dafd12c1653a61709749a8298874bc49528783973b SHA512 763bd6fd43bff9b44f934dd6e16b0aa5142041f895e74564d28e7252e012f1c7728bbee40e3970357c7d3fd15aa109dbfcbc1d0a2203fa1a2ed770aabacd9525 -EBUILD xfig-3.2.5c.ebuild 3303 BLAKE2B ca99f5134de4c15df3ae3f656684b3f6bea7f6e7a20e2bae0899e684025475f46bfa2c41792b507db3982637c985e67522261abaa78fda4f399e4ae134cd9139 SHA512 538cee1a1626c417a967f4c4810a0b8924169f61c153b67e8479243dab39041d05cda40e98e5bbc8c2fe5e571fb85acbe0425072c56906d08c53e4bce8be8c1b -EBUILD xfig-3.2.6a-r1.ebuild 1195 BLAKE2B 417a2288dc0c2ffef4e410ef928c263c16ce2bbc007223cb63056482a81db14dbc20e2ef83db1b41afe155efa39d3c1bf87f43846a0f4a905d78f2ec6b40a580 SHA512 3ac4318244774a3a73fcf1ccb958a7bef931c0165927e293d8557f181554c6aff41e4e2e7365750d5d9bdd7fee5c08c892d80720d001f1f3894bfed294ccecc1 -EBUILD xfig-3.2.6a.ebuild 1205 BLAKE2B 9ad9fb464ceb7819bd0eb81860b742b9071ff31b248643bba4859f53384d330948b4061231bda20c4e33589aae71b51a7c2a011ab110a2cb0b6b70b697ceed8b SHA512 883f0e7fb6a90f3d5f288e340fce9ab25b09a9209edafb44dffef945cd96f04619dabcff06d8526114017ab926a5d091aefbd97d7e1fbc423949c9a0fc9ea1c5 +EBUILD xfig-3.2.6a-r1.ebuild 1188 BLAKE2B 20b4641d066b9634e046cd4e2cda4a3e975aa729133f7e8a63d73854ccba53d8b2c1a19afed2d4d8136dfa3acaeda4b6b56e52b3913abfb5f0371cdd8cc70967 SHA512 0f509415bed84d05fbecdc404b3ed09601dc7216ed969d5879c939a2d91d942ec79dd7670ebe103675086a924986e517b39210f77ff81f1b93dc4ae6517a93cc MISC metadata.xml 212 BLAKE2B 71dabc83d0433b968a559d72c4d8a18ff9477e154e5b7e72ca22b859a0fec0ae23b0fdad7233686c6c1e20178142f5c60bf93f58db30c5109106e4d86b9f1cef SHA512 05c3af7b4c872998a64d3d6dce356ad1bfeb67f4ec845e82e022a89c96945ba5fe8848df48b8736feb39bd4d9a7d6714f0895a9c824e3c67d903ea3da1ca0f22 diff --git a/media-gfx/xfig/files/xfig-3.2.5b-app-defaults.patch b/media-gfx/xfig/files/xfig-3.2.5b-app-defaults.patch deleted file mode 100644 index 560ddef94ebb..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5b-app-defaults.patch +++ /dev/null @@ -1,24 +0,0 @@ -Defaults for xfig. Idea from Roland Rosenfeld <roland@debian.org> - -diff -urNad xfig~/Fig.ad xfig/Fig.ad ---- a/Fig.ad -+++ b/Fig.ad -@@ -10,13 +10,17 @@ - - ! some sample settings you may want to change - -+! If the following resource is set to false, xfig will use metric units -+! by default. -+Fig.inches: false -+ - ! The following fixes a problem that some window managers have - ! with xfig continually resizing itself - - Fig*AllowShellResize: false - - ! Image editor - can edit imported image --Fig.image_editor: xv -+Fig.image_editor: gimp - - ! name of ghostscript (not ghostview) - Fig.ghostscript: gs diff --git a/media-gfx/xfig/files/xfig-3.2.5b-mkstemp.patch b/media-gfx/xfig/files/xfig-3.2.5b-mkstemp.patch deleted file mode 100644 index 931ac94e58a4..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5b-mkstemp.patch +++ /dev/null @@ -1,32 +0,0 @@ -Missed hunk noticed https://bugzilla.redhat.com/show_bug.cgi?id=505257#c1 is recreated. - -http://bugs.gentoo.org/show_bug.cgi?id=264575 - -=== modified file 'u_print.c' ---- a/u_print.c 2010-01-14 19:50:08 +0000 -+++ b/u_print.c 2010-01-14 19:54:14 +0000 -@@ -202,14 +202,22 @@ - char tmp_fig_file[PATH_MAX]; - char *outfile, *name, *real_lang; - char *suf; -+ int fd; - - /* if file exists, ask if ok */ - if (!ok_to_write(file, "EXPORT")) - return (1); - -- sprintf(tmp_fig_file, "%s/%s%06d", TMPDIR, "xfig-fig", getpid()); -+ snprintf(tmp_fig_file, sizeof(tmp_fig_file), "%s/xfig-fig.XXXXXX", TMPDIR); - /* write the fig objects to a temporary file */ - warnexist = False; -+ -+ if ((fd = mkstemp(tmp_fig_file)) == -1) { -+ file_msg("Can't open temp file %s: %s\n", tmp_fig_file, strerror(errno)); -+ return; -+ } -+ close(fd); -+ - init_write_tmpfile(); - if (write_file(tmp_fig_file, False)) { - end_write_tmpfile(); - diff --git a/media-gfx/xfig/files/xfig-3.2.5b-network_images.patch b/media-gfx/xfig/files/xfig-3.2.5b-network_images.patch deleted file mode 100644 index 1f7be5ff99a9..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5b-network_images.patch +++ /dev/null @@ -1,371 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 12_network_images.dpatch by Roland Rosenfeld <roland@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Some network icons colored and/or combined by Roland Rosenfeld. - -@DPATCH@ -diff -urNad xfig~/Libraries/Networks/Devices/firewall-pair.fig xfig/Libraries/Networks/Devices/firewall-pair.fig ---- Libraries/Networks/Devices/firewall-pair.fig -+++ Libraries/Networks/Devices/firewall-pair.fig -@@ -0,0 +1,75 @@ -+#FIG 3.2 Produced by xfig version 3.2.5-alpha5 -+Portrait -+Center -+Inches -+A4 -+100.00 -+Single -+-2 -+# A pair of firewalls -+# Combined by Roland Rosenfeld -+1200 2 -+0 32 #aeaaae -+# A pair of firewalls -+6 3375 2175 4050 3075 -+6 3600 2250 4050 3075 -+# Firewall -+# (from TomiOllila <Tomi.Ollila@tfi.net> ) -+6 3600 2250 4050 3075 -+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2 -+ 3825 3075 3825 2475 -+2 1 0 1 0 20 2 0 20 0.000 0 0 -1 0 0 5 -+ 3675 2475 3675 3075 3825 3075 3975 2925 3975 2400 -+2 1 0 1 0 32 1 0 20 0.000 0 0 -1 0 0 7 -+ 3600 2400 3600 2475 3900 2475 4050 2325 4050 2250 3750 2250 -+ 3600 2400 -+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3 -+ 3900 2475 3900 2400 3600 2400 -+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2 -+ 3900 2400 4050 2250 -+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3 -+ 3675 2625 3825 2625 3975 2475 -+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3 -+ 3675 2775 3825 2775 3975 2625 -+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3 -+ 3675 2925 3825 2925 3975 2775 -+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2 -+ 3900 3000 3900 2850 -+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2 -+ 3900 2700 3900 2550 -+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2 -+ 3750 2475 3750 2625 -+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2 -+ 3750 2775 3750 2925 -+-6 -+-6 -+6 3375 2175 3825 3000 -+6 3450 2175 3825 3000 -+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2 -+ 3600 3000 3600 2400 -+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2 -+ 3675 2325 3825 2175 -+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3 -+ 3450 2550 3600 2550 3750 2400 -+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3 -+ 3450 2700 3600 2700 3750 2550 -+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3 -+ 3450 2850 3600 2850 3750 2700 -+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2 -+ 3675 2925 3675 2775 -+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2 -+ 3675 2625 3675 2475 -+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2 -+ 3525 2400 3525 2550 -+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2 -+ 3525 2700 3525 2850 -+-6 -+2 1 0 1 0 20 22 0 20 0.000 0 0 -1 0 0 5 -+ 3450 2400 3450 3000 3600 3000 3750 2850 3750 2325 -+2 1 0 1 0 32 21 0 20 0.000 0 0 -1 0 0 7 -+ 3375 2325 3375 2400 3675 2400 3825 2250 3825 2175 3525 2175 -+ 3375 2325 -+2 1 0 1 0 7 20 0 -1 0.000 0 0 -1 0 0 3 -+ 3675 2400 3675 2325 3375 2325 -+-6 -+-6 -diff -urNad xfig~/Libraries/Networks/Devices/internet.fig xfig/Libraries/Networks/Devices/internet.fig ---- Libraries/Networks/Devices/internet.fig -+++ Libraries/Networks/Devices/internet.fig -@@ -0,0 +1,39 @@ -+#FIG 3.2 Produced by xfig version 3.2.5-alpha5 -+Portrait -+Center -+Inches -+A4 -+100.00 -+Single -+-2 -+# Internet cloud -+# By Roland Rosenfeld -+1200 2 -+# An Internet cloud -+6 4275 5700 7200 7650 -+2 1 0 0 7 7 970 0 20 4.000 0 0 0 0 0 65 -+ 4719 7111 4633 7121 4548 7105 4469 7057 4394 6983 4346 6888 -+ 4309 6776 4298 6654 4309 6526 4346 6415 4394 6325 4469 6244 -+ 4548 6197 4633 6181 4719 6197 4798 6048 4893 5915 4994 5825 -+ 5122 5746 5244 5719 5377 5719 5505 5746 5627 5825 5733 5915 -+ 5850 5825 5961 5746 6094 5719 6222 5719 6355 5746 6472 5825 -+ 6583 5915 6668 6048 6748 6197 6833 6181 6918 6197 7003 6244 -+ 7072 6325 7130 6415 7157 6526 7168 6654 7157 6776 7130 6888 -+ 7072 6983 7003 7057 6918 7105 6833 7121 6748 7111 6668 7265 -+ 6583 7387 6472 7488 6355 7557 6222 7594 6094 7594 5961 7557 -+ 5850 7488 5733 7387 5627 7488 5505 7557 5377 7594 5244 7594 -+ 5122 7557 4994 7488 4893 7387 4798 7265 4719 7111 -+2 1 0 2 1 0 969 0 -1 0.000 0 0 0 0 0 65 -+ 4719 7111 4633 7121 4548 7105 4469 7057 4394 6983 4346 6888 -+ 4309 6776 4298 6654 4309 6526 4346 6415 4394 6325 4469 6244 -+ 4548 6197 4633 6181 4719 6197 4798 6048 4893 5915 4994 5825 -+ 5122 5746 5244 5719 5377 5719 5505 5746 5627 5825 5733 5915 -+ 5850 5825 5961 5746 6094 5719 6222 5719 6355 5746 6472 5825 -+ 6583 5915 6668 6048 6748 6197 6833 6181 6918 6197 7003 6244 -+ 7072 6325 7130 6415 7157 6526 7168 6654 7157 6776 7130 6888 -+ 7072 6983 7003 7057 6918 7105 6833 7121 6748 7111 6668 7265 -+ 6583 7387 6472 7488 6355 7557 6222 7594 6094 7594 5961 7557 -+ 5850 7488 5733 7387 5627 7488 5505 7557 5377 7594 5244 7594 -+ 5122 7557 4994 7488 4893 7387 4798 7265 4719 7111 -+4 0 0 100 0 18 33 0.0000 4 405 2040 4744 6853 Internet\001 -+-6 -diff -urNad xfig~/Libraries/Networks/Routers/router-pair.fig xfig/Libraries/Networks/Routers/router-pair.fig ---- Libraries/Networks/Routers/router-pair.fig -+++ Libraries/Networks/Routers/router-pair.fig -@@ -0,0 +1,78 @@ -+#FIG 3.2 Produced by xfig version 3.2.5-alpha5 -+Portrait -+Center -+Inches -+A4 -+100.00 -+Single -+-2 -+# A pair of routers -+# Colored and combined by Roland Rosenfeld -+1200 2 -+# A pair of routers -+6 3150 3300 4275 3975 -+6 3346 3450 4269 3975 -+6 3844 3615 4173 3718 -+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8 -+ 3879 3701 3854 3647 3976 3624 3955 3642 4159 3676 4111 3713 -+ 3908 3676 3879 3701 -+-6 -+6 3617 3636 3803 3759 -+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8 -+ 3764 3731 3638 3754 3634 3694 3671 3703 3738 3646 3800 3657 -+ 3727 3719 3764 3731 -+-6 -+6 3803 3470 3988 3594 -+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 7 0 0 8 -+ 3837 3518 3982 3481 3983 3541 3947 3535 3876 3591 3809 3581 -+ 3882 3526 3837 3518 -+-6 -+1 2 0 1 0 15 51 0 20 0.000 1 0.0000 3807 3619 457 169 3349 3619 4264 3619 -+1 2 0 1 0 15 53 0 20 0.000 1 0.0000 3803 3806 457 169 3346 3806 4261 3806 -+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8 -+ 3705 3557 3738 3608 3609 3637 3638 3615 3439 3581 3488 3545 -+ 3681 3576 3705 3557 -+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 -+ 3350 3613 3347 3812 -+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 -+ 4263 3626 4263 3815 -+2 2 0 0 0 15 52 -1 20 0.000 0 0 -1 0 0 5 -+ 3349 3626 4269 3626 4269 3800 3349 3800 3349 3626 -+-6 -+6 3150 3300 4125 3825 -+6 3600 3450 3975 3600 -+# polyline
-+2 1 0 1 0 7 60 0 20 0.000 0 0 0 0 0 8 -+ 3683 3551 3658 3497 3780 3474 3759 3492 3963 3526 3915 3563 -+ 3712 3526 3683 3551 -+-6 -+6 3600 3300 3825 3450 -+# polyline
-+2 1 0 1 0 7 60 0 20 0.000 0 0 7 0 0 8 -+ 3641 3368 3786 3331 3787 3391 3751 3385 3680 3441 3613 3431 -+ 3686 3376 3641 3368 -+-6 -+6 3375 3450 3675 3675 -+# polyline
-+2 1 0 1 0 7 60 0 20 0.000 0 0 0 0 0 8 -+ 3568 3581 3442 3604 3438 3544 3475 3553 3542 3496 3604 3507 -+ 3531 3569 3568 3581 -+-6 -+1 2 0 1 0 15 61 0 20 0.000 1 0.0000 3611 3469 457 169 3153 3469 4068 3469 -+1 2 0 1 0 15 63 0 20 0.000 1 0.0000 3607 3656 457 169 3150 3656 4065 3656 -+2 1 0 1 0 7 60 -1 -1 0.000 0 0 -1 0 0 2 -+ 4067 3476 4067 3665 -+# polyline
-+2 1 0 1 0 7 60 0 20 0.000 0 0 0 0 0 8 -+ 3509 3407 3542 3458 3413 3487 3442 3465 3243 3431 3292 3395 -+ 3485 3426 3509 3407 -+2 1 0 1 0 7 60 -1 -1 0.000 0 0 -1 0 0 2 -+ 3154 3463 3151 3662 -+2 2 0 0 0 15 62 -1 20 0.000 0 0 -1 0 0 5 -+ 3153 3476 4073 3476 4073 3650 3153 3650 3153 3476 -+-6 -+-6 -diff -urNad xfig~/Libraries/Networks/Routers/router4.fig xfig/Libraries/Networks/Routers/router4.fig ---- Libraries/Networks/Routers/router4.fig -+++ Libraries/Networks/Routers/router4.fig -@@ -0,0 +1,44 @@ -+#FIG 3.2 Produced by xfig version 3.2.5-alpha5 -+Portrait -+Center -+Metric -+A4 -+100.00 -+Single -+-2 -+# Router -+# Colored by Roland Rosenfeld -+1200 2 -+# Router -+6 3870 4455 5940 5625 -+6 4995 4815 5715 5040 -+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8 -+ 5072 5002 5018 4886 5284 4834 5238 4873 5683 4948 5578 5030 -+ 5136 4948 5072 5002 -+-6 -+6 4500 4860 4905 5130 -+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8 -+ 4822 5067 4545 5117 4537 4989 4618 5007 4766 4883 4900 4905 -+ 4741 5041 4822 5067 -+-6 -+6 4905 4500 5310 4770 -+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 7 0 0 8 -+ 4981 4603 5296 4523 5300 4653 5222 4640 5066 4762 4919 4741 -+ 5079 4622 4981 4603 -+-6 -+1 2 0 1 0 15 51 0 20 0.000 1 0.0000 4914 4824 999 369 3915 4824 5913 4824 -+1 2 0 1 0 15 53 0 20 0.000 1 0.0000 4908 5231 999 369 3909 5231 5907 5231 -+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8 -+ 4693 4690 4766 4800 4483 4863 4545 4814 4111 4740 4219 4661 -+ 4640 4731 4693 4690 -+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 -+ 3917 4811 3910 5244 -+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 -+ 5910 4838 5910 5251 -+2 2 0 0 0 15 52 -1 20 0.000 0 0 -1 0 0 5 -+ 3915 4838 5924 4838 5924 5218 3915 5218 3915 4838 -+-6 -diff -urNad xfig~/Libraries/Networks/Switches/switch-pair.fig xfig/Libraries/Networks/Switches/switch-pair.fig ---- Libraries/Networks/Switches/switch-pair.fig -+++ Libraries/Networks/Switches/switch-pair.fig -@@ -0,0 +1,66 @@ -+#FIG 3.2 Produced by xfig version 3.2.5-alpha5 -+Portrait -+Center -+Inches -+A4 -+100.00 -+Single -+-2 -+# A pair of switches -+# Colored and combined by Roland Rosenfeld -+1200 2 -+# A pair of switches -+6 2550 2625 4725 3750 -+6 2625 2850 4725 3750 -+6 3000 2850 4425 3300 -+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8 -+ 3603 3180 3581 3210 3194 3210 3161 3240 3028 3195 3268 3126 -+ 3214 3184 3608 3184 -+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8 -+ 3651 3128 3673 3098 4060 3098 4093 3068 4226 3113 3986 3182 -+ 4040 3124 3646 3124 -+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8 -+ 3760 3008 3738 3038 3351 3038 3318 3068 3185 3023 3425 2954 -+ 3371 3012 3765 3012 -+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8 -+ 3827 2963 3849 2933 4236 2933 4269 2903 4402 2948 4162 3017 -+ 4216 2959 3822 2959 -+-6 -+2 1 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 4 -+ 4125 3300 4725 2850 4725 3300 4125 3750 -+2 2 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 5 -+ 2625 3300 4125 3300 4125 3750 2625 3750 2625 3300 -+2 3 0 1 0 15 51 -1 20 0.000 0 0 -1 0 0 5 -+ 2625 3300 3225 2850 4725 2850 4125 3300 2625 3300 -+-6 -+6 2550 2625 4650 3525 -+6 2925 2625 4350 3075 -+# polyline
-+2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8 -+ 3528 2955 3506 2985 3119 2985 3086 3015 2953 2970 3193 2901 -+ 3139 2959 3533 2959 -+# polyline
-+2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8 -+ 3576 2903 3598 2873 3985 2873 4018 2843 4151 2888 3911 2957 -+ 3965 2899 3571 2899 -+# polyline
-+2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8 -+ 3685 2783 3663 2813 3276 2813 3243 2843 3110 2798 3350 2729 -+ 3296 2787 3690 2787 -+# polyline
-+2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8 -+ 3752 2738 3774 2708 4161 2708 4194 2678 4327 2723 4087 2792 -+ 4141 2734 3747 2734 -+-6 -+2 1 0 1 0 15 62 0 20 0.000 0 0 -1 0 0 4 -+ 4050 3075 4650 2625 4650 3075 4050 3525 -+2 2 0 1 0 15 62 0 20 0.000 0 0 -1 0 0 5 -+ 2550 3075 4050 3075 4050 3525 2550 3525 2550 3075 -+2 3 0 1 0 15 62 -1 20 0.000 0 0 -1 0 0 5 -+ 2550 3075 3150 2625 4650 2625 4050 3075 2550 3075 -+-6 -+-6 -diff -urNad xfig~/Libraries/Networks/Switches/switch2.fig xfig/Libraries/Networks/Switches/switch2.fig ---- Libraries/Networks/Switches/switch2.fig -+++ Libraries/Networks/Switches/switch2.fig -@@ -0,0 +1,38 @@ -+#FIG 3.2 Produced by xfig version 3.2.5-alpha5 -+Portrait -+Center -+Inches -+A4 -+100.00 -+Single -+-2 -+# Switch -+# colored by Roland Rosenfeld -+1200 2 -+# Switch -+6 2625 2850 4725 3750 -+6 3000 2850 4425 3300 -+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8 -+ 3603 3180 3581 3210 3194 3210 3161 3240 3028 3195 3268 3126 -+ 3214 3184 3608 3184 -+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8 -+ 3651 3128 3673 3098 4060 3098 4093 3068 4226 3113 3986 3182 -+ 4040 3124 3646 3124 -+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8 -+ 3760 3008 3738 3038 3351 3038 3318 3068 3185 3023 3425 2954 -+ 3371 3012 3765 3012 -+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8 -+ 3827 2963 3849 2933 4236 2933 4269 2903 4402 2948 4162 3017 -+ 4216 2959 3822 2959 -+-6 -+2 1 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 4 -+ 4125 3300 4725 2850 4725 3300 4125 3750 -+2 2 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 5 -+ 2625 3300 4125 3300 4125 3750 2625 3750 2625 3300 -+2 3 0 1 0 15 51 -1 20 0.000 0 0 -1 0 0 5 -+ 2625 3300 3225 2850 4725 2850 4125 3300 2625 3300 -+-6 diff --git a/media-gfx/xfig/files/xfig-3.2.5b-papersize_b1.patch b/media-gfx/xfig/files/xfig-3.2.5b-papersize_b1.patch deleted file mode 100644 index fa0bdf0a3c0e..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5b-papersize_b1.patch +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 32_papersize_b1.dpatch by Roland Rosenfeld <roland@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: xfig -papersize b1 now really uses B1 instead of B10 -## DP: Closes: #535181 - -@DPATCH@ -diff -urNad xfig~/resources.c xfig/resources.c ---- xfig~/resources.c -+++ xfig/resources.c -@@ -228,7 +228,6 @@ - {"A2 ", "ISO A2 ( 420mm x 594mm)", 19843, 28063}, - {"A1 ", "ISO A1 ( 594mm x 841mm)", 28063, 39732}, - {"A0 ", "ISO A0 ( 841mm x 1189mm)", 39732, 56173}, -- {"B10 ", "JIS B10 ( 32mm x 45mm)", 1516, 2117}, - {"B9 ", "JIS B9 ( 45mm x 64mm)", 2117, 3017}, - {"B8 ", "JIS B8 ( 64mm x 91mm)", 3017, 4300}, - {"B7 ", "JIS B7 ( 91mm x 128mm)", 4300, 6050}, -@@ -239,6 +238,7 @@ - {"B2 ", "JIS B2 ( 515mm x 728mm)", 24333, 34400}, - {"B1 ", "JIS B1 ( 728mm x 1030mm)", 34400, 48666}, - {"B0 ", "JIS B0 (1030mm x 1456mm)", 48666, 68783}, -+ {"B10 ", "JIS B10 ( 32mm x 45mm)", 1516, 2117}, - }; - - char *multiple_pages[] = { diff --git a/media-gfx/xfig/files/xfig-3.2.5b-pdfimport_mediabox.patch b/media-gfx/xfig/files/xfig-3.2.5b-pdfimport_mediabox.patch deleted file mode 100644 index 23de740f157d..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5b-pdfimport_mediabox.patch +++ /dev/null @@ -1,37 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 33_pdfimport_mediabox.dpatch by jsoula@univ-lille2.fr -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix reading "/MediaBox" when importing PDF (Closes: #530898). - -@DPATCH@ -diff -urNad xfig~/f_readeps.c xfig/f_readeps.c ---- xfig~/f_readeps.c -+++ xfig/f_readeps.c -@@ -77,11 +77,13 @@ - - /* look for /MediaBox for pdf file */ - if (pdf_flag) { -- if (!strncmp(buf, "/MediaBox", 8)) { /* look for the MediaBox spec */ -+ char *s; -+ for(s=buf; (s=strchr(s,'/')); s++) { -+ if (!strncmp(s, "/MediaBox", 8)) { /* look for the MediaBox spec */ - char *c; - -- c = strchr(buf, '[') + 1; -- if (c && sscanf(c, "%d %d %d %d", &llx, &lly, &urx, &ury) < 4) { -+ c = strchr(s, '['); -+ if (c && sscanf(c+1, "%d %d %d %d", &llx, &lly, &urx, &ury) < 4) { - llx = lly = 0; - urx = paper_sizes[0].width * 72 / PIX_PER_INCH; - ury = paper_sizes[0].height * 72 / PIX_PER_INCH; -@@ -89,7 +91,9 @@ - appres.INCHES ? "Letter" : "A4"); - app_flush(); - } -+ break; - } -+ } - /* look for bounding box */ - } else if (!nested && !strncmp(buf, "%%BoundingBox:", 14)) { - if (!strstr(buf, "(atend)")) { /* make sure doesn't say (atend) */ diff --git a/media-gfx/xfig/files/xfig-3.2.5b-solaris.patch b/media-gfx/xfig/files/xfig-3.2.5b-solaris.patch deleted file mode 100644 index 2e93a7faac26..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5b-solaris.patch +++ /dev/null @@ -1,26 +0,0 @@ -* workaround some missing things on Solaris - ---- a/u_quartic.c -+++ b/u_quartic.c -@@ -21,4 +21,7 @@ - #include <math.h> - -+ #ifndef M_PI -+ # define M_PI 3.14159265358979323846 -+ #endif - - static int ---- a/w_intersect.c -+++ b/w_intersect.c -@@ -31,6 +31,11 @@ - #define ISET_P1 (1 << 0) - #define ISET_P2 (1 << 1) - -+#if defined (__SVR4) && defined (__sun) -+#undef _Complex_I -+#define _Complex_I (__extension__ 1.0fi) -+#endif -+ - intersect_state_e intersect_state = INTERSECT_INITIAL; - - static INLINE Boolean diff --git a/media-gfx/xfig/files/xfig-3.2.5b-urwfonts.patch b/media-gfx/xfig/files/xfig-3.2.5b-urwfonts.patch deleted file mode 100644 index 87ac63f838f8..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5b-urwfonts.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- a/u_fonts.c 2002-09-09 13:36:58.000000000 -0400 -+++ b/u_fonts.c 2006-10-11 00:29:07.000000000 -0400 -@@ -22,41 +22,41 @@ - /* X11 font names */ - - struct _xfstruct x_fontinfo[NUM_FONTS] = { -- {"-*-times-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-times-medium-i-normal--", (struct xfont*) NULL}, -- {"-*-times-bold-r-normal--", (struct xfont*) NULL}, -- {"-*-times-bold-i-normal--", (struct xfont*) NULL}, -- {"-*-avantgarde-book-r-normal--", (struct xfont*) NULL}, -- {"-*-avantgarde-book-o-normal--", (struct xfont*) NULL}, -- {"-*-avantgarde-demi-r-normal--", (struct xfont*) NULL}, -- {"-*-avantgarde-demi-o-normal--", (struct xfont*) NULL}, -- {"-*-bookman-light-r-normal--", (struct xfont*) NULL}, -- {"-*-bookman-light-i-normal--", (struct xfont*) NULL}, -- {"-*-bookman-demi-r-normal--", (struct xfont*) NULL}, -- {"-*-bookman-demi-i-normal--", (struct xfont*) NULL}, -- {"-*-courier-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-courier-medium-o-normal--", (struct xfont*) NULL}, -- {"-*-courier-bold-r-normal--", (struct xfont*) NULL}, -- {"-*-courier-bold-o-normal--", (struct xfont*) NULL}, -- {"-*-helvetica-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-helvetica-medium-o-normal--", (struct xfont*) NULL}, -- {"-*-helvetica-bold-r-normal--", (struct xfont*) NULL}, -- {"-*-helvetica-bold-o-normal--", (struct xfont*) NULL}, -- {"-*-helvetica-medium-r-narrow--", (struct xfont*) NULL}, -- {"-*-helvetica-medium-o-narrow--", (struct xfont*) NULL}, -- {"-*-helvetica-bold-r-narrow--", (struct xfont*) NULL}, -- {"-*-helvetica-bold-o-narrow--", (struct xfont*) NULL}, -- {"-*-new century schoolbook-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-new century schoolbook-medium-i-normal--", (struct xfont*) NULL}, -- {"-*-new century schoolbook-bold-r-normal--", (struct xfont*) NULL}, -- {"-*-new century schoolbook-bold-i-normal--", (struct xfont*) NULL}, -- {"-*-palatino-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-palatino-medium-i-normal--", (struct xfont*) NULL}, -- {"-*-palatino-bold-r-normal--", (struct xfont*) NULL}, -- {"-*-palatino-bold-i-normal--", (struct xfont*) NULL}, -- {"-*-symbol-medium-r-normal--", (struct xfont*) NULL}, -- {"-*-itc zapf chancery-medium-i-normal--", (struct xfont*) NULL}, -- {"-*-itc zapf dingbats-*-*-*--", (struct xfont*) NULL}, -+ {"-urw-nimbus roman no9 l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus roman no9 l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus roman no9 l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus roman no9 l-bold-i-normal--", (struct xfont*) NULL}, -+ {"-urw-urw gothic l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw gothic l-medium-o-normal--", (struct xfont*) NULL}, -+ {"-urw-urw gothic l-semibold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw gothic l-semibold-o-normal--", (struct xfont*) NULL}, -+ {"-urw-urw bookman l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw bookman l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-urw bookman l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw bookman l-bold-i-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus mono l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus mono l-medium-o-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus mono l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus mono l-bold-o-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-bold-i-normal--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-medium-r-condensed--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-medium-i-condensed--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-bold-r-condensed--", (struct xfont*) NULL}, -+ {"-urw-nimbus sans l-bold-i-condensed--", (struct xfont*) NULL}, -+ {"-urw-century schoolbook l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-century schoolbook l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-century schoolbook l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-century schoolbook l-bold-i-normal--", (struct xfont*) NULL}, -+ {"-urw-urw palladio l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw palladio l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-urw palladio l-bold-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw palladio l-bold-i-normal--", (struct xfont*) NULL}, -+ {"-urw-standard symbols l-medium-r-normal--", (struct xfont*) NULL}, -+ {"-urw-urw chancery l-medium-i-normal--", (struct xfont*) NULL}, -+ {"-urw-dingbats-medium-r-normal--", (struct xfont*) NULL}, - }; - - /* Use the following font names for any font that doesn't exist in the table above. diff --git a/media-gfx/xfig/files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch b/media-gfx/xfig/files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch deleted file mode 100644 index 8998b406467a..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch +++ /dev/null @@ -1,70 +0,0 @@ -From be8cf541743060921f629d5bfe990d985ecf1813 Mon Sep 17 00:00:00 2001 -From: Vladislav Zavjalov <slazav@altlinux.org> -Origin: http://git.altlinux.org/people/slazav/packages/?p=xfig.git;a=patch;h=be8cf541743060921f629d5bfe990d985ecf1813 -Date: Wed, 29 May 2013 02:18:13 +0400 -Subject: [PATCH] Don't use local SimpleMenu.c with XAW3D1_5E -Bug-Debian: http://bugs.debian.org/296703 - ---- - xfig/SmeCascade.h | 5 +++++ - xfig/SmeCascadeP.h | 5 +++++ - xfig/w_menuentry.h | 4 ++++ - xfig/w_util.c | 2 ++ - 4 files changed, 16 insertions(+), 0 deletions(-) - ---- a/SmeCascade.h -+++ b/SmeCascade.h -@@ -27,7 +27,12 @@ - #else
- #include <X11/Xaw/Sme.h>
- #endif
-+
-+#ifdef XAW3D1_5E
-+#include <X11/Xaw3d/SmeBSB.h>
-+#else
- #include "SmeBSB.h"
-+#endif
-
- /****************************************************************
- *
---- a/SmeCascadeP.h -+++ b/SmeCascadeP.h -@@ -32,8 +32,12 @@ - #include <X11/Xaw/SmeP.h>
- #endif
-
-+#ifdef XAW3D1_5E
-+#include <X11/Xaw3d/SmeBSBP.h>
-+#else
- #include "SmeBSBP.h"
- #include "SmeCascade.h"
-+#endif
-
- /************************************************************
- *
---- a/w_menuentry.h -+++ b/w_menuentry.h -@@ -30,7 +30,11 @@ - #include <X11/Xaw/Sme.h>
- #endif
-
-+#ifdef XAW3D1_5E
-+#include <X11/Xaw3d/SmeBSB.h>
-+#else
- #include "SmeBSB.h"
-+#endif
-
- /****************************************************************
- *
---- a/w_util.c -+++ b/w_util.c -@@ -351,7 +351,9 @@ - * (use -1 if no line desired) - */ - -+#ifndef XAW3D1_5E - #include "SmeCascade.h" -+#endif /* XAW3D1_5E */ - - #include "d_text.h" - #include "e_placelib.h" diff --git a/media-gfx/xfig/files/xfig-3.2.5c-crash-on-exit.patch b/media-gfx/xfig/files/xfig-3.2.5c-crash-on-exit.patch deleted file mode 100644 index 80d20281ae93..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5c-crash-on-exit.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 56f0caaae3cc3fdbf6eaa21fc419c951c53a156d -Author: Peter Volkov <peter.volkov@gmail.com> -Date: Mon Jun 9 12:36:12 2014 +0400 - - Fix crash on exit (regression of xfig.3.2.5c) - -diff --git a/u_free.c b/u_free.c -index 18d517a..4a5080f 100755 ---- a/u_free.c -+++ b/u_free.c -@@ -270,8 +270,6 @@ void free_Fonts(void) - XUnloadFont(tool_d, nf->fid); - if (nf->fstruct != NULL) - XFreeFont(tool_d, nf->fstruct); -- if (nf->fset != NULL) -- XFreeFontSet(tool_d, nf->fset); - nf = nf->next; - } - } diff --git a/media-gfx/xfig/files/xfig-3.2.5c-darwin.patch b/media-gfx/xfig/files/xfig-3.2.5c-darwin.patch deleted file mode 100644 index 5d64c2a4deb5..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5c-darwin.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/fig.h b/fig.h -index ca00aef..a3605b0 100644 ---- a/fig.h -+++ b/fig.h -@@ -375,7 +375,7 @@ extern double drand48(); - extern long random();
- extern void srandom(unsigned int);
-
--#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__FreeBSD__) && !defined(__GLIBC__)
-+#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__FreeBSD__) && !defined(__DARWIN__) && !defined(__GLIBC__)
- extern void srandom(int);
-
- #endif
-diff --git a/w_keyboard.c b/w_keyboard.c -index 427d60c..03a3f76 100644 ---- a/w_keyboard.c -+++ b/w_keyboard.c -@@ -41,7 +41,7 @@ - #define REG_NOERROR 0 - #endif - --#if defined(__FreeBSD__) && !defined(REG_NOERROR) -+#if (defined(__FreeBSD__) || defined(__DARWIN__)) && !defined(REG_NOERROR) - #define REG_NOERROR 0 - #endif - diff --git a/media-gfx/xfig/files/xfig-3.2.5c-spelling.patch b/media-gfx/xfig/files/xfig-3.2.5c-spelling.patch deleted file mode 100644 index 4af77e0e9b06..000000000000 --- a/media-gfx/xfig/files/xfig-3.2.5c-spelling.patch +++ /dev/null @@ -1,17 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 31_spelling.dpatch by Roland Rosenfeld <roland@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix spelling errors in binary. - -@DPATCH@ -diff -urNad xfig~/f_load.c xfig/f_load.c ---- xfig~/f_load.c -+++ xfig/f_load.c -@@ -373,5 +373,5 @@ - /* Format error; relevant error message is already delivered */ - ; - else -- file_msg("File \"%s\" is not accessable; %s.", file, strerror(err)); -+ file_msg("File \"%s\" is not accessible; %s.", file, strerror(err)); - } diff --git a/media-gfx/xfig/xfig-3.2.5c.ebuild b/media-gfx/xfig/xfig-3.2.5c.ebuild deleted file mode 100644 index 98f535d1daf8..000000000000 --- a/media-gfx/xfig/xfig-3.2.5c.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib - -MY_P=${PN}.${PV} - -DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window" -HOMEPAGE="http://www.xfig.org" -SRC_URI="mirror://sourceforge/mcj/${MY_P}.full.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="nls" - -RDEPEND="x11-libs/libXaw - x11-libs/libXp - x11-libs/libXaw3d - nls? ( x11-libs/libXaw3d[unicode] ) - x11-libs/libXi - x11-libs/libXt - virtual/jpeg - media-libs/libpng - media-fonts/font-misc-misc - media-fonts/urw-fonts - >=media-gfx/transfig-3.2.5-r1 - media-libs/netpbm" -DEPEND="${RDEPEND} - x11-misc/imake - x11-proto/xproto - x11-proto/inputproto" - -S=${WORKDIR}/${MY_P} - -sed_Imakefile() { - # see Imakefile for details - vars2subs=( BINDIR="${EPREFIX}"/usr/bin - PNGINC=-I"${EPREFIX}"/usr/include - JPEGLIBDIR="${EPREFIX}"/usr/$(get_libdir) - JPEGINC=-I"${EPREFIX}"/usr/include - XPMLIBDIR="${EPREFIX}"/usr/$(get_libdir) - XPMINC=-I"${EPREFIX}"/usr/include/X11 - USEINLINE=-DUSE_INLINE - XFIGLIBDIR="${EPREFIX}"/usr/share/xfig - XFIGDOCDIR="${EPREFIX}/usr/share/doc/${PF}" - MANDIR="${EPREFIX}/usr/share/man/man\$\(MANSUFFIX\)" - "CC=$(tc-getCC)" ) - - for variable in "${vars2subs[@]}" ; do - varname=${variable%%=*} - varval=${variable##*=} - sed -i \ - -e "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" \ - "$@" || die - done - if use nls; then - # XAW_INTERNATIONALIZATION fixes #405475 (comment 17) and #426780 by Markus Peloquin - sed -i \ - -e "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" \ - -e "s:^\(XCOMM\)*[[:space:]]*\(XAW_INTERN = -DXAW_INTERNATIONALIZATION\).*$:\2:" \ - "$@" || die - fi - sed -i -e "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" "$@" || die -} - -src_prepare() { - # Permissions are really crazy here - chmod -R go+rX . || die - find . -type f -exec chmod a-x '{}' \; || die - epatch "${FILESDIR}/${PN}-3.2.5c-spelling.patch" - epatch "${FILESDIR}/${PN}-3.2.5b-papersize_b1.patch" - epatch "${FILESDIR}/${PN}-3.2.5b-pdfimport_mediabox.patch" - epatch "${FILESDIR}/${PN}-3.2.5b-network_images.patch" - epatch "${FILESDIR}/${PN}-3.2.5b-app-defaults.patch" - epatch "${FILESDIR}/${PN}-3.2.5b-urwfonts.patch" - epatch "${FILESDIR}/${PN}-3.2.5b-mkstemp.patch" #264575 - epatch "${FILESDIR}/${PN}-3.2.5c-darwin.patch" - epatch "${FILESDIR}/${PN}-3.2.5b-solaris.patch" - epatch "${FILESDIR}/${PN}-3.2.5c-XAW3D1_5E_notlocal.patch" - epatch "${FILESDIR}/${PN}-3.2.5c-crash-on-exit.patch" - - sed_Imakefile Imakefile - sed -e "s:/usr/lib/X11/xfig:${EPREFIX}/usr/share/doc/${PF}:" \ - -i Doc/xfig.man || die -} - -src_compile() { - local EXTCFLAGS=${CFLAGS} - xmkmf || die - [[ ${CHOST} == *-solaris* ]] && EXTCFLAGS="${EXTCFLAGS} -D_POSIX_SOURCE" - emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${EXTCFLAGS}" \ - USRLIBDIR="${EPREFIX}"/usr/$(get_libdir) -} - -src_install() { - emake -j1 DESTDIR="${D}" install install.libs install.man - - dodoc README FIGAPPS CHANGES LATEX.AND.XFIG - - doicon xfig.png - make_desktop_entry xfig Xfig xfig -} - -pkg_postinst() { - einfo "Don't forget to update xserver's font path for media-fonts/urw-fonts." -} diff --git a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild index 44de42d398d4..4104b2e0d1a6 100644 --- a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild +++ b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mcj/${PN}-full-${PV}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="jpeg nls postscript" RDEPEND=" diff --git a/media-gfx/xfig/xfig-3.2.6a.ebuild b/media-gfx/xfig/xfig-3.2.6a.ebuild deleted file mode 100644 index a65925ef8b06..000000000000 --- a/media-gfx/xfig/xfig-3.2.6a.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window" -HOMEPAGE="http://mcj.sourceforge.net/" -SRC_URI="mirror://sourceforge/mcj/${PN}-full-${PV}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="jpeg nls postscript" - -RDEPEND=" - x11-libs/libXaw - x11-libs/libXp - x11-libs/libXaw3d - x11-libs/libXi - x11-libs/libXt - media-libs/libpng:0= - media-fonts/font-misc-misc - media-fonts/urw-fonts - >=media-gfx/transfig-3.2.5-r1 - media-libs/netpbm - jpeg? ( virtual/jpeg:0= ) - nls? ( x11-libs/libXaw3d[unicode] ) - postscript? ( app-text/ghostscript-gpl ) -" -DEPEND="${RDEPEND} - x11-proto/xproto - x11-proto/inputproto -" - -PATCHES=( - "${FILESDIR}/${PN}-3.2.6a-urwfonts.patch" - "${FILESDIR}/${PN}-3.2.6a-solaris.patch" - "${FILESDIR}/${PN}-3.2.6a-app-defaults.patch" -) - -src_configure() { - econf \ - $(use_enable nls i18n) \ - $(use_enable jpeg) \ - $(use_with postscript gs) \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}" # it expects docdir... -} |