From 91c0ec2d7067f6ab1ef578bd9967b32ca07eb502 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 22 May 2018 14:00:47 +0100 Subject: gentoo resync : 22.05.2018 --- x11-libs/libXpm/Manifest | 2 +- x11-libs/libXpm/libXpm-3.5.12-r1.ebuild | 27 +++++++++++++++++++++++++++ x11-libs/libXpm/libXpm-3.5.12.ebuild | 28 ---------------------------- 3 files changed, 28 insertions(+), 29 deletions(-) create mode 100644 x11-libs/libXpm/libXpm-3.5.12-r1.ebuild delete mode 100644 x11-libs/libXpm/libXpm-3.5.12.ebuild (limited to 'x11-libs/libXpm') diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest index ff64388fc0b4..1948bd4c2dc5 100644 --- a/x11-libs/libXpm/Manifest +++ b/x11-libs/libXpm/Manifest @@ -1,3 +1,3 @@ DIST libXpm-3.5.12.tar.bz2 430736 BLAKE2B 738838f37643e4e8ce489d34adf33d2459e7bcd7b1eafb21415cd44620c3d4eb18750381a80d1e2c9a2f44ccf00159a029df18164ea7a7834dfee8d104303783 SHA512 a5707d5f758d577414101b0723af334fc8ac223e5b9f869994765735e1cbd8dafed48ea2851ebc479fecaf84381bfd5fbef842ec971a487f7fa9e77d54d3a17e -EBUILD libXpm-3.5.12.ebuild 1012 BLAKE2B 6b85bfb8590483220ab1a75d246815ef023ac29f29bf189ddf6264711c5fcf5ba0435ab84777deeea0833ffa61f5fa8c401de24642d20a1b1d7ef8069ad0dbcd SHA512 4462fffa6049025ee46d5ba01d0d06dc0d8e50b4f86c6a33fdfa89aef49b7d32b6509ea0de760222dbd153bca439a2ea11cc3fb39527d4eb6508b48aa4e0c663 +EBUILD libXpm-3.5.12-r1.ebuild 934 BLAKE2B 88090cae2e330bfa85878d3fa28d302b7d5b860112c961ac0f1687ffb247a56c1d06da16b8e4b8d1344efd066eb9eccd522843e7ff3b4405317d8137fbddee17 SHA512 6d246df2a80d6df571c11aab76969c7f50bf8c1ba76ba63097a94d3a56a8d631619c9af3986fc060bb4bc941184976b16989780ed9a4bdb8a03879d5dca3bcf7 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild b/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild new file mode 100644 index 000000000000..265319ee68ef --- /dev/null +++ b/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +XORG_MULTILIB=yes +inherit xorg-2 + +DESCRIPTION="X.Org Xpm library" + +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + sys-devel/gettext + x11-base/xorg-proto" + +src_configure() { + # the gettext configure check and code in sxpm are incorrect; they assume + # gettext being in libintl, whereas Solaris has gettext by default + # resulting in libintl not being added to LIBS + [[ ${CHOST} == *-solaris* ]] && export ac_cv_search_gettext=-lintl + xorg-2_src_configure +} diff --git a/x11-libs/libXpm/libXpm-3.5.12.ebuild b/x11-libs/libXpm/libXpm-3.5.12.ebuild deleted file mode 100644 index 4a4990d55ec8..000000000000 --- a/x11-libs/libXpm/libXpm-3.5.12.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_MULTILIB=yes -inherit xorg-2 - -DESCRIPTION="X.Org Xpm library" - -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - sys-devel/gettext" - -src_configure() { - # the gettext configure check and code in sxpm are incorrect; they assume - # gettext being in libintl, whereas Solaris has gettext by default - # resulting in libintl not being added to LIBS - [[ ${CHOST} == *-solaris* ]] && export ac_cv_search_gettext=-lintl - xorg-2_src_configure -} -- cgit v1.2.3