[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: 91b752e487c10f30a02cd926ec40007bf3becf59 Author: Sam James gentoo org> AuthorDate: Sun Jul 10 07:39:33 2022 + Commit: Sam James gentoo org> CommitDate: Sun Jul 10 07:39:33 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b752e4 dev-libs/ossp-uuid: drop 1.6.2-r6 Bug: https://bugs.gentoo.org/857144 Signed-off-by: Sam James gentoo.org> dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 86 1 file changed, 86 deletions(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild deleted file mode 100644 index 7afc78c9b5c8.. --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MY_P="uuid-${PV}" - -GENTOO_DEPEND_ON_PERL="no" - -inherit perl-module - -DESCRIPTION="An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC compliant UUID" -HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"; -SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="+cxx perl static-libs" - -DEPEND="perl? ( dev-lang/perl:= )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - - eapply \ - "${FILESDIR}/${P}-gentoo-r1.patch" \ - "${FILESDIR}/${P}-gentoo-perl.patch" \ - "${FILESDIR}/${P}-hwaddr.patch" \ - "${FILESDIR}/${P}-manfix.patch" \ - "${FILESDIR}/${P}-uuid-preserve-m-option-status-in-v-option-handling.patch" \ - "${FILESDIR}/${P}-fix-whatis-entries.patch" \ - "${FILESDIR}/${P}-fix-data-uuid-from-string.patch" - - eapply_user -} - -src_configure() { - # Notes: - # * collides with e2fstools libs and includes if not moved around - # * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3 - econf \ - --includedir="${EPREFIX}"/usr/include/ossp \ - --with-dce \ - --without-pgsql \ - --without-perl \ - --without-php \ - $(use_with cxx) \ - $(use_enable static-libs static) -} - -src_compile() { - default - - if use perl; then - cd perl - # configure needs the ossp-uuid.la generated by `make` in $S - perl-module_src_configure - perl-module_src_compile - fi -} - -src_install() { - local DOCS=( AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS ) - default - unset DOCS #unset so that other eclasses don't try to install them and possibly fail - if use perl ; then - cd perl - perl-module_src_install - fi - - use static-libs || rm -rf "${ED}"/usr/lib*/*.la - - mv "${ED}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc - mv "${ED}/usr/share/man/man3"/uuid.3{,ossp} - mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp} -} - -src_test() { - export LD_LIBRARY_PATH="${S}/.libs" # required for the perl-bindings to load the (correct) library - default - - use perl && emake -C perl test -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: 9c3ab914b78a7550b76ab17de7169831815a6748 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 10 06:20:18 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 10 06:20:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c3ab914 dev-libs/ossp-uuid: x86 stable wrt bug #857144 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild index f6d5051e3b55..6aa8c6c2d688 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+cxx perl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: 1a4dac72dd6294dfb59cf23b864474b402587646 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 10 06:19:36 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 10 06:19:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a4dac72 dev-libs/ossp-uuid: sparc stable wrt bug #857144 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="sparc" Signed-off-by: Agostino Sarubbo gentoo.org> dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild index 42dd5d3da060..f6d5051e3b55 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+cxx perl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: 12877d65724296681af6436d29e4a0835620c8b0 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 10 06:18:25 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 10 06:18:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12877d65 dev-libs/ossp-uuid: ppc stable wrt bug #857144 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild index 1023a217d5be..42dd5d3da060 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+cxx perl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: 24dd1105c5dd52e97bada06e694c79cd10d2f03b Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 10 06:17:23 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 10 06:17:23 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24dd1105 dev-libs/ossp-uuid: amd64 stable wrt bug #857144 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild index 7a9a0a1c12aa..1023a217d5be 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+cxx perl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: d7cd2ff083941931eb06e9ee1d2cd3d50cb23e7c Author: Arthur Zamarin gentoo org> AuthorDate: Sat Jul 9 11:27:59 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Jul 9 11:27:59 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7cd2ff0 dev-libs/ossp-uuid: Stabilize 1.6.2-r7 arm, #857144 Signed-off-by: Arthur Zamarin gentoo.org> dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild index 9be4f4caa72a..7a9a0a1c12aa 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+cxx perl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: f46f91d733b304751044b230630e6aaf8534eac8 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Jul 9 10:43:49 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Jul 9 10:43:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f46f91d7 dev-libs/ossp-uuid: Stabilize 1.6.2-r7 ppc64, #857144 Signed-off-by: Arthur Zamarin gentoo.org> dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild index 56db655f8681..9be4f4caa72a 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+cxx perl static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: 5b598e9827ac16d65750a8c50cd89dafde58736a Author: David Seifert gentoo org> AuthorDate: Sat Jul 9 10:07:46 2022 + Commit: David Seifert gentoo org> CommitDate: Sat Jul 9 10:07:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b598e98 dev-libs/ossp-uuid: fix USE=-cxx Closes: https://bugs.gentoo.org/857021 Signed-off-by: David Seifert gentoo.org> dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild index 33616b0f8acd..56db655f8681 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild @@ -83,5 +83,7 @@ src_install() { mv "${ED}"/usr/$(get_libdir)/pkgconfig/{,ossp-}uuid.pc || die mv "${ED}"/usr/share/man/man3/uuid.3{,ossp} || die - mv "${ED}"/usr/share/man/man3/uuid++.3{,ossp} || die + if use cxx; then + mv "${ED}"/usr/share/man/man3/uuid++.3{,ossp} || die + fi }
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: 2195a8deaa56637ab767ea7d95f3cfa83df9ef35 Author: David Seifert gentoo org> AuthorDate: Sat Jul 2 16:19:25 2022 + Commit: David Seifert gentoo org> CommitDate: Sat Jul 2 16:19:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2195a8de dev-libs/ossp-uuid: [QA] cleanups Signed-off-by: David Seifert gentoo.org> dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild | 21 - 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild index 335448aba2c5..33616b0f8acd 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 MY_P="uuid-${PV}" @@ -18,11 +18,15 @@ LICENSE="ISC" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+cxx perl static-libs test" +RESTRICT="!test? ( test )" -DEPEND="perl? ( dev-lang/perl test? ( virtual/perl-Test-Simple ) )" +DEPEND=" + perl? ( + dev-lang/perl + test? ( virtual/perl-Test-Simple ) + )" RDEPEND="perl? ( dev-lang/perl:= )" BDEPEND="perl? ( dev-lang/perl )" -RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${P}-gentoo-r1.patch" @@ -67,18 +71,17 @@ src_test() { } src_install() { - local DOCS=( AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS ) default - unset DOCS #unset so that other eclasses don't try to install them and possibly fail + dodoc BINDINGS HISTORY OVERVIEW PORTING SEEALSO USERS if use perl ; then cd perl || die perl-module_src_install fi - use static-libs || rm -rf "${ED}"/usr/lib*/*.la + find "${ED}" -name '*.la' -delete || die - mv "${ED}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc - mv "${ED}/usr/share/man/man3"/uuid.3{,ossp} - mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp} + mv "${ED}"/usr/$(get_libdir)/pkgconfig/{,ossp-}uuid.pc || die + mv "${ED}"/usr/share/man/man3/uuid.3{,ossp} || die + mv "${ED}"/usr/share/man/man3/uuid++.3{,ossp} || die }
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: e5750eb623d42ee9f7b7fc523f08894e4fad272c Author: Michał Górny gentoo org> AuthorDate: Wed Jun 22 07:15:06 2022 + Commit: Michał Górny gentoo org> CommitDate: Wed Jun 22 07:26:09 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5750eb6 dev-libs/ossp-uuid: Use the canonical test restriction While the conditional test restriction here might make some sense (though it would make even more sense to remove it entirely and just skip perl tests if USE=-test), it triggers a false positive in pkgcheck and there's really no need to be that specific to cover a corner case of a corner case. Signed-off-by: Michał Górny gentoo.org> dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild index 90dbbbf5b19e..335448aba2c5 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild @@ -12,6 +12,7 @@ inherit perl-module DESCRIPTION="An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC compliant UUID" HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"; SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; +S="${WORKDIR}/${MY_P}" LICENSE="ISC" SLOT="0" @@ -21,9 +22,7 @@ IUSE="+cxx perl static-libs test" DEPEND="perl? ( dev-lang/perl test? ( virtual/perl-Test-Simple ) )" RDEPEND="perl? ( dev-lang/perl:= )" BDEPEND="perl? ( dev-lang/perl )" -RESTRICT="perl? ( !test? ( test ) )" - -S="${WORKDIR}/${MY_P}" +RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${P}-gentoo-r1.patch"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: de947d37169c0a3e426bfb892f84388fbbfc1fa3 Author: Sam James gentoo org> AuthorDate: Mon Mar 21 00:22:20 2022 + Commit: Sam James gentoo org> CommitDate: Mon Mar 21 00:22:20 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de947d37 dev-libs/ossp-uuid: use canonical phase ordering Signed-off-by: Sam James gentoo.org> dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild index 1054159a937a..90dbbbf5b19e 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild @@ -53,19 +53,27 @@ src_compile() { default if use perl; then - cd perl + cd perl || die # configure needs the ossp-uuid.la generated by `make` in $S perl-module_src_configure perl-module_src_compile fi } +src_test() { + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${S}/.libs" # required for the perl-bindings to load the (correct) library + default + + use perl && emake -C perl test +} + src_install() { local DOCS=( AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS ) default unset DOCS #unset so that other eclasses don't try to install them and possibly fail + if use perl ; then - cd perl + cd perl || die perl-module_src_install fi @@ -75,10 +83,3 @@ src_install() { mv "${ED}/usr/share/man/man3"/uuid.3{,ossp} mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp} } - -src_test() { - export LD_LIBRARY_PATH="${S}/.libs" # required for the perl-bindings to load the (correct) library - default - - use perl && emake -C perl test -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/files/, dev-libs/ossp-uuid/
commit: c65c81d4bd9ea7828cd2ba282597303b911fa458 Author: Brian Evans gentoo org> AuthorDate: Thu Mar 17 13:13:51 2022 + Commit: Brian Evans gentoo org> CommitDate: Thu Mar 17 13:16:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c65c81d4 dev-libs/ossp-uuid: Drop PHP support; Revbump for EAPI 8 Non-maintainer commit Closes: https://bugs.gentoo.org/703678 Signed-off-by: Brian Evans gentoo.org> .../files/ossp-uuid-1.6.2-gentoo-php.patch | 42 --- .../ossp-uuid/files/ossp-uuid-1.6.2-php70.patch| 337 - dev-libs/ossp-uuid/files/uuid-1.6.2-php54.patch| 226 -- dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 43 +-- ...d-1.6.2-r6.ebuild => ossp-uuid-1.6.2-r7.ebuild} | 73 ++--- 5 files changed, 22 insertions(+), 699 deletions(-) diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-php.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-php.patch deleted file mode 100644 index 69c788bf1a05.. --- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-php.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur uuid-1.6.2.orig/php/config.m4 uuid-1.6.2/php/config.m4 uuid-1.6.2.orig/php/config.m4 2009-03-21 12:52:49.142847389 +0100 -+++ uuid-1.6.2/php/config.m4 2009-03-21 12:53:06.282809038 +0100 -@@ -33,10 +33,10 @@ - if test "$PHP_UUID" != "no"; then - PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared) - AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library]) --PHP_ADD_LIBPATH([..], ) --PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD) -+PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD) --PHP_ADD_INCLUDE([..]) -+PHP_ADD_INCLUDE([../uuid-1.6.2]) - PHP_SUBST(UUID_SHARED_LIBADD) -+LDFLAGS="$LDFLAGS -L../uuid-1.6.2/.libs" - - dnl avoid linking conflict with a potentially existing uuid_create(3) in libc - AC_CHECK_FUNC(uuid_create,[ -diff -Naur uuid-1.6.2.orig/php/Makefile.local uuid-1.6.2/php/Makefile.local uuid-1.6.2.orig/php/Makefile.local 2009-03-21 12:52:49.142847389 +0100 -+++ uuid-1.6.2/php/Makefile.local 2009-03-21 12:53:06.282809038 +0100 -@@ -42,7 +42,7 @@ - - test: build - @version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; \ -- $(PHP) -q -d "safe_mode=0" -d "extension_dir=./" uuid.ts $$version -+ $(PHP) -q -d "safe_mode=0" -d "extension_dir=./modules/" uuid.ts $$version - - install: build - @version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \ -diff -Naur uuid-1.6.2.orig/php/uuid.ts uuid-1.6.2/php/uuid.ts uuid-1.6.2.orig/php/uuid.ts2009-03-21 12:52:49.142847389 +0100 -+++ uuid-1.6.2/php/uuid.ts 2009-03-21 12:53:06.282809038 +0100 -@@ -36,7 +36,7 @@ - - print "++ loading DSO uuid.so (low-level API)\n"; - if (!extension_loaded('uuid')) { --dl('modules/uuid.so'); -+dl('uuid.so'); - } - - print "++ loading PHP uuid.php${php_version} (high-level API)\n"; - diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch deleted file mode 100644 index 0124003bc1fc.. --- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch +++ /dev/null @@ -1,337 +0,0 @@ uuid/php/uuid.c2016-12-18 01:23:26.0 -0500 -+++ uuid/php/uuid.c2016-12-18 01:23:43.564329483 -0500 -@@ -41,7 +41,13 @@ - } ctx_t; - - /* context implicit destruction */ -+#if PHP_VERSION_ID >= 7 -+static void ctx_destructor(zend_resource *rsrc) -+#else -+typedef long zend_long; -+ - static void ctx_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC) -+#endif - { - ctx_t *ctx = (ctx_t *)rsrc->ptr; - -@@ -120,16 +126,23 @@ - zval *z_ctx; - ctx_t *ctx; - uuid_rc_t rc; -+#if PHP_VERSION_ID >= 7 -+char *param_types = "z/"; -+#else -+char *param_types = "z"; -+#endif - - /* parse parameters */ --if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &z_ctx) == FAILURE) -+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx) == FAILURE) - RETURN_LONG((long)UUID_RC_ARG); - - /* post-process and sanity check parameters */ -+#if PHP_VERSION_ID < 7 - if (!PZVAL_IS_REF(z_ctx)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_create: parameter wasn't passed by reference"); - RETURN_LONG((long)UUID_RC_ARG); - } -+#endif - - /* perform operation */ - if ((ctx = (ctx_t *)malloc(sizeof(ctx_t))) == NULL) -@@ -138,7 +151,12 @@ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_create: %s", uuid_error(rc)); - RETURN_LONG((long)rc); - } -+#if PHP_VERSION_ID >= 7 -+zval_dtor(z_ctx); -+ZVAL_RES(z_ctx, zend_register_resource(ctx, ctx_id)); -+#else - ZEND_REGISTER_RESOURCE(z_ctx, ctx, ctx_id); -+#endif - - RETURN_LONG((long)rc); - } -@@ -158,7 +177,11 @@ - RETURN_LONG((long)UUID_RC_ARG); - - /* post-process and sanity check parameters */ -+#if P
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: fb306ece17fc86d2afa04d1905427352b3fbb941 Author: Fabian Groffen gentoo org> AuthorDate: Wed Jan 6 19:30:28 2021 + Commit: Fabian Groffen gentoo org> CommitDate: Wed Jan 6 19:33:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb306ece dev-libs/ossp-uuid: drop x86-macos Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild index e8f0b33cfa1..95c81c8ffa6 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl:= )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: 1bea9f6e2e63ae131bcc96605f7ae179aa1e6147 Author: Matt Turner gentoo org> AuthorDate: Sun Oct 13 18:34:32 2019 + Commit: Matt Turner gentoo org> CommitDate: Sun Oct 13 19:01:11 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bea9f6e dev-libs/ossp-uuid: Drop to ~alpha Signed-off-by: Matt Turner gentoo.org> dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild index 4f7076139a7..ae03e3b394e 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild @@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; LICENSE="ISC" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl:= )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/files/, dev-libs/ossp-uuid/
commit: 659454e55734cdac2bf2892442401f523022823c Author: Brian Evans gentoo org> AuthorDate: Thu Aug 9 12:53:36 2018 + Commit: Brian Evans gentoo org> CommitDate: Thu Aug 9 12:57:17 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659454e5 dev-libs/ossp-uuid: Drop old revision Non-maintainer commit to remove old eclass code Package-Manager: Portage-2.3.45, Repoman-2.3.10 dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php.patch | 13 --- dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild | 118 - 2 files changed, 131 deletions(-) diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php.patch deleted file mode 100644 index d57e8939f15..000 --- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/php/uuid.c b/php/uuid.c -index b76b718..455611a 100644 a/php/uuid.c -+++ b/php/uuid.c -@@ -496,7 +496,7 @@ PHP_FUNCTION(uuid_version) - } - - /* module function table */ --static function_entry uuid_functions[] = { -+static zend_function_entry uuid_functions[] = { - PHP_FE(uuid_create, NULL) - PHP_FE(uuid_destroy, NULL) - PHP_FE(uuid_clone, NULL) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild deleted file mode 100644 index 281c96606a4..000 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -MY_P="uuid-${PV}" - -PHP_EXT_NAME="uuid" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_EXT_S="${WORKDIR}/${MY_P}/php" -PHP_EXT_OPTIONAL_USE="php" -USE_PHP="php5-5 php5-4" - -GENTOO_DEPEND_ON_PERL="no" - -inherit eutils multilib perl-module php-ext-source-r2 - -DESCRIPTION="An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID" -HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"; -SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; - -LICENSE="ISC" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="+cxx perl php static-libs" - -DEPEND="perl? ( dev-lang/perl:= )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - - epatch \ - "${FILESDIR}/${P}-gentoo-r1.patch" \ - "${FILESDIR}/${P}-gentoo-perl.patch" \ - "${FILESDIR}/${P}-hwaddr.patch" \ - "${FILESDIR}/${P}-manfix.patch" \ - "${FILESDIR}/${P}-uuid-preserve-m-option-status-in-v-option-handling.patch" \ - "${FILESDIR}/${P}-fix-whatis-entries.patch" \ - "${FILESDIR}/${P}-fix-data-uuid-from-string.patch" - - if use php; then - local slot - for slot in $(php_get_slots); do - php_init_slot_env ${slot} - epatch \ - "${FILESDIR}/${P}-gentoo-php.patch" \ - "${FILESDIR}/${P}-php.patch" - done - - php-ext-source-r2_src_prepare - fi -} - -src_configure() { - # Notes: - # * collides with e2fstools libs and includes if not moved around - # * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3 - econf \ - --includedir="${EPREFIX}"/usr/include/ossp \ - --with-dce \ - --without-pgsql \ - --without-perl \ - --without-php \ - $(use_with cxx) \ - $(use_enable static-libs static) - - if use php; then - php-ext-source-r2_src_configure - fi -} - -src_compile() { - default - - if use perl; then - cd perl - # configure needs the ossp-uuid.la generated by `make` in $S - perl-module_src_configure - perl-module_src_compile - fi - - if use php; then - php-ext-source-r2_src_compile - fi -} - -src_install() { - DOCS="AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS" - default - - if use perl ; then - cd perl - perl-module_src_install - fi - - if use php ; then - php-ext-source-r2_src_install - cd "${S}/php" - insinto /usr/share/php - newins uuid.php5 uuid.php - fi - - use static-libs || rm -rf "${ED}"/usr/lib*/*.la - - mv "${ED}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc - mv "${ED}/usr/share/man/man3"/uuid.3{,ossp} - mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp} -} - -src_test() { - export LD_LIBRARY_PATH="${S}/.libs" # required for the perl-bindings to load the (correct) library - de
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: b5a0f4a54af92304a332a459d56f726148d23011 Author: Fabian Groffen gentoo org> AuthorDate: Fri Apr 6 11:03:00 2018 + Commit: Fabian Groffen gentoo org> CommitDate: Fri Apr 6 11:05:08 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5a0f4a5 dev-libs/ossp-uuid: marked ~x64-macos, bug #650848 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild index 67d3db31145..f0bc8e587ac 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild @@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; LICENSE="ISC" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl:= )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: a6d7eea00e5d7f4e07a7c04b91cf6e999f4b6444 Author: Brian Evans gentoo org> AuthorDate: Tue Mar 13 00:51:49 2018 + Commit: Brian Evans gentoo org> CommitDate: Thu Mar 22 01:28:15 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d7eea0 dev-libs/ossp-uuid: Rearrange src_prepare for eclass changes Skip patching in php-ext-source-r3 and handle them here before copying to slots. dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 20 +--- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild index 1d735746f34..67d3db31145 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild @@ -10,6 +10,7 @@ PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" PHP_EXT_S="${WORKDIR}/${MY_P}/php" PHP_EXT_OPTIONAL_USE="php" +PHP_EXT_SKIP_PATCHES="yes" USE_PHP="php5-6 php7-0 php7-1" GENTOO_DEPEND_ON_PERL="no" @@ -41,21 +42,18 @@ src_prepare() { "${FILESDIR}/${P}-fix-whatis-entries.patch" \ "${FILESDIR}/${P}-fix-data-uuid-from-string.patch" + eapply_user if use php; then - local slot - for slot in $(php_get_slots); do - php_init_slot_env ${slot} - eapply -p2 \ - "${FILESDIR}/${P}-gentoo-php.patch" \ - "${FILESDIR}/uuid-${PV}-php54.patch" \ - "${FILESDIR}/${P}-php70.patch" - done - + pushd "${PHP_EXT_S}" > /dev/null || die + eapply -p2 \ + "${FILESDIR}/${P}-gentoo-php.patch" \ + "${FILESDIR}/uuid-${PV}-php54.patch" \ + "${FILESDIR}/${P}-php70.patch" + popd > /dev/null || die php-ext-source-r3_src_prepare + #Remove call by reference which is error sed -i -e 's/\&\$/\$/' -e '/?>/d' "${S}/php/uuid.php5" || die - else - eapply_user fi }
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: 5a2059bd447609fb3d4bf4b0e41d72e7a8bafa1e Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Oct 30 21:49:56 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Oct 30 21:50:37 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a2059bd dev-libs/ossp-uuid: stable 1.6.2-r6 for sparc, bug #573940 (thanks to Rolf Eike Beer) Package-Manager: Portage-2.3.13, Repoman-2.3.4 RepoMan-Options: --include-arches="sparc" dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild index ecbd6706a1c..4f7c08a045b 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild @@ -22,7 +22,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; LICENSE="ISC" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl:= )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: 13a78eef2c9fa5f9cdf6488f08eab7c2728b103a Author: Brian Evans gentoo org> AuthorDate: Thu Oct 19 19:33:04 2017 + Commit: Brian Evans gentoo org> CommitDate: Thu Oct 19 19:33:04 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a78eef dev-libs/ossp-uuid: Drop old revisions Package-Manager: Portage-2.3.11, Repoman-2.3.3 dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild | 97 -- dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild | 118 --- 2 files changed, 215 deletions(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild deleted file mode 100644 index a0982233473..000 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -PHP_EXT_NAME="uuid" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -USE_PHP="php5-4" - -MY_P="uuid-${PV}" -PHP_EXT_S="${WORKDIR}/${MY_P}/php" -PHP_EXT_OPTIONAL_USE="php" - -inherit eutils multilib php-ext-source-r2 - -DESCRIPTION="An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID" -HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"; -SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; - -LICENSE="ISC" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="+cxx perl php static-libs" - -DEPEND="perl? ( dev-lang/perl )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - - epatch \ - "${FILESDIR}/${P}-gentoo-r1.patch" \ - "${FILESDIR}/${P}-gentoo-perl.patch" - - if use php; then - local slot - for slot in $(php_get_slots); do - php_init_slot_env ${slot} - epatch \ - "${FILESDIR}/${P}-gentoo-php.patch" \ - "${FILESDIR}/${P}-php.patch" - done - - php-ext-source-r2_src_prepare - fi -} - -src_configure() { - # Notes: - # * collides with e2fstools libs and includes if not moved around - # * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3 - econf \ - --includedir="${EPREFIX}"/usr/include/ossp \ - --with-dce \ - --without-pgsql \ - --without-php \ - $(use_with cxx) \ - $(use_with perl) \ - $(use_enable static-libs static) - - if use php; then - php-ext-source-r2_src_configure - fi -} - -src_compile() { - default - - if use php; then - php-ext-source-r2_src_compile - fi -} - -src_install() { - DOCS="AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS" - default - - if use php ; then - php-ext-source-r2_src_install - cd "${S}/php" - insinto /usr/share/php - newins uuid.php5 uuid.php - fi - - use static-libs || rm -rf "${ED}"/usr/lib*/*.la - - mv "${ED}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc - mv "${ED}/usr/share/man/man3"/uuid.3{,ossp} - mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp} -} - -src_test() { - export LD_LIBRARY_PATH="${S}/.libs" # required for the perl-bindings to load the (correct) library - default -} diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild deleted file mode 100644 index a0da82f64f8..000 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -MY_P="uuid-${PV}" - -PHP_EXT_NAME="uuid" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_EXT_S="${WORKDIR}/${MY_P}/php" -PHP_EXT_OPTIONAL_USE="php" -USE_PHP="php5-6 php5-5" - -GENTOO_DEPEND_ON_PERL="no" - -inherit eutils multilib perl-module php-ext-source-r2 - -DESCRIPTION="An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID" -HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"; -SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="+cxx perl php static-libs" - -DEPEND="perl? ( dev-lang/perl:= )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - - epatch \ - "${FILESDIR}/${P}-gentoo-r1.patch" \ - "${FILESDIR}/${P}-gentoo-perl.patch" \ - "${FILESDIR}/${P}-hwaddr.patch" \ -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: 566464aeaaf96c3ac3f440fbb1745d7382ddb530 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Oct 4 08:08:41 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Oct 4 08:13:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=566464ae dev-libs/ossp-uuid: stable 1.6.2-r6 for ppc/ppc64, bug #573940 Package-Manager: Portage-2.3.10, Repoman-2.3.3 RepoMan-Options: --include-arches="ppc ppc64" dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild index 2da61fed90e..ecbd6706a1c 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild @@ -22,7 +22,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; LICENSE="ISC" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl:= )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: d1d59f23d2ee09c371d2cab58fd8cb526d077f28 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Sep 20 21:16:14 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Sep 20 21:16:59 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1d59f23 dev-libs/ossp-uuid: stable 1.6.2-r6 for hppa, bug #573940 Package-Manager: Portage-2.3.8, Repoman-2.3.3 RepoMan-Options: --include-arches="hppa" dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild index 253f46f0965..2da61fed90e 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild @@ -22,7 +22,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; LICENSE="ISC" SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl:= )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: 944130d42f39473b16c652626a90d23f5fefcf98 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Aug 29 21:33:06 2017 + Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Aug 29 21:39:03 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=944130d4 dev-libs/ossp-uuid: x86 stable (bug #573940) Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild index 69c395e811c..37610a2d5a7 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild @@ -22,7 +22,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl:= )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: 1787bbf55c482e00fbceab02b4b0abddcf3be984 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Aug 26 12:06:09 2017 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Aug 26 12:06:36 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1787bbf5 dev-libs/ossp-uuid: amd64 stable wrt bug #573940 Package-Manager: Portage-2.3.6, Repoman-2.3.1 dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild index 392817bf35e..69c395e811c 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild @@ -22,7 +22,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl:= )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: a5e4d18e1c2a6dd6dc48c3d3c1bc84ec96dba113 Author: Markus Meier gentoo org> AuthorDate: Thu Aug 10 04:37:23 2017 + Commit: Markus Meier gentoo org> CommitDate: Thu Aug 10 04:37:23 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e4d18e dev-libs/ossp-uuid: arm stable, bug #573940 Package-Manager: Portage-2.3.6, Repoman-2.3.1 RepoMan-Options: --include-arches="arm" dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild index 3c24d863f21..392817bf35e 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild @@ -22,7 +22,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl:= )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: a87562e4ee1de1a981c727eaa1f619642094b732 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Aug 5 18:06:06 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Aug 5 18:07:51 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a87562e4 dev-libs/ossp-uuid: stable 1.6.2-r6 for ia64, bug #573940 Package-Manager: Portage-2.3.6, Repoman-2.3.3 RepoMan-Options: --include-arches="ia64" dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild index 429560bbc2e..3c24d863f21 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild @@ -22,7 +22,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl:= )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: f0d207ffe711c291b506b796aa03ab937a48ebc2 Author: Brian Evans gentoo org> AuthorDate: Mon Jul 31 17:56:23 2017 + Commit: Brian Evans gentoo org> CommitDate: Mon Jul 31 17:56:23 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0d207ff dev-libs/ossp-uuid: Add blocker on dev-php/pecl-uuid wrt bug 577396 Non-maintainer commit. No action by maintainer for nearly 18 months. Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild index be7cb06cafc..429560bbc2e 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild @@ -16,7 +16,7 @@ GENTOO_DEPEND_ON_PERL="no" inherit perl-module php-ext-source-r3 -DESCRIPTION="An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID" +DESCRIPTION="An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC compliant UUID" HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"; SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; @@ -26,7 +26,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl:= )" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} php? ( !dev-php/pecl-uuid )" S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: 1d641f6187ec1cba674365653d9282bdfbb12763 Author: Fabian Groffen gentoo org> AuthorDate: Sun Jan 29 16:16:30 2017 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Jan 29 16:16:30 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d641f61 dev-libs/ossp-uuid: dropped ~ia64-linux ~x86-freebsd Package-Manager: portage-2.3.3 dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild | 4 ++-- dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild | 4 ++-- dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild | 4 ++-- dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild index 9b42024..9ddd893 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -21,7 +21,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; LICENSE="ISC" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl )" diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild index 0971047..4b670f8 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; LICENSE="ISC" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl:= )" diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild index 1113834..a363691 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl:= )" diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild index d4676e0..fae1609 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="+cxx perl php static-libs" DEPEND="perl? ( dev-lang/perl:= )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: 6d1a2abfdf2589020090a691710251f993d6ad29 Author: Brian Evans gentoo org> AuthorDate: Mon Dec 19 13:58:38 2016 + Commit: Brian Evans gentoo org> CommitDate: Mon Dec 19 13:58:38 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1a2abf dev-libs/ossp-uuid: Fix missing eapply_user call for USE=-php wrt bug 603066 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild index 3435a78..d4676e0 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild @@ -53,9 +53,11 @@ src_prepare() { done php-ext-source-r3_src_prepare + #Remove call by reference which is error + sed -i -e 's/\&\$/\$/' -e '/?>/d' "${S}/php/uuid.php5" || die + else + eapply_user fi - #Remove call by reference which is error - sed -i -e 's/\&\$/\$/' -e '/?>/d' "${S}/php/uuid.php5" || die } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/files/, dev-libs/ossp-uuid/
commit: c3b97104952cc1fc80554f2ff1e0fb9155eebbb7 Author: Brian Evans gentoo org> AuthorDate: Sun Dec 18 23:16:21 2016 + Commit: Brian Evans gentoo org> CommitDate: Sun Dec 18 23:16:21 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3b97104 dev-libs/ossp-uuid: Revbump to fix PHP support and bump to EAPI6 Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../ossp-uuid/files/ossp-uuid-1.6.2-php70.patch| 337 + dev-libs/ossp-uuid/files/uuid-1.6.2-php54.patch| 226 ++ dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 122 3 files changed, 685 insertions(+) diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch new file mode 100644 index ..0124003 --- /dev/null +++ b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch @@ -0,0 +1,337 @@ +--- uuid/php/uuid.c2016-12-18 01:23:26.0 -0500 uuid/php/uuid.c2016-12-18 01:23:43.564329483 -0500 +@@ -41,7 +41,13 @@ + } ctx_t; + + /* context implicit destruction */ ++#if PHP_VERSION_ID >= 7 ++static void ctx_destructor(zend_resource *rsrc) ++#else ++typedef long zend_long; ++ + static void ctx_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC) ++#endif + { + ctx_t *ctx = (ctx_t *)rsrc->ptr; + +@@ -120,16 +126,23 @@ + zval *z_ctx; + ctx_t *ctx; + uuid_rc_t rc; ++#if PHP_VERSION_ID >= 7 ++char *param_types = "z/"; ++#else ++char *param_types = "z"; ++#endif + + /* parse parameters */ +-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &z_ctx) == FAILURE) ++if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx) == FAILURE) + RETURN_LONG((long)UUID_RC_ARG); + + /* post-process and sanity check parameters */ ++#if PHP_VERSION_ID < 7 + if (!PZVAL_IS_REF(z_ctx)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_create: parameter wasn't passed by reference"); + RETURN_LONG((long)UUID_RC_ARG); + } ++#endif + + /* perform operation */ + if ((ctx = (ctx_t *)malloc(sizeof(ctx_t))) == NULL) +@@ -138,7 +151,12 @@ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_create: %s", uuid_error(rc)); + RETURN_LONG((long)rc); + } ++#if PHP_VERSION_ID >= 7 ++zval_dtor(z_ctx); ++ZVAL_RES(z_ctx, zend_register_resource(ctx, ctx_id)); ++#else + ZEND_REGISTER_RESOURCE(z_ctx, ctx, ctx_id); ++#endif + + RETURN_LONG((long)rc); + } +@@ -158,7 +177,11 @@ + RETURN_LONG((long)UUID_RC_ARG); + + /* post-process and sanity check parameters */ ++#if PHP_VERSION_ID >= 7 ++ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id); ++#else + ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id); ++#endif + if (ctx == NULL || ctx->uuid == NULL) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_destroy: invalid context"); + RETURN_LONG((long)UUID_RC_ARG); +@@ -185,21 +208,32 @@ + zval *z_clone; + ctx_t *clone; + uuid_rc_t rc; ++#if PHP_VERSION_ID >= 7 ++char *param_types = "rz/"; ++#else ++char *param_types = "rz"; ++#endif + + /* parse parameters */ +-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &z_ctx, &z_clone) == FAILURE) ++if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_clone) == FAILURE) + RETURN_LONG((long)UUID_RC_ARG); + + /* post-process and sanity check parameters */ ++#if PHP_VERSION_ID >= 7 ++ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id); ++#else + ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id); ++#endif + if (ctx == NULL || ctx->uuid == NULL) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_clone: invalid context"); + RETURN_LONG((long)UUID_RC_ARG); + } ++#if PHP_VERSION_ID < 7 + if (!PZVAL_IS_REF(z_clone)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_clone: clone parameter wasn't passed by reference"); + RETURN_LONG((long)UUID_RC_ARG); + } ++#endif + + /* perform operation */ + if ((clone = (ctx_t *)malloc(sizeof(ctx_t))) == NULL) +@@ -208,7 +243,12 @@ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_clone: %s", uuid_error(rc)); + RETURN_LONG((long)rc); + } ++#if PHP_VERSION_ID >= 7 ++zval_dtor(z_clone); ++ZVAL_RES(z_clone, zend_register_resource(clone, ctx_id)); ++#else + ZEND_REGISTER_RESOURCE(z_clone, clone, ctx_id); ++#endif + + RETURN_LONG((long)rc); + } +@@ -230,7 +271,11 @@ + RETURN_LONG((long)UUID_RC_ARG); + + /* post-process and sanity check parameters */ ++#if PHP_VERSION_ID >= 7 ++ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id); ++#else + ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id); ++#endif + if (ctx == NULL || ctx->uuid == NULL)
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/
commit: 659bf2a1dd3a586af37f83d95a5045a2ba835be7 Author: Brian Evans gentoo org> AuthorDate: Wed Jul 13 12:33:16 2016 + Commit: Brian Evans gentoo org> CommitDate: Wed Jul 13 12:33:16 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659bf2a1 dev-libs/ossp-uuid: Revbump to increase support to php 5.6 Package-Manager: portage-2.3.0 dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild | 119 +++ 1 file changed, 119 insertions(+) diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild new file mode 100644 index 000..1113834 --- /dev/null +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r5.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +MY_P="uuid-${PV}" + +PHP_EXT_NAME="uuid" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_EXT_S="${WORKDIR}/${MY_P}/php" +PHP_EXT_OPTIONAL_USE="php" +USE_PHP="php5-6 php5-5" + +GENTOO_DEPEND_ON_PERL="no" + +inherit eutils multilib perl-module php-ext-source-r2 + +DESCRIPTION="An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID" +HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"; +SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"; + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +IUSE="+cxx perl php static-libs" + +DEPEND="perl? ( dev-lang/perl:= )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + + epatch \ + "${FILESDIR}/${P}-gentoo-r1.patch" \ + "${FILESDIR}/${P}-gentoo-perl.patch" \ + "${FILESDIR}/${P}-hwaddr.patch" \ + "${FILESDIR}/${P}-manfix.patch" \ + "${FILESDIR}/${P}-uuid-preserve-m-option-status-in-v-option-handling.patch" \ + "${FILESDIR}/${P}-fix-whatis-entries.patch" \ + "${FILESDIR}/${P}-fix-data-uuid-from-string.patch" + + if use php; then + local slot + for slot in $(php_get_slots); do + php_init_slot_env ${slot} + epatch \ + "${FILESDIR}/${P}-gentoo-php.patch" \ + "${FILESDIR}/${P}-php.patch" + done + + php-ext-source-r2_src_prepare + fi +} + +src_configure() { + # Notes: + # * collides with e2fstools libs and includes if not moved around + # * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3 + econf \ + --includedir="${EPREFIX}"/usr/include/ossp \ + --with-dce \ + --without-pgsql \ + --without-perl \ + --without-php \ + $(use_with cxx) \ + $(use_enable static-libs static) + + if use php; then + php-ext-source-r2_src_configure + fi +} + +src_compile() { + default + + if use perl; then + cd perl + # configure needs the ossp-uuid.la generated by `make` in $S + perl-module_src_configure + perl-module_src_compile + fi + + if use php; then + php-ext-source-r2_src_compile + fi +} + +src_install() { + DOCS="AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS" + default + + if use perl ; then + cd perl + perl-module_src_install + fi + + if use php ; then + php-ext-source-r2_src_install + cd "${S}/php" + insinto /usr/share/php + newins uuid.php5 uuid.php + fi + + use static-libs || rm -rf "${ED}"/usr/lib*/*.la + + mv "${ED}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc + mv "${ED}/usr/share/man/man3"/uuid.3{,ossp} + mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp} +} + +src_test() { + export LD_LIBRARY_PATH="${S}/.libs" # required for the perl-bindings to load the (correct) library + default + + use perl && emake -C perl test +}