From e3872864be25f7421015bef2732fa57c0c9fb726 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 Aug 2018 08:53:53 +0100 Subject: gentoo resync : 04.08.2018 --- dev-ruby/facter/Manifest | 4 +- dev-ruby/facter/facter-3.11.3-r1.ebuild | 110 ++++++++++++++++++++++++++++++++ dev-ruby/facter/facter-3.11.3.ebuild | 105 ------------------------------ dev-ruby/facter/facter-9999.ebuild | 64 ++++++++++--------- 4 files changed, 146 insertions(+), 137 deletions(-) create mode 100644 dev-ruby/facter/facter-3.11.3-r1.ebuild delete mode 100644 dev-ruby/facter/facter-3.11.3.ebuild (limited to 'dev-ruby/facter') diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest index 3ff131f6e9d8..16ad30e1aea9 100644 --- a/dev-ruby/facter/Manifest +++ b/dev-ruby/facter/Manifest @@ -7,7 +7,7 @@ DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43 EBUILD facter-2.4.6.ebuild 1899 BLAKE2B a8e0d7c7a83c42150219a300d4a1a512913deee5d66e3a28a4f285a27d731cfa1937bb4d0d9bd8c80e133f2956ecf17690f5a94d66b385507a4f3740a425872f SHA512 0f4a589cb04567a42181bf366e51f6224d792c63bc2b38d2db3653688844e2cb611223fe148a6ff015d8dd734695214afc33ec0812e1707ac629344a691a396e EBUILD facter-3.11.1.ebuild 2851 BLAKE2B f7195a19a256dca9b6c1ca5aede6001421411869b4b4c1e9dd02ca91a9e73a6a4efeacbc2809bda46977f5ba2ea4b8efc6d52ecbd5a09b2fb44addfc2ff369b5 SHA512 fb1d8480fe94d452b49560093151be5ee068ab6b8a7f2fe7d90a1d07aaea0b0becd35d435189a7dbe9b9eff60ab2d82d703d700668951c562774f55dc12d375e EBUILD facter-3.11.2.ebuild 2752 BLAKE2B 6759e761e7152705a9fae260d626b78c32119553b63e37d19186b20d2afd8efa3a1b92286117f0c10486ecb818086e01352bdfedddd33b37e576cc9c90f731b2 SHA512 d9558badde687ae24b9150e36ccf7ee557463ba996c9654b87ccca5fa8ce44dbb38925282aa3af41aaa366b126a805d8cad42c2dd7d771ccb03d4b85ead17b63 -EBUILD facter-3.11.3.ebuild 2754 BLAKE2B 0b0a66a4ee65c54baac05172ec2d35ecd31d7252797631458004d0055dab3dfcb0f1a1103cec9b40e2d8de465672efdc1aa3f69e7856de2d05fa335099e2ea8f SHA512 21993d6b5dd6227e1b862abba394b15473ca02f14b8a14e133d08a50ad5b1f6a09291225bbe4e49144d9c6d25e4ae50177aad0a624533f83b20c6f93c1db665a +EBUILD facter-3.11.3-r1.ebuild 2420 BLAKE2B 08c571937a6069cdbad57b9a70236c6dbb8c58c85f6d820e7c310e005452b468bf5932c65fbb13ed4d3eb957814820bfee13727eb6e8d6fe119da2711463157e SHA512 13865deccd523a37cbc49950da7a9b614841dee503ff099733f4562216617ed1754850635156e05dbc20fd6add9fe37b60167a5315f5c4be2c30211cecdb5257 EBUILD facter-3.9.2.ebuild 2106 BLAKE2B efcbbd0cfe6a71b1b1a08bbc1f7abe4b94845c9e13192deae811466211ab2ba533ae10732a4d72635609b9cb419051b7c4a39f248e9b06f7ec751cd893d28852 SHA512 5cfb67a3db8d288302f21bf0092c05ce19b40c8a2f00b4b9b63e3e02cd7d1af3dd20670b744520cb42db2b2ccd52e9153d86c0e1db7a36c4c7854c70d79149dc -EBUILD facter-9999.ebuild 2761 BLAKE2B 45a04ae914f400f4b80fa0f51fed999d08344ca58005040f7930f2fa7c4092329fdf4557a9babc81ebde788731844cd8299af704dda71a22521a14515f7c6c73 SHA512 58190ff28a512818b79e49c92525c61898a29ce3ce8f8b9b884489ca0f08ae980d906164a45d5a60fef9bc3a8f38ef88882474243188f250ab57043079845f16 +EBUILD facter-9999.ebuild 2372 BLAKE2B e3b4f77d6d012fc24893ad870f3f96b6d297aa9874277230721ba74f996ede3a1cdc38f11164593a253e56ab52a539756e88952cacce7eb04a8229722935d338 SHA512 3bbf988e93de0fa9f338b4b3fb3c586bdbb9052c07eafbe54723de98d9daca8dcc103bbddc766e752b323d88ffec0bbe67fa4d1becdfa6174eb97310edee8193 MISC metadata.xml 854 BLAKE2B 51b94622bf8ce34658bf34bf266effc445fdbee52fb22e70c9a645c36b7ac28db73793f185b2dfa791d8459a56ea66eccc6a3f4da56db4fe4ee171ee607366ea SHA512 27e7e17a15ad80544fb121b050f0f5c39d3e27a53ade89063a894569472618b29649b5a737011b8d6597594d9bc94a49cf52c9df857d577a098d6c770b4a9639 diff --git a/dev-ruby/facter/facter-3.11.3-r1.ebuild b/dev-ruby/facter/facter-3.11.3-r1.ebuild new file mode 100644 index 000000000000..683775e7668d --- /dev/null +++ b/dev-ruby/facter/facter-3.11.3-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby23 ruby24 ruby25" + +# git-r3 goes after ruby-ng so that it overrides src_unpack properly +inherit cmake-utils eutils multilib ruby-ng + +DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems" +HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="debug test" +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/puppetlabs/facter.git" + EGIT_BRANCH="master" +else + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" + SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +BDEPEND=" + >=sys-devel/gcc-4.8:* + dev-cpp/cpp-hocon" +COMMON_DEPEND=" + >=dev-libs/leatherman-1.0.0:= + dev-libs/openssl:* + sys-apps/util-linux + app-emulation/virt-what + net-misc/curl + >=dev-libs/boost-1.54:=[nls] + >=dev-cpp/yaml-cpp-0.5.1 + ! 10.1.0/>= 10/' \ + -e '/rspec/ s/2.11.0/2.11/' \ + -e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die + # patches + default + cmake-utils_src_prepare +} + +each_ruby_configure() { + # hack for correct calculation of relative path from facter.rb to + # libfacter.so + my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir') +} + +src_configure() { + ruby-ng_src_configure + + local mycmakeargs=( + -DCMAKE_VERBOSE_MAKEFILE=ON + -DRUBY_LIB_INSTALL=${my_ruby_sitelibdir} + -DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)" + ) + if use debug; then + mycmakeargs+=( + -DCMAKE_BUILD_TYPE=Debug + ) + fi + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_test() { + cmake-utils_src_test +} + +each_ruby_install() { + doruby "${BUILD_DIR}"/lib/facter.rb +} + +src_install() { + cmake-utils_src_install + ruby-ng_src_install +} diff --git a/dev-ruby/facter/facter-3.11.3.ebuild b/dev-ruby/facter/facter-3.11.3.ebuild deleted file mode 100644 index 6210613630d9..000000000000 --- a/dev-ruby/facter/facter-3.11.3.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby23 ruby24 ruby25" - -# git-r3 goes after ruby-ng so that it overrides src_unpack properly -inherit cmake-utils eutils multilib ruby-ng - -DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems" -HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="debug test" -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/puppetlabs/facter.git" - EGIT_BRANCH="master" - S="${S}/${P}" -else - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" - SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - S="${S}/all/${P}" -fi - -BDEPEND=" - >=sys-devel/gcc-4.8:* - dev-cpp/cpp-hocon" -CDEPEND=" - >=dev-libs/leatherman-1.0.0:= - dev-libs/openssl:* - sys-apps/util-linux - app-emulation/virt-what - net-misc/curl - >=dev-libs/boost-1.54:=[nls] - >=dev-cpp/yaml-cpp-0.5.1 - ! 10.1.0/>= 10/' \ - -e '/rspec/ s/2.11.0/2.11/' \ - -e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die - # patches - default - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_PREFIX=/usr - -DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1 - ) - if use debug; then - mycmakeargs+=( - -DCMAKE_BUILD_TYPE=Debug - ) - fi - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -each_ruby_install() { - doruby "${BUILD_DIR}"/lib/facter.rb -} - -src_test() { - cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - ruby-ng_src_install - - # need a variable file in env.d :( - diropts -m0755 - dodir /etc/env.d - echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir" - fperms 0644 /etc/env.d/00facterdir -} diff --git a/dev-ruby/facter/facter-9999.ebuild b/dev-ruby/facter/facter-9999.ebuild index 4500cc443e23..d99f0e0675cc 100644 --- a/dev-ruby/facter/facter-9999.ebuild +++ b/dev-ruby/facter/facter-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby21 ruby22 ruby23 ruby24" +USE_RUBY="ruby23 ruby24 ruby25" # git-r3 goes after ruby-ng so that it overrides src_unpack properly inherit cmake-utils eutils multilib ruby-ng @@ -17,18 +17,16 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/puppetlabs/facter.git" EGIT_BRANCH="master" - S="${S}/${P}" else [[ "${PV}" = *_rc* ]] || \ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - S="${S}/all/${P}" fi BDEPEND=" >=sys-devel/gcc-4.8:* dev-cpp/cpp-hocon" -CDEPEND=" +COMMON_DEPEND=" >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux @@ -40,23 +38,29 @@ CDEPEND=" ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )" -RDEPEND="${CDEPEND}" +RDEPEND="${COMMON_DEPEND}" DEPEND="${BDEPEND} - ${CDEPEND}" + ${COMMON_DEPEND}" + +# restore ${S} and override all phases exported by ruby-ng.eclass +S="${WORKDIR}/${P}" + +pkg_setup() { + ruby-ng_pkg_setup +} + +src_unpack() { + default + + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + fi +} src_prepare() { - # Remove the code that installs facter.rb to the wrong directory. - sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die - sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die - # make it support multilib - sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die - sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die - # make the require work - sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die - # be explicit about the version of rspec we test with and use the - # correct lib directory for tests + # be explicit about the version of rspec we test with sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \ - -e '/libfacter.*specs/ s/lib64/lib/' CMakeLists.txt || die + CMakeLists.txt || die # be more lenient for software versions for tests sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \ -e '/rspec/ s/2.11.0/2.11/' \ @@ -66,12 +70,18 @@ src_prepare() { cmake-utils_src_prepare } +each_ruby_configure() { + # hack for correct calculation of relative path from facter.rb to + # libfacter.so + my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir') +} + src_configure() { + ruby-ng_src_configure + local mycmakeargs=( -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_PREFIX=/usr - -DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1 + -DRUBY_LIB_INSTALL=${my_ruby_sitelibdir} ) if use debug; then mycmakeargs+=( @@ -85,21 +95,15 @@ src_compile() { cmake-utils_src_compile } -each_ruby_install() { - doruby "${BUILD_DIR}"/lib/facter.rb -} - src_test() { cmake-utils_src_test } +each_ruby_install() { + doruby "${BUILD_DIR}"/lib/facter.rb +} + src_install() { cmake-utils_src_install ruby-ng_src_install - - # need a variable file in env.d :( - diropts -m0755 - dodir /etc/env.d - echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir" - fperms 0644 /etc/env.d/00facterdir } -- cgit v1.2.3