diff options
| -rw-r--r-- | app-admin/puppet/puppet-7.7.0.ebuild | 2 | ||||
| -rw-r--r-- | dev-db/libiodbc/Manifest | 1 | ||||
| -rw-r--r-- | dev-db/libiodbc/libiodbc-3.52.15.ebuild | 66 | ||||
| -rw-r--r-- | dev-libs/tinyxml2/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild (renamed from dev-libs/tinyxml2/tinyxml2-8.1.0.ebuild) | 16 | ||||
| -rw-r--r-- | profiles/package.mask | 5 |
6 files changed, 74 insertions, 18 deletions
diff --git a/app-admin/puppet/puppet-7.7.0.ebuild b/app-admin/puppet/puppet-7.7.0.ebuild index 8dc22e036de3..125aa53e82ce 100644 --- a/app-admin/puppet/puppet-7.7.0.ebuild +++ b/app-admin/puppet/puppet-7.7.0.ebuild @@ -62,7 +62,7 @@ all_ruby_prepare() { rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die # fix systemd path - eapply "${FILESDIR}/puppet-systemd.patch" + eapply -p0 "${FILESDIR}/puppet-systemd.patch" # Avoid specs that can only run in the puppet.git repository. This # should be narrowed down to the specific specs. diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest index 0490a554d3b2..bb2ec3deca81 100644 --- a/dev-db/libiodbc/Manifest +++ b/dev-db/libiodbc/Manifest @@ -1,2 +1,3 @@ DIST libiodbc-3.52.12.tar.gz 760155 BLAKE2B ab1a66b34c55f5ebd72c76c09bf356c9e009666634f7f7516c39653840051bd7ae399b54232284e9cfeae37b752eae761d8f749e48e3184857ba59177016e03a SHA512 992a4d0a36651fe55178a4834160901381ea230a0e1671f61e1c5dd17708d2b649823313b97d5954e1656dc2213382361cb5f1eaf2f28f3b1ac55fd9f7aac535 DIST libiodbc-3.52.14.tar.gz 800285 BLAKE2B 6d6c52ae6eb133c5d844a9106079878290a317c72e1d1fb31f4a91c703ff26b8b97fbeccfcf0041442dc7775042f64711cf7a47db7a2eba745e6a502b3f2adeb SHA512 76f60b1bf818937f1aa6fa4ac8a98573860e37d437ece94de9500b815be9e931fbd81a5ca700aa645329727773cc1710b4a7de69fbf2ef43cf610b6fbca05bac +DIST libiodbc-3.52.15.tar.gz 658200 BLAKE2B 856855f424e31629e3c3fb11f31e189d22daee877e989622a4f5c2a9c7145697a639fd79bd7bdc17be03176b0ee34a3bc02afe958c278531de0f9b9685947988 SHA512 843a938c961c77e12b6c5571fa7c5528e547c028e213195e72224166cebb49acb746e2e1e636c37991686d9e476dfd64ee42bb113013f01b4201d6d9cf99c3bd diff --git a/dev-db/libiodbc/libiodbc-3.52.15.ebuild b/dev-db/libiodbc/libiodbc-3.52.15.ebuild new file mode 100644 index 000000000000..e7acaba82d3f --- /dev/null +++ b/dev-db/libiodbc/libiodbc-3.52.15.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal + +MY_PN="iODBC" + +DESCRIPTION="ODBC Interface for Linux" +HOMEPAGE="http://www.iodbc.org/" +SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="|| ( LGPL-2 BSD )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="gtk" + +RDEPEND="gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" + +DOCS=( AUTHORS NEWS README ) + +MULTILIB_CHOST_TOOLS=( /usr/bin/iodbc-config ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.52.12-multilib.patch + "${FILESDIR}"/${PN}-3.52.7-debian_bug501100.patch + "${FILESDIR}"/${PN}-3.52.7-unicode_includes.patch + "${FILESDIR}"/fix-runpaths-r1.patch +) + +src_prepare() { + default + + sed -i.orig \ + -e '/^cd "$PREFIX"/,/^esac/d' \ + iodbc/install_libodbc.sh || die "sed failed" + + # Without this, automake dies. It's what upstream's autogen.sh does. + touch ChangeLog || die "failed to create empty ChangeLog" + + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + --disable-static \ + --enable-odbc3 \ + --enable-pthreads \ + --with-layout=gentoo \ + --with-iodbc-inidir=yes \ + $(use_enable gtk gui) +} + +multilib_src_install_all() { + einstalldocs + + find "${ED}" -name '*.la' -delete || die + + # Install lintian overrides + insinto /usr/share/lintian/overrides + newins debian/iodbc.lintian-overrides iodbc + newins debian/libiodbc2.lintian-overrides libiodbc2 +} diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest index 0b8ab041f853..18325f2bb6b3 100644 --- a/dev-libs/tinyxml2/Manifest +++ b/dev-libs/tinyxml2/Manifest @@ -1,3 +1,3 @@ DIST tinyxml2-7.1.0.tar.gz 592717 BLAKE2B 5936356d472b8642bebb9f02579e6beda14446d57749f1e7a869ff941a03a5ad30624c4db4b2eaaaca48d7f339e3100fddfd58f96bbcfc22737a23d9c9198c9a SHA512 09d5f37018f79a593ff35e33d4296c9ec643a22e83c0cee4c37949300f86201eee07e9b7e6ba55044d8abb438d5d21b70d5843a96ae4652389bb164047ec31e1 DIST tinyxml2-8.0.0.tar.gz 593833 BLAKE2B afc21220e28a1c139b1abd89e67f8e64980d2ba9bc6f60a33d435a4a02cb40ecacc27ac28bd9702ac3a435f66764ebb752b597a1b1e178d0b549e366d5b669dd SHA512 bcbb065c2af34ea681ec556377fd22e720b6f5d4caa73f432b1e34e08603a96f2233763f0ec5ae86b9ee71ddbe3062f58d3794cd3a162ce6903435530de0bba6 -DIST tinyxml2-8.1.0.tar.gz 619733 BLAKE2B 7a7e1a250bc8944614ecf578183b41340e7519ad2181e8023244d82e83d9a85fc600e5f00051b7f6f8ebda760a1ac11cb8bfe381fc9f6432f315aa6fdb310a83 SHA512 1ef50ee2648d423f38b6ebb3e45ec3798b87cf73a75aa0e49ae697a2006517d05c8298b325de70ee2aa706546235860f01541ff753c8a1bd97fa862a4ebb5c09 +DIST tinyxml2-9.0.0.tar.gz 619734 BLAKE2B 9a7bb8b8158417aa505e3d9fcc246b0bede52d6d4d5ff1b5cee891c2b72d1ee43d00ccea001ac24500f52c36320994b3446f3898ab2be1997940dbff526bc78e SHA512 9c5ce8131984690df302ca3e32314573b137180ed522c92fd631692979c942372a28f697fdb3d5e56bcf2d3dc596262b724d088153f3e1d721c9536f2a883367 diff --git a/dev-libs/tinyxml2/tinyxml2-8.1.0.ebuild b/dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild index 22f470d1b851..7c0082ac47a4 100644 --- a/dev-libs/tinyxml2/tinyxml2-8.1.0.ebuild +++ b/dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild @@ -3,26 +3,20 @@ EAPI=7 -inherit meson-multilib +CMAKE_ECLASS=cmake +inherit cmake-multilib DESCRIPTION="A simple, small, efficient, C++ XML parser" HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/" SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="ZLIB" -SLOT="0/8" +SLOT="0/9" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}"/${P}-meson-typo.patch -) - multilib_src_configure() { - local emesonargs=( - $(meson_native_use_bool test tests) - ) - - meson_src_configure + local mycmakeargs=( -DBUILD_TESTING=$(usex test) ) + cmake_src_configure } diff --git a/profiles/package.mask b/profiles/package.mask index 427d93f61966..5ad639579879 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -271,11 +271,6 @@ dev-java/sun-jimi # see bug: https://bugs.gentoo.org/786828 dev-java/squareness-jlf -# Sam James <sam@gentoo.org> (2021-05-20) -# Need to ditch Meson or investigate consumers. -# https://bugs.gentoo.org/791163 -=dev-libs/tinyxml2-8.1.0 - # Miroslav Šulc <fordfrog@gentoo.org> (2021-05-19) # no consumer, removal in 30 days # see bug: https://bugs.gentoo.org/784065 |