* [gentoo-commits] repo/gentoo:master commit in: dev-libs/cvector/, dev-libs/cvector/files/
@ 2019-10-07 13:53 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2019-10-07 13:53 UTC (permalink / raw
To: gentoo-commits
commit: 500065b4edbd592bcc677074df6686f2a09d3c9c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 7 13:11:07 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct 7 13:53:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=500065b4
dev-libs/cvector: Drop old (EAPI=0)
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-libs/cvector/Manifest | 1 -
dev-libs/cvector/cvector-1.0.3-r1.ebuild | 45 ------------------------------
dev-libs/cvector/files/1.0.3-LDFLAGS.patch | 17 -----------
3 files changed, 63 deletions(-)
diff --git a/dev-libs/cvector/Manifest b/dev-libs/cvector/Manifest
index a1f798391aa..2f47d3e9f15 100644
--- a/dev-libs/cvector/Manifest
+++ b/dev-libs/cvector/Manifest
@@ -1,2 +1 @@
DIST CVector-1.0.3.1.tar.gz 19761 BLAKE2B a744e810018c1769a3f9d623c43e86a52d5f1c7b6502761768686e5b52e88c34c32f056d937a395c903a82224d503d2843bb3516c297b61cb87cec589ff9758e SHA512 41300e46873efa8a2cfc44c76788025385fa7b7a108cf9dd95e4e28d515d825d4a44786a7ffb130d727a42907d56e4f62e6f75a02c96333b6afdc06c336d538e
-DIST CVector-1.0.3.tar.gz 41642 BLAKE2B c8e536340a703ea7363efe763d9cbea58af68278d0c21eed926704af52a28082785bdcdd67f2a1c5a47732cabe3ca801c7e4fba204c2a8d7c2d8298e272035cd SHA512 f43030d95aeb6ef230dada13903ad56049acd15379a0c04e08b6ce8d7df7baffa3bac166af0c3c93f018e00058e07680af655e71bc0d542a6da2ad1f18e95788
diff --git a/dev-libs/cvector/cvector-1.0.3-r1.ebuild b/dev-libs/cvector/cvector-1.0.3-r1.ebuild
deleted file mode 100644
index 66e34fe0896..00000000000
--- a/dev-libs/cvector/cvector-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit base eutils toolchain-funcs versionator
-
-MY_PN=CVector
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An ANSI C implementation of dynamic arrays (Approximation of C++ vectors)"
-HOMEPAGE="http://cvector.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${PV}-LDFLAGS.patch
- "${FILESDIR}"/${PV}-dynlib.patch
- )
-
-src_compile() {
- emake \
- CC=$(tc-getCC) \
- CXX=$(tc-getCXX) \
- CFLAGS="${CFLAGS}" \
- all || die
-}
-
-src_install() {
- dolib.so *.so.${PV} || die
- dosym libCVector.so.${PV} /usr/$(get_libdir)/libCVector.so.$(get_version_component_range 1-2) || die
- dosym libCVector.so.${PV} /usr/$(get_libdir)/libCVector.so.$(get_major_version) || die
- dosym libCVector.so.${PV} /usr/$(get_libdir)/libCVector.so || die
-
- insinto /usr/include
- doins *.h || die
-
- dodoc README_CVector.txt || die
-}
diff --git a/dev-libs/cvector/files/1.0.3-LDFLAGS.patch b/dev-libs/cvector/files/1.0.3-LDFLAGS.patch
deleted file mode 100644
index 7e54e812024..00000000000
--- a/dev-libs/cvector/files/1.0.3-LDFLAGS.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile 2009-07-08 04:02:56.000000000 +0200
-+++ Makefile.new 2009-07-25 11:59:27.000000000 +0200
-@@ -89,10 +89,10 @@
- endif
-
- COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
--LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib
--BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
--BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -shared -I $(INSTALL_PREFIX)/include
--BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALL_PREFIX)/include
-+LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined $(LDFLAGS)
-+BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)
-+BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -shared
-+BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -static
- INSTALL_COMMAND = $(LIBTOOL) --mode=install cp
- INSTALL_FINISH_COMMAND = $(LIBTOOL) --mode=finish
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/cvector/, dev-libs/cvector/files/
@ 2021-01-27 3:52 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-01-27 3:52 UTC (permalink / raw
To: gentoo-commits
commit: 18c8b7cf907cf5fb555cfa3126387b687277e6f7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 27 03:33:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 27 03:33:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c8b7cf
dev-libs/cvector: port to EAPI 7
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/cvector/cvector-1.0.3.1.ebuild | 24 ++++++++++------------
dev-libs/cvector/files/1.0.3-dynlib.patch | 2 --
.../cvector/files/cvector-1.0.3.1-LDFLAGS.patch | 4 ++--
3 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/dev-libs/cvector/cvector-1.0.3.1.ebuild b/dev-libs/cvector/cvector-1.0.3.1.ebuild
index 83e0ee6f0d4..4b7b0bc8f3a 100644
--- a/dev-libs/cvector/cvector-1.0.3.1.ebuild
+++ b/dev-libs/cvector/cvector-1.0.3.1.ebuild
@@ -1,42 +1,40 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit base eutils toolchain-funcs versionator
+inherit toolchain-funcs
MY_PN=CVector
MY_P="${MY_PN}-${PV}"
DESCRIPTION="An ANSI C implementation of dynamic arrays (approximation of C++ vectors)"
HOMEPAGE="http://cvector.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_PN}-$(get_version_component_range 1-3)/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_PN}-$(ver_cut 1-3)/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}"/${MY_P}
PATCHES=(
"${FILESDIR}"/${P}-LDFLAGS.patch
"${FILESDIR}"/1.0.3-dynlib.patch
- )
+)
src_compile() {
emake \
- CC=$(tc-getCC) \
- CXX=$(tc-getCXX) \
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)" \
CFLAGS="${CFLAGS}" \
all
}
src_install() {
- ln -sf libCVector.so.$(get_version_component_range 1-3) libCVector.so.$(get_major_version) || die
- ln -sf libCVector.so.$(get_version_component_range 1-3) libCVector.so || die
- dolib.so libCVector.so*
+ ln -sf libCVector.so.$(ver_cut 1-3) libCVector.so.$(ver_cut 1) || die
+ ln -sf libCVector.so.$(ver_cut 1-3) libCVector.so || die
+ dolib.so libCVector.so*
doheader *.h
dodoc README_CVector.txt
diff --git a/dev-libs/cvector/files/1.0.3-dynlib.patch b/dev-libs/cvector/files/1.0.3-dynlib.patch
index 219f258136e..072453e3067 100644
--- a/dev-libs/cvector/files/1.0.3-dynlib.patch
+++ b/dev-libs/cvector/files/1.0.3-dynlib.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 865db81..2691108 100644
--- a/Makefile
+++ b/Makefile
@@ -96,8 +96,8 @@ BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(IN
diff --git a/dev-libs/cvector/files/cvector-1.0.3.1-LDFLAGS.patch b/dev-libs/cvector/files/cvector-1.0.3.1-LDFLAGS.patch
index 8bed3ab0154..3bbc65f4078 100644
--- a/dev-libs/cvector/files/cvector-1.0.3.1-LDFLAGS.patch
+++ b/dev-libs/cvector/files/cvector-1.0.3.1-LDFLAGS.patch
@@ -1,5 +1,5 @@
---- Makefile 2009-07-08 04:02:56.000000000 +0200
-+++ Makefile.new 2009-07-25 11:59:27.000000000 +0200
+--- a/Makefile
++++ b/Makefile
@@ -89,10 +89,10 @@
endif
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-27 3:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-27 3:52 [gentoo-commits] repo/gentoo:master commit in: dev-libs/cvector/, dev-libs/cvector/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2019-10-07 13:53 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox