* [gentoo-commits] proj/sci:master commit in: dev-libs/utf8proc/files/, dev-libs/utf8proc/
@ 2015-05-26 8:10 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2015-05-26 8:10 UTC (permalink / raw
To: gentoo-commits
commit: 23bd0520d401ac1d8743d25666504184354c1bf5
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 08:29:00 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue May 26 08:09:50 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=23bd0520
dev-libs/utf8proc: Fix build process, https://github.com/gentoo-science/sci/issues/427
Package-Manager: portage-2.2.20
dev-libs/utf8proc/ChangeLog | 7 ++++
.../utf8proc/files/utf8proc-1.2-buildflags.patch | 40 ++++++++++++++++++----
dev-libs/utf8proc/metadata.xml | 4 +--
...{utf8proc-1.2.ebuild => utf8proc-1.2-r1.ebuild} | 13 ++++---
4 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/dev-libs/utf8proc/ChangeLog b/dev-libs/utf8proc/ChangeLog
index f822d34..77d9155 100644
--- a/dev-libs/utf8proc/ChangeLog
+++ b/dev-libs/utf8proc/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*utf8proc-1.2-r1 (25 May 2015)
+
+ 25 May 2015; Justin Lecher <jlec@gentoo.org> +utf8proc-1.2-r1.ebuild,
+ -utf8proc-1.2.ebuild, files/utf8proc-1.2-buildflags.patch, metadata.xml:
+ dev-libs/utf8proc: Fix build process, https://github.com/gentoo-
+ science/sci/issues/427
+
*utf8proc-1.2 (21 May 2015)
21 May 2015; Marius Brehler <marbre@linux.sungazer.de>
diff --git a/dev-libs/utf8proc/files/utf8proc-1.2-buildflags.patch b/dev-libs/utf8proc/files/utf8proc-1.2-buildflags.patch
index 4d583e4..de8847c 100644
--- a/dev-libs/utf8proc/files/utf8proc-1.2-buildflags.patch
+++ b/dev-libs/utf8proc/files/utf8proc-1.2-buildflags.patch
@@ -1,14 +1,40 @@
-Adjust build flags. Proted from 1.1.6.
+ Makefile | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
-Patch by Marius Brehler.
---- Makefile
-+++ Makefile
-@@ -6,7 +6,7 @@ AR=ar
+diff --git a/Makefile b/Makefile
+index aba2453..5fab07d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,8 +6,8 @@ AR=ar
INSTALL=install
# compiler settings
-cflags = -O2 -std=c99 -pedantic -Wall -fpic -DUTF8PROC_EXPORTS $(CFLAGS)
-+cflags = -std=c99 -pedantic -fpic -DUTF8PROC_EXPORTS $(CFLAGS)
- cc = $(CC) $(cflags)
+-cc = $(CC) $(cflags)
++CFLAGS ?= -O2
++CFLAGS += -std=c99 -pedantic -Wall -fpic -DUTF8PROC_EXPORTS
# shared-library version MAJOR.MINOR.PATCH ... this may be *different*
+ # from the utf8proc version number because it indicates ABI compatibility,
+@@ -54,18 +54,19 @@ data/utf8proc_data.c.new: libutf8proc.$(SHLIB_EXT) data/data_generator.rb data/c
+ $(MAKE) -C data utf8proc_data.c.new
+
+ utf8proc.o: utf8proc.h utf8proc.c utf8proc_data.c
+- $(cc) -c -o utf8proc.o utf8proc.c
++ $(CC) $(CFLAGS) -c -o utf8proc.o utf8proc.c
+
+ libutf8proc.a: utf8proc.o
+ rm -f libutf8proc.a
+ $(AR) rs libutf8proc.a utf8proc.o
+
+ libutf8proc.so.$(MAJOR).$(MINOR).$(PATCH): utf8proc.o
+- $(cc) -shared -o $@ -Wl,-soname -Wl,libutf8proc.so.$(MAJOR) utf8proc.o
++ $(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname -Wl,libutf8proc.so.$(MAJOR) utf8proc.o
+ chmod a-x $@
+
+ libutf8proc.so: libutf8proc.so.$(MAJOR).$(MINOR).$(PATCH)
+ ln -f -s libutf8proc.so.$(MAJOR).$(MINOR).$(PATCH) $@
++ ln -f -s libutf8proc.so.$(MAJOR).$(MINOR).$(PATCH) $@.$(MAJOR)
+
+ libutf8proc.$(MAJOR).dylib: utf8proc.o
+ $(cc) -dynamiclib -o $@ $^ -install_name $(libdir)/$@ -Wl,-compatibility_version -Wl,$(MAJOR) -Wl,-current_version -Wl,$(MAJOR).$(MINOR).$(PATCH)
diff --git a/dev-libs/utf8proc/metadata.xml b/dev-libs/utf8proc/metadata.xml
index f8fff5b..740304b 100644
--- a/dev-libs/utf8proc/metadata.xml
+++ b/dev-libs/utf8proc/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<longdescription>
+ <herd>sci</herd>
+ <longdescription>
utf8proc is a library for processing UTF-8 encoded Unicode
strings. Some features are Unicode normalization, stripping of
default ignorable characters, case folding and detection of grapheme
diff --git a/dev-libs/utf8proc/utf8proc-1.2.ebuild b/dev-libs/utf8proc/utf8proc-1.2-r1.ebuild
similarity index 71%
rename from dev-libs/utf8proc/utf8proc-1.2.ebuild
rename to dev-libs/utf8proc/utf8proc-1.2-r1.ebuild
index 349806f..e00835d 100644
--- a/dev-libs/utf8proc/utf8proc-1.2.ebuild
+++ b/dev-libs/utf8proc/utf8proc-1.2-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit eutils
+inherit eutils toolchain-funcs
DESCRIPTION="library for processing UTF-8 encoded Unicode strings"
HOMEPAGE="http://www.public-software-group.org/utf8proc"
@@ -20,12 +20,17 @@ src_prepare() {
}
src_compile() {
- emake libutf8proc.so
- use static-libs & emake libutf8proc.a
+ emake \
+ libutf8proc.so \
+ $(usex static-libs libutf8proc.a "") \
+ CC=$(tc-getCC) \
+ AR=$(tc-getAR)
+# CFLAGS="${CFLAGS}"
+# LDFLAGS="${LDFLAGS} -Wl,--soname,lib${PN}.${PV}"
}
src_install() {
doheader utf8proc.h
- dolib.so libutf8proc.so
+ dolib.so libutf8proc.so*
use static-libs && dolib.a libutf8proc.a
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-libs/utf8proc/files/, dev-libs/utf8proc/
@ 2020-09-25 22:19 Aisha Tammy
0 siblings, 0 replies; 3+ messages in thread
From: Aisha Tammy @ 2020-09-25 22:19 UTC (permalink / raw
To: gentoo-commits
commit: 0ed951f2150dfeba33cc53f5b7dae1e235ed708c
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Sep 25 22:18:55 2020 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Fri Sep 25 22:18:55 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=0ed951f2
dev-libs/utf8proc: drop old versions
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
.../utf8proc/files/utf8proc-1.1.6-buildflags.patch | 11 ------
.../utf8proc/files/utf8proc-1.1.6-soname.patch | 11 ------
.../utf8proc/files/utf8proc-1.2-buildflags.patch | 40 ----------------------
dev-libs/utf8proc/metadata.xml | 20 ++++++-----
dev-libs/utf8proc/utf8proc-1.1.6.ebuild | 36 -------------------
dev-libs/utf8proc/utf8proc-1.2-r1.ebuild | 35 -------------------
dev-libs/utf8proc/utf8proc-2.5.0.ebuild | 2 +-
7 files changed, 13 insertions(+), 142 deletions(-)
diff --git a/dev-libs/utf8proc/files/utf8proc-1.1.6-buildflags.patch b/dev-libs/utf8proc/files/utf8proc-1.1.6-buildflags.patch
deleted file mode 100644
index d9ff3be91..000000000
--- a/dev-libs/utf8proc/files/utf8proc-1.1.6-buildflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile 2014-01-26 18:55:57.400996757 +0000
-+++ b/Makefile 2014-01-26 19:00:10.264164095 +0000
-@@ -3,7 +3,7 @@
-
- # settings
-
--cflags = -O2 -std=c99 -pedantic -Wall -fpic $(CFLAGS)
-+cflags = -std=c99 -pedantic -fpic $(CFLAGS)
- cc = $(CC) $(cflags)
-
-
diff --git a/dev-libs/utf8proc/files/utf8proc-1.1.6-soname.patch b/dev-libs/utf8proc/files/utf8proc-1.1.6-soname.patch
deleted file mode 100644
index c0463700d..000000000
--- a/dev-libs/utf8proc/files/utf8proc-1.1.6-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile 2014-01-26 19:01:17.723542649 +0000
-+++ b/Makefile 2014-01-26 19:02:24.532907919 +0000
-@@ -34,7 +34,7 @@
- ar rs libutf8proc.a utf8proc.o
-
- libutf8proc.so: utf8proc.o
-- $(cc) -shared -o libutf8proc.so utf8proc.o
-+ $(cc) -Wl,-soname,libutf8proc.so -shared -o libutf8proc.so utf8proc.o
- chmod a-x libutf8proc.so
-
- libutf8proc.dylib: utf8proc.o
diff --git a/dev-libs/utf8proc/files/utf8proc-1.2-buildflags.patch b/dev-libs/utf8proc/files/utf8proc-1.2-buildflags.patch
deleted file mode 100644
index de8847cdf..000000000
--- a/dev-libs/utf8proc/files/utf8proc-1.2-buildflags.patch
+++ /dev/null
@@ -1,40 +0,0 @@
- Makefile | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index aba2453..5fab07d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -6,8 +6,8 @@ AR=ar
- INSTALL=install
-
- # compiler settings
--cflags = -O2 -std=c99 -pedantic -Wall -fpic -DUTF8PROC_EXPORTS $(CFLAGS)
--cc = $(CC) $(cflags)
-+CFLAGS ?= -O2
-+CFLAGS += -std=c99 -pedantic -Wall -fpic -DUTF8PROC_EXPORTS
-
- # shared-library version MAJOR.MINOR.PATCH ... this may be *different*
- # from the utf8proc version number because it indicates ABI compatibility,
-@@ -54,18 +54,19 @@ data/utf8proc_data.c.new: libutf8proc.$(SHLIB_EXT) data/data_generator.rb data/c
- $(MAKE) -C data utf8proc_data.c.new
-
- utf8proc.o: utf8proc.h utf8proc.c utf8proc_data.c
-- $(cc) -c -o utf8proc.o utf8proc.c
-+ $(CC) $(CFLAGS) -c -o utf8proc.o utf8proc.c
-
- libutf8proc.a: utf8proc.o
- rm -f libutf8proc.a
- $(AR) rs libutf8proc.a utf8proc.o
-
- libutf8proc.so.$(MAJOR).$(MINOR).$(PATCH): utf8proc.o
-- $(cc) -shared -o $@ -Wl,-soname -Wl,libutf8proc.so.$(MAJOR) utf8proc.o
-+ $(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname -Wl,libutf8proc.so.$(MAJOR) utf8proc.o
- chmod a-x $@
-
- libutf8proc.so: libutf8proc.so.$(MAJOR).$(MINOR).$(PATCH)
- ln -f -s libutf8proc.so.$(MAJOR).$(MINOR).$(PATCH) $@
-+ ln -f -s libutf8proc.so.$(MAJOR).$(MINOR).$(PATCH) $@.$(MAJOR)
-
- libutf8proc.$(MAJOR).dylib: utf8proc.o
- $(cc) -dynamiclib -o $@ $^ -install_name $(libdir)/$@ -Wl,-compatibility_version -Wl,$(MAJOR) -Wl,-current_version -Wl,$(MAJOR).$(MINOR).$(PATCH)
diff --git a/dev-libs/utf8proc/metadata.xml b/dev-libs/utf8proc/metadata.xml
index b411feb93..daf64208c 100644
--- a/dev-libs/utf8proc/metadata.xml
+++ b/dev-libs/utf8proc/metadata.xml
@@ -5,15 +5,19 @@
<email>sci@gentoo.org</email>
<name>Gentoo Science Project</name>
</maintainer>
+ <maintainer type="person">
+ <email>gentoo@aisha.cc</email>
+ <name>Aisha Tammy</name>
+ </maintainer>
<longdescription>
-utf8proc is a library for processing UTF-8 encoded Unicode
-strings. Some features are Unicode normalization, stripping of
-default ignorable characters, case folding and detection of grapheme
-cluster boundaries. A special character mapping is available, which
-converts for example the characters “Hyphen” (U+2010), “Minus”
-(U+2212) and “Hyphen-Minus” (U+002D, ASCII Minus) all into the ASCII
-minus sign, to make them equal for comparisons.
-</longdescription>
+ utf8proc is a library for processing UTF-8 encoded Unicode
+ strings. Some features are Unicode normalization, stripping of
+ default ignorable characters, case folding and detection of grapheme
+ cluster boundaries. A special character mapping is available, which
+ converts for example the characters “Hyphen” (U+2010), “Minus”
+ (U+2212) and “Hyphen-Minus” (U+002D, ASCII Minus) all into the ASCII
+ minus sign, to make them equal for comparisons.
+ </longdescription>
<upstream>
<remote-id type="github">JuliaLang/utf8proc</remote-id>
</upstream>
diff --git a/dev-libs/utf8proc/utf8proc-1.1.6.ebuild b/dev-libs/utf8proc/utf8proc-1.1.6.ebuild
deleted file mode 100644
index 0cf65af75..000000000
--- a/dev-libs/utf8proc/utf8proc-1.1.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="library for processing UTF-8 encoded Unicode strings"
-HOMEPAGE="http://www.public-software-group.org/utf8proc"
-SRC_URI="http://www.public-software-group.org/pub/projects/${PN}/v${PV}/utf8proc-v${PV}.tar.gz"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-soname.patch \
- "${FILESDIR}"/${P}-buildflags.patch
-}
-
-src_compile() {
- emake libutf8proc.so
- use static-libs & emake libutf8proc.a
-}
-
-src_install() {
- doheader utf8proc.h
- dolib.so libutf8proc.so
- use static-libs && dolib.a libutf8proc.a
-}
diff --git a/dev-libs/utf8proc/utf8proc-1.2-r1.ebuild b/dev-libs/utf8proc/utf8proc-1.2-r1.ebuild
deleted file mode 100644
index d57e4100f..000000000
--- a/dev-libs/utf8proc/utf8proc-1.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="library for processing UTF-8 encoded Unicode strings"
-HOMEPAGE="http://www.public-software-group.org/utf8proc"
-SRC_URI="https://github.com/JuliaLang/${PN}/archive/v1.2.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-src_prepare() {
- epatch "${FILESDIR}"/"${P}"-buildflags.patch
-}
-
-src_compile() {
- emake \
- libutf8proc.so \
- $(usex static-libs libutf8proc.a "") \
- CC=$(tc-getCC) \
- AR=$(tc-getAR)
-# CFLAGS="${CFLAGS}"
-# LDFLAGS="${LDFLAGS} -Wl,--soname,lib${PN}.${PV}"
-}
-
-src_install() {
- doheader utf8proc.h
- dolib.so libutf8proc.so*
- use static-libs && dolib.a libutf8proc.a
-}
diff --git a/dev-libs/utf8proc/utf8proc-2.5.0.ebuild b/dev-libs/utf8proc/utf8proc-2.5.0.ebuild
index a44b3c93c..a41743112 100644
--- a/dev-libs/utf8proc/utf8proc-2.5.0.ebuild
+++ b/dev-libs/utf8proc/utf8proc-2.5.0.ebuild
@@ -23,4 +23,4 @@ src_configure() {
-DUTF8PROC_ENABLE_TESTING=$(usex test)
)
cmake_src_configure
-}
\ No newline at end of file
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-libs/utf8proc/files/, dev-libs/utf8proc/
@ 2020-11-25 17:20 Aisha Tammy
0 siblings, 0 replies; 3+ messages in thread
From: Aisha Tammy @ 2020-11-25 17:20 UTC (permalink / raw
To: gentoo-commits
commit: 80d5e4c089aa50dd905d8bbf29ed78ac10c5de43
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Wed Nov 25 17:19:21 2020 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Wed Nov 25 17:19:21 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=80d5e4c0
dev-libs/utf8proc: drop duplicate ::gentoo package
duplicate of dev-libs/libutf8proc::gentoo
Closes: https://bugs.gentoo.org/756727
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
.../utf8proc/files/utf8proc-2.5.0-libdir.patch | 15 -------------
dev-libs/utf8proc/metadata.xml | 24 --------------------
dev-libs/utf8proc/utf8proc-2.5.0.ebuild | 26 ----------------------
3 files changed, 65 deletions(-)
diff --git a/dev-libs/utf8proc/files/utf8proc-2.5.0-libdir.patch b/dev-libs/utf8proc/files/utf8proc-2.5.0-libdir.patch
deleted file mode 100644
index 8054c7ae3..000000000
--- a/dev-libs/utf8proc/files/utf8proc-2.5.0-libdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bfc3f9b..8fef4af 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,8 +52,8 @@ set_target_properties (utf8proc PROPERTIES
- if (UTF8PROC_INSTALL)
- install(TARGETS utf8proc
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib)
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- install(
- FILES
diff --git a/dev-libs/utf8proc/metadata.xml b/dev-libs/utf8proc/metadata.xml
deleted file mode 100644
index daf64208c..000000000
--- a/dev-libs/utf8proc/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <maintainer type="person">
- <email>gentoo@aisha.cc</email>
- <name>Aisha Tammy</name>
- </maintainer>
- <longdescription>
- utf8proc is a library for processing UTF-8 encoded Unicode
- strings. Some features are Unicode normalization, stripping of
- default ignorable characters, case folding and detection of grapheme
- cluster boundaries. A special character mapping is available, which
- converts for example the characters “Hyphen” (U+2010), “Minus”
- (U+2212) and “Hyphen-Minus” (U+002D, ASCII Minus) all into the ASCII
- minus sign, to make them equal for comparisons.
- </longdescription>
- <upstream>
- <remote-id type="github">JuliaLang/utf8proc</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-libs/utf8proc/utf8proc-2.5.0.ebuild b/dev-libs/utf8proc/utf8proc-2.5.0.ebuild
deleted file mode 100644
index a41743112..000000000
--- a/dev-libs/utf8proc/utf8proc-2.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils toolchain-funcs cmake
-
-DESCRIPTION="library for processing UTF-8 encoded Unicode strings"
-HOMEPAGE="http://www.public-software-group.org/utf8proc"
-SRC_URI="https://github.com/JuliaLang/utf8proc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${P}-libdir.patch )
-
-src_configure() {
- local mycmakeargs=(
- -DUTF8PROC_INSTALL=ON
- -DUTF8PROC_ENABLE_TESTING=$(usex test)
- )
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-25 17:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-25 17:20 [gentoo-commits] proj/sci:master commit in: dev-libs/utf8proc/files/, dev-libs/utf8proc/ Aisha Tammy
-- strict thread matches above, loose matches on Subject: below --
2020-09-25 22:19 Aisha Tammy
2015-05-26 8:10 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox