public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libpcre/files/, dev-libs/libpcre/
Date: Tue, 14 Jun 2016 18:39:07 +0000 (UTC)	[thread overview]
Message-ID: <1465929543.e992bbc5c6cd3d14ae5742cd58e0549b647da18f.polynomial-c@gentoo> (raw)

commit:     e992bbc5c6cd3d14ae5742cd58e0549b647da18f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 18:38:46 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 18:39:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e992bbc5

dev-libs/libpcre: Removed old.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-libs/libpcre/Manifest                          |  1 -
 .../libpcre/files/libpcre-7.9-pkg-config.patch     | 48 -----------------
 dev-libs/libpcre/libpcre-7.9-r1.ebuild             | 61 ----------------------
 3 files changed, 110 deletions(-)

diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 77a27a7..acbed3f 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,3 +1,2 @@
-DIST pcre-7.9.tar.bz2 861580 SHA256 40a13a9759f1de5b16bc2f0d47b6aa5f0ec010325646922f54b013c040dcd740 SHA512 b4c47a9b196750d4bead9e3904702fc793d282a22af1b34e24081077b4c167ec787cf7dec9a565fa9df4dafb5927b7accdd49568f5c2f8733842cbbec5d4d25c WHIRLPOOL 412cf0a128861cbb991a0424e9f4ba551093b7853465776e17465f9c2b4222002a8b26d7a234b91a49e055a04ae840ad5d6c1613615c98db3d44413a723a6152
 DIST pcre-8.38.tar.bz2 1562265 SHA256 b9e02d36e23024d6c02a2e5b25204b3a4fa6ade43e0a5f869f254f49535079df SHA512 ad3412ceee8f992787a3e7cbe0155ffba67affd4b2dfece6c4501dc8d2012f52dcc1ee1f56759362e04bbbd10ea9370b3e46f238e2f75005cb69f6c8439e52c0 WHIRLPOOL 68533f741a3faa618f4d7341bfa59aaac295ac6af6085772e4c169ad73fae38e98cace2ce2af2899a619bb05dce79859dcd175a158a73729082f7cf52107d1df
 DIST pcre-8.39.tar.bz2 1560758 SHA256 b858099f82483031ee02092711689e7245586ada49e534a06e678b8ea9549e8b SHA512 8b0f14ae5947c4b2d74876a795b04e532fd71c2479a64dbe0ed817e7c7894ea3cae533413de8c17322d305cb7f4e275d72b43e4e828eaca77dc4bcaf04529cf6 WHIRLPOOL 00e8e7fb3dc60cbbd2ee185e269696058b568a0f269749386bad44cb474f723c9ed3dfd2af91ddce0b5047aab459864f07e05940af17d3d51d2f1b068415b1ed

diff --git a/dev-libs/libpcre/files/libpcre-7.9-pkg-config.patch b/dev-libs/libpcre/files/libpcre-7.9-pkg-config.patch
deleted file mode 100644
index 3015d78..0000000
--- a/dev-libs/libpcre/files/libpcre-7.9-pkg-config.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -NrU5 pcre-7.9.orig/configure.ac pcre-7.9/configure.ac
---- pcre-7.9.orig/configure.ac	2009-04-11 16:09:54.000000000 +0200
-+++ pcre-7.9/configure.ac	2009-04-18 22:40:50.000000000 +0200
-@@ -598,10 +598,11 @@
- 
- # Produce these files, in addition to config.h.
- AC_CONFIG_FILES(
- 	Makefile
- 	libpcre.pc
-+	libpcreposix.pc
- 	libpcrecpp.pc
- 	pcre-config
- 	pcre.h
- 	pcre_stringpiece.h
- 	pcrecpparg.h
-diff -NrU5 pcre-7.9.orig/libpcreposix.pc.in pcre-7.9/libpcreposix.pc.in
---- pcre-7.9.orig/libpcreposix.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ pcre-7.9/libpcreposix.pc.in	2009-04-18 22:38:02.000000000 +0200
-@@ -0,0 +1,13 @@
-+# Package Information for pkg-config
-+
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: libpcreposix
-+Description: PCREPosix - Posix compatible regular expressions C library
-+Version: @PACKAGE_VERSION@
-+Libs: -L${libdir} -lpcreposix
-+Cflags: -I${includedir}
-+Requires.private: libpcre
-diff -NrU5 pcre-7.9.orig/Makefile.am pcre-7.9/Makefile.am
---- pcre-7.9.orig/Makefile.am	2009-02-27 17:02:49.000000000 +0100
-+++ pcre-7.9/Makefile.am	2009-04-18 22:40:00.000000000 +0200
-@@ -325,11 +325,11 @@
- 	$(CC) -shared -o pcre.dll -Wl,"--strip-all" -Wl,"--export-all-symbols" $(DLL_OBJS)
- 
- 
- # We have .pc files for pkg-config users.
- pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = libpcre.pc
-+pkgconfig_DATA = libpcre.pc libpcreposix.pc
- if WITH_PCRE_CPP
- pkgconfig_DATA += libpcrecpp.pc
- endif
- 
- dist_man_MANS = \

diff --git a/dev-libs/libpcre/libpcre-7.9-r1.ebuild b/dev-libs/libpcre/libpcre-7.9-r1.ebuild
deleted file mode 100644
index 3d1ff6b..0000000
--- a/dev-libs/libpcre/libpcre-7.9-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit libtool eutils toolchain-funcs autotools multilib
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-if [[ ${PV} == ${PV/_rc} ]]
-then
-	MY_P="pcre-${PV}"
-	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
-else
-	MY_P="pcre-${PV/_rc/-RC}"
-	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
-fi
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="bzip2 +cxx doc unicode zlib static-libs"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e "s:libdir=@libdir@:libdir=/$(get_libdir):" libpcre.pc.in || die "Fixing libpcre pkgconfig files failed"
-	sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die "Fixing libpcrecpp pkgconfig files failed"
-	echo "Requires: libpcre = @PACKAGE_VERSION@" >> libpcrecpp.pc.in
-	epatch "${FILESDIR}"/libpcre-7.9-pkg-config.patch
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf --with-match-limit-recursion=8192 \
-		$(use_enable unicode utf8) $(use_enable unicode unicode-properties) \
-		$(use_enable cxx cpp) \
-		$(use_enable zlib pcregrep-libz) \
-		$(use_enable bzip2 pcregrep-libbz2) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--docdir=/usr/share/doc/${PF} \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	gen_usr_ldscript -a pcre
-
-	dodoc doc/*.txt AUTHORS
-	use doc && dohtml doc/html/*
-	find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}


             reply	other threads:[~2016-06-14 18:39 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-14 18:39 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-08-03 19:08 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libpcre/files/, dev-libs/libpcre/ Sam James
2020-02-13 10:20 Lars Wendler
2019-04-10  6:19 Lars Wendler
2019-04-10  5:06 Lars Wendler
2018-03-21  7:05 Lars Wendler
2017-03-20  7:48 Mike Frysinger
2017-01-17 16:23 Lars Wendler
2016-04-02 20:51 Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1465929543.e992bbc5c6cd3d14ae5742cd58e0549b647da18f.polynomial-c@gentoo \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox