From 89c6c06b8c42107dd231687a1012354e7d3039fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 26 Nov 2017 11:42:28 +0000 Subject: gentoo resync : 26.11.2017 --- dev-libs/libcdio/Manifest | 13 ++-- dev-libs/libcdio/files/libcdio-1.0.0-version.patch | 16 +++++ dev-libs/libcdio/libcdio-0.92.ebuild | 67 -------------------- dev-libs/libcdio/libcdio-1.0.0-r1.ebuild | 73 ++++++++++++++++++++++ 4 files changed, 95 insertions(+), 74 deletions(-) create mode 100644 dev-libs/libcdio/files/libcdio-1.0.0-version.patch delete mode 100644 dev-libs/libcdio/libcdio-0.92.ebuild create mode 100644 dev-libs/libcdio/libcdio-1.0.0-r1.ebuild (limited to 'dev-libs/libcdio') diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest index 91abdc02fa3c..74cbdd0a923d 100644 --- a/dev-libs/libcdio/Manifest +++ b/dev-libs/libcdio/Manifest @@ -1,9 +1,8 @@ -DIST libcdio-0.92.tar.gz 2710084 SHA256 3336bf352aff43b5023e41a6d23525172a3b4ee433c467bd0fab5b8becb33fad SHA512 aeeb51c87f966683a1f10960e4d000098603adfbd8036cff17f62afa5de08a2dbe4f8df7d1bc1fd0438c0ac5f868b2950ed9379ea17b7d98fbd23ef023777747 WHIRLPOOL 051ba189fef5f28ae8ac98caab7bdb7468423f53d7b423e1a2416a8741339ff5aed76115a665f91d406254462c87cf84274a1b777a8f39064624fe908ff1fb0c +AUX libcdio-1.0.0-version.patch 613 BLAKE2B e0332426f7ca2d4cfe1335e70bada237f536ef2e198681540eb01d01bc23ba2566521b15713cacea20299235658d984acbaf872d75367442621241146da20972 SHA512 6dc238f442fad3f0b35350fd11aa75bcdbc364cbc3616b4d61e9d53ff9b36b0293ce7e9e2118e07045399cd4a06fa5474870794326f11df98f3e218b74cef822 DIST libcdio-0.93.tar.gz 2723371 SHA256 4972cd22fd8d0e8bff922d35c7a645be0db0ab0e7b3dfaecc9cd8272429d6975 SHA512 a2ea7a1f219e1abdbbb42633003e10ff77b6a879133c96a0c8e7a80fe205c08a48bade1d9941c6493f24d6eb2ed410469b57e19d9740a4400266a6f3f9d3da91 WHIRLPOOL ff54f71de82fcb659c2de85e5b1090974273e938a3cd8c6353e37fa7e3c6d793d404eaeb43bebe03e73c51dfde8c6db458911ae799fdce75723a06f8ce7689f8 DIST libcdio-0.94.tar.gz 2355452 SHA256 96e2c903f866ae96f9f5b9048fa32db0921464a2286f5b586c0f02699710025a SHA512 e1d3c96c4acc7be923c97109c3f76223adc00b293278daef7d5008b1e5d67f33402f9f224f05120e9e1e8b3a8d1fa1b0bd5069dc6dd309741e3590e2c19e0e66 WHIRLPOOL ee009ba0b66ca0209c13a51ccca1717d53539f6dee4e42860fc357027336ad6d6afba3d56e08b74f52679c85e550aec4e68a229850ccab0bcf3a00de97357829 -EBUILD libcdio-0.92.ebuild 1863 SHA256 43a7ce721b22ab1dc5031ee2221e3351e73918e8e17d3a8f8fe05d41b6a38f4c SHA512 53077642906250306168486802fff08d4ff1bd94455dc2f56493a0a21ea1f0dbc4ac67e677ba8b779d4a6df5711005d6292a890f06efc9cdab6bbb0d798dedb6 WHIRLPOOL 16b0adffcf59cb821d9d893a953f5086ff30dca190fdc756f7b166abd680dfe86e74f5e69c5d27efe345da550fc1927cad76aa92ff6859bc924c1755e8774625 -EBUILD libcdio-0.93.ebuild 1870 SHA256 01f7b7b39ee805294b43a2ccb901d7347d7a1ed27ea64ae32529af84913f7115 SHA512 eaa3d8d99c5fe412afecb7890ce68c9b0ebdcc063fa457afc4074e4ecb2a12af3293913d4d13691e9e218f51f251f51d5537cc4c2fe6fe48d4b7e2c6e3367945 WHIRLPOOL 7f23a89e275dabfa49f583808495c996566b2ac9917898e9ad3c5114e595abd5796c4a2dbf86e061bdd3c5bf8818547e7a25c951eb074b25edf337410213bd98 -EBUILD libcdio-0.94-r1.ebuild 1888 SHA256 4518d5f146fc4d92a9ec3aa9f501a29bc32b5ab915a761fc01cd2cd6d9f9d32b SHA512 2bcb9d699852d5781ada3d4b5b0d3b80af32571f27041a8ba316da408c0b1188d2b5fca64c238e850ff40a91cba97dc65a157e6633cb1beb76f7edef3122056a WHIRLPOOL 33a0958cb606b34e514fa93aed5bd422c234113ba6c0d6c95d22b41fd874846b0bb3e2c348bb8297dc0ef03ff3330218e32dd61be3b110fede24c988fa836127 -MISC ChangeLog 3933 SHA256 9ba9f243595a70e571a08a2f9a2c7a31afaf1cdcc6d3b0fe6fdb9f98dc164f3f SHA512 60402531d060912df35a0182f3553f41af14c7f1325af21dab0c9c4d83ad8e38fd8d8ba727c6d7bc45892380f9dc18c0016d06511efdbb3cba98bf298b35282a WHIRLPOOL c43254d008a7cd38126c1a579054842d4a151db9d259c3b1d666d7aff86c3e2754d2ab6cd893c6142701dc8fb5e30806a76b65fb417804c6e526921231a1797a -MISC ChangeLog-2015 22901 SHA256 86ce81da7d6ec4d801c2968161d3f2ecf2ddfc1a58463c243ae365a6dd6d50d6 SHA512 5e518bf0118d57a1423a268ff16aac0a43cbe0cfb0ed9a1d90869e74c4e076e4d91c3702d8137c68a28016bd8eb2dbab4d60c2e08762fa4ce47c63e89337e01f WHIRLPOOL feb23882dbdbc44cfa4b4c052cf0b4da50184e7d72b888038e2a3c2a8ed9f5fdfe67bcf1afd5c582fab9a8b4af3230f6b7242df09de91c6fc481ed9534288cc2 -MISC metadata.xml 528 SHA256 7d1df8dc8c56ebe30a0c1d2f986baed96fb7d6319bf73e84deb438b87473133b SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9 WHIRLPOOL 5a07db691fa332ddc6baf55908aac29455e54fd2694523d12a53c7961e91cbd652d7a66f556235f26d8a7673bbe5ce8da2b180db3cd0cef5b2f3506bb783df16 +DIST libcdio-1.0.0.tar.gz 2343992 BLAKE2B d187a0aba99efa1172cab302fcd020dc2a581633368230a6ba00db6250c8e7d5e66111fba1804ecb0ba5416c876f88f1d07549118bb003d4631c14d0f3e85ba6 SHA512 2beb5c9cf455c5b56f0a8ba641b8fe322c487256b017108fadbdf288e92787fa0b956d2291aa877df5a9b4494f8425de58c0f71d587ef5f9346987733f66e5dc +EBUILD libcdio-0.93.ebuild 1870 BLAKE2B 30953f0973dc5656e26312606ad557ced8aa9a7a0672bee7e9fead2c002360c5ac233dbabc64c2232043c201ea41d9626ac86feaf8af743ed7267d4fa75a8edc SHA512 eaa3d8d99c5fe412afecb7890ce68c9b0ebdcc063fa457afc4074e4ecb2a12af3293913d4d13691e9e218f51f251f51d5537cc4c2fe6fe48d4b7e2c6e3367945 +EBUILD libcdio-0.94-r1.ebuild 1888 BLAKE2B 20ef4b8bdc055c406864b2bd91022a5938f469b20be26c48e888d8d1b58886296989fcb784a07898c1f663d3cbc7fb89bb097c2885983a59f8327a28fe03d529 SHA512 2bcb9d699852d5781ada3d4b5b0d3b80af32571f27041a8ba316da408c0b1188d2b5fca64c238e850ff40a91cba97dc65a157e6633cb1beb76f7edef3122056a +EBUILD libcdio-1.0.0-r1.ebuild 1952 BLAKE2B 6526f6ec906cdf37f8ca34eadef153ac446b01e58e0b76274cf7c1eba361d15eb997ea8bce0a25a2fabccdc06ef9b2f8093a56b125d7fbc3478c9889af9d51b5 SHA512 66a22c68ebf40739362ab486afb5b94ef46dd61e7febe1c0e64da8eaf677d2f2d26eb993de24d8483c5a48d92a607aacd677f1e029aeefe4a29f3f62c9bf3b2c +MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9 diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch new file mode 100644 index 000000000000..3c812a9407a2 --- /dev/null +++ b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch @@ -0,0 +1,16 @@ +--- libcdio-1.0.0/configure.ac ++++ libcdio-1.0.0/configure.ac +@@ -32,7 +32,12 @@ + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], + [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) + +-LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z` ++# Broken by design. See also ++# https://savannah.gnu.org/bugs/?52491 ++# and ++# http://git.savannah.gnu.org/cgit/libcdio.git/patch/?id=2d22ae18571caf29460a456340ff0603f04af6b4 ++#LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z` ++LIBCDIO_VERSION_NUM=10000 + AC_SUBST(LIBCDIO_VERSION_NUM) + + AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) diff --git a/dev-libs/libcdio/libcdio-0.92.ebuild b/dev-libs/libcdio/libcdio-0.92.ebuild deleted file mode 100644 index a69a50712464..000000000000 --- a/dev-libs/libcdio/libcdio-0.92.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils libtool multilib-minimal - -DESCRIPTION="A library to encapsulate CD-ROM reading and control" -HOMEPAGE="https://www.gnu.org/software/libcdio/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/15" # subslot is based on SONAME -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="cddb +cxx minimal static-libs test" - -RDEPEND=" - !minimal? ( - >=sys-libs/ncurses-5.7-r7:0= - cddb? ( >=media-libs/libcddb-1.3.2 ) - ) - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" -DEPEND="${RDEPEND} - sys-apps/sed - sys-devel/gettext - virtual/pkgconfig - test? ( dev-lang/perl )" -DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/cdio/cdio_config.h - /usr/include/cdio/version.h -) - -src_prepare() { - sed \ - -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \ - -i configure || die - - elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510 -} - -multilib_src_configure() { - local util_switch - if ! multilib_is_native_abi || use minimal ; then - util_switch="--without" - else - util_switch="--with" - fi - - # Tests fail if ECONF_SOURCE is not relative - ECONF_SOURCE="../${P}" econf \ - --disable-maintainer-mode \ - $(use_enable cxx) \ - --disable-cpp-progs \ - --disable-example-progs \ - $(use_enable static-libs static) \ - $(use_enable cddb) \ - --disable-vcd-info \ - ${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read} -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -} diff --git a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild new file mode 100644 index 000000000000..5a278ab70abe --- /dev/null +++ b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools libtool multilib-minimal + +DESCRIPTION="A library to encapsulate CD-ROM reading and control" +HOMEPAGE="https://www.gnu.org/software/libcdio/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/17" # subslot is based on SONAME +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="cddb +cxx minimal static-libs test" + +RDEPEND=" + !minimal? ( + >=sys-libs/ncurses-5.7-r7:0= + cddb? ( >=media-libs/libcddb-1.3.2 ) + ) + >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 + !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +DEPEND="${RDEPEND} + sys-apps/sed + sys-devel/gettext + virtual/pkgconfig + test? ( dev-lang/perl )" +DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/cdio/cdio_config.h + /usr/include/cdio/version.h +) + +PATCHES=( "${FILESDIR}/${P}-version.patch" ) + +src_prepare() { + default + + eautoreconf + + sed \ + -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \ + -i configure || die + + elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510 +} + +multilib_src_configure() { + local util_switch + if ! multilib_is_native_abi || use minimal ; then + util_switch="--without" + else + util_switch="--with" + fi + + # Tests fail if ECONF_SOURCE is not relative + ECONF_SOURCE="../${P}" econf \ + --disable-maintainer-mode \ + $(use_enable cxx) \ + --disable-cpp-progs \ + --disable-example-progs \ + $(use_enable static-libs static) \ + $(use_enable cddb) \ + --disable-vcd-info \ + ${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read} +} + +multilib_src_install_all() { + einstalldocs + prune_libtool_files +} -- cgit v1.2.3