summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-09-13 19:15:14 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-09-13 19:15:14 +0000
commit97f91da17ae8ade5b685739c642704429cd3759e (patch)
tree5b2e70823bedd58292aab9adc56fd16e1c239f63 /dev-libs/iniparser
parentStabilise 0.9.8 on relevant arches, remove older. Add latest version. (diff)
downloadgentoo-2-97f91da17ae8ade5b685739c642704429cd3759e.tar.gz
gentoo-2-97f91da17ae8ade5b685739c642704429cd3759e.tar.bz2
gentoo-2-97f91da17ae8ade5b685739c642704429cd3759e.zip
Remove older stuff.
(Portage version: 2.2.0_alpha125/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/iniparser')
-rw-r--r--dev-libs/iniparser/ChangeLog8
-rw-r--r--dev-libs/iniparser/files/iniparser-3.0b-fix-set-functions.patch27
-rw-r--r--dev-libs/iniparser/files/iniparser-3.0b-makefile.patch49
-rw-r--r--dev-libs/iniparser/iniparser-3.0.0.ebuild49
-rw-r--r--dev-libs/iniparser/iniparser-3.0b-r1.ebuild47
5 files changed, 7 insertions, 173 deletions
diff --git a/dev-libs/iniparser/ChangeLog b/dev-libs/iniparser/ChangeLog
index 37bd102617d0..11a16cc8d658 100644
--- a/dev-libs/iniparser/ChangeLog
+++ b/dev-libs/iniparser/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/iniparser
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/ChangeLog,v 1.29 2012/08/26 17:31:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/ChangeLog,v 1.30 2012/09/13 19:15:13 scarabeus Exp $
+
+ 13 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+ -files/iniparser-3.0b-fix-set-functions.patch,
+ -files/iniparser-3.0b-makefile.patch, -iniparser-3.0.0.ebuild,
+ -iniparser-3.0b-r1.ebuild:
+ Remove older stuff.
26 Aug 2012; Raúl Porcel <armin76@gentoo.org> iniparser-3.1.ebuild:
alpha/ia64/s390/sh/sparc stable wrt #428152
diff --git a/dev-libs/iniparser/files/iniparser-3.0b-fix-set-functions.patch b/dev-libs/iniparser/files/iniparser-3.0b-fix-set-functions.patch
deleted file mode 100644
index 9bb7c7bfcfd0..000000000000
--- a/dev-libs/iniparser/files/iniparser-3.0b-fix-set-functions.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -aur iniparser3.0b/src/iniparser.h iniparser3.0b.patched/src/iniparser.h
---- iniparser3.0b/src/iniparser.h 2007-11-23 21:38:19.000000000 +0000
-+++ iniparser3.0b.patched/src/iniparser.h 2009-04-28 11:08:28.644706261 +0100
-@@ -39,7 +39,8 @@
- ---------------------------------------------------------------------------*/
- /** For backwards compatibility only */
- #define iniparser_getstr(d, k) iniparser_getstring(d, k, NULL)
--#define iniparser_setstr iniparser_setstring
-+#define iniparser_setstr iniparser_set
-+#define iniparser_setstring iniparser_set
-
- /*-------------------------------------------------------------------------*/
- /**
-@@ -215,11 +216,11 @@
- @return int 0 if Ok, -1 otherwise.
-
- If the given entry can be found in the dictionary, it is modified to
-- contain the provided value. If it cannot be found, -1 is returned.
-+ contain the provided value. If it cannot be found, it is inserted.
- It is Ok to set val to NULL.
- */
- /*--------------------------------------------------------------------------*/
--int iniparser_setstring(dictionary * ini, char * entry, char * val);
-+int iniparser_set(dictionary * ini, char * entry, char * val);
-
-
- /*-------------------------------------------------------------------------*/
diff --git a/dev-libs/iniparser/files/iniparser-3.0b-makefile.patch b/dev-libs/iniparser/files/iniparser-3.0b-makefile.patch
deleted file mode 100644
index 6f834030ddb9..000000000000
--- a/dev-libs/iniparser/files/iniparser-3.0b-makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Naur iniparser3.0b.orig/Makefile iniparser3.0b/Makefile
---- iniparser3.0b.orig/Makefile 2010-04-07 08:02:48.771242264 +0200
-+++ iniparser3.0b/Makefile 2010-04-07 08:10:51.403895732 +0200
-@@ -3,16 +3,16 @@
- #
-
- # Compiler settings
--CC = gcc
--CFLAGS = -O2 -fPIC -Wall -ansi -pedantic
-+CC ?= gcc
-+CFLAGS += -fPIC -Wall -ansi -pedantic
-
- # Ar settings to build the library
--AR = ar
-+AR ?= ar
- ARFLAGS = rcv
-
- SHLD = ${CC} ${CFLAGS}
--LDSHFLAGS = -shared -Wl,-Bsymbolic -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib
--LDFLAGS = -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib
-+LDSHFLAGS = -shared -Wl,-Bsymbolic
-+LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib
-
- # Set RANLIB to ranlib on systems that require it (Sun OS < 4, Mac OSX)
- # RANLIB = ranlib
-@@ -28,7 +28,7 @@
- COMPILE.c=$(CC) $(CFLAGS) -c
- .c.o:
- @(echo "compiling $< ...")
-- @($(COMPILE.c) -o $@ $<)
-+ $(COMPILE.c) -o $@ $<
-
-
- SRCS = src/iniparser.c \
-@@ -40,11 +40,11 @@
- default: libiniparser.a libiniparser.so
-
- libiniparser.a: $(OBJS)
-- @($(AR) $(ARFLAGS) libiniparser.a $(OBJS))
-- @($(RANLIB) libiniparser.a)
-+ $(AR) $(ARFLAGS) libiniparser.a $(OBJS)
-+ $(RANLIB) libiniparser.a
-
- libiniparser.so: $(OBJS)
-- @$(SHLD) $(LDSHFLAGS) -o $@.0 $(OBJS) $(LDFLAGS) \
-+ $(SHLD) $(LDSHFLAGS) $(LDFLAGS) -o $@.0 $(OBJS) \
- -Wl,-soname=`basename $@`.0
-
- clean:
diff --git a/dev-libs/iniparser/iniparser-3.0.0.ebuild b/dev-libs/iniparser/iniparser-3.0.0.ebuild
deleted file mode 100644
index cb64fd6d089c..000000000000
--- a/dev-libs/iniparser/iniparser-3.0.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/iniparser-3.0.0.ebuild,v 1.4 2012/05/16 12:33:33 aballier Exp $
-
-EAPI="4"
-
-inherit autotools-utils
-
-DESCRIPTION="A free stand-alone ini file parsing library."
-HOMEPAGE="http://ndevilla.free.fr/iniparser/"
-
-#name this version 3.0.0 instead of 3.0 as 3.0.0 > 3.0b > 3.0
-SRC_URI="http://ndevilla.free.fr/iniparser/${P%.0}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos"
-IUSE="doc examples static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )
- sys-devel/libtool"
-RDEPEND=""
-
-# the tests are rather examples than tests, no point in running them
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( AUTHORS README )
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.0b-cpp.patch"
- "${FILESDIR}/${PN}-3.0-autotools.patch"
-)
-
-AUTOTOOLS_AUTORECONF=1
-
-src_install() {
- autotools-utils_src_install
-
- if use doc; then
- emake -C doc
- dohtml -r html/*
- fi
-
- if use examples ; then
- insinto /usr/share/doc/${PF}/examples
- doins test/*.{c,ini,py}
- fi
-}
diff --git a/dev-libs/iniparser/iniparser-3.0b-r1.ebuild b/dev-libs/iniparser/iniparser-3.0b-r1.ebuild
deleted file mode 100644
index 6baf03d23886..000000000000
--- a/dev-libs/iniparser/iniparser-3.0b-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/iniparser-3.0b-r1.ebuild,v 1.15 2010/04/11 08:18:38 dev-zero Exp $
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="A free stand-alone ini file parsing library."
-HOMEPAGE="http://ndevilla.free.fr/iniparser/"
-SRC_URI="http://ndevilla.free.fr/iniparser/${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- epatch "${FILESDIR}/${P}-fix-set-functions.patch"
-}
-
-src_compile() {
- echo "CFLAGS: ${CFLAGS}"
- sed -i \
- -e "s|\(CFLAGS =\) -O2|\1 ${CFLAGS}|" \
- -e "s|\(LDFLAGS =\)|\1 ${LDFLAGS}|" \
- -e "s|/usr/lib|/usr/$(get_libdir)|" \
- Makefile || die "sed failed"
-
- emake CC=$(tc-getCC) AR="$(tc-getAR)" || die "emake failed"
-}
-
-src_install() {
- dolib libiniparser.a libiniparser.so.0
- dosym libiniparser.so.0 /usr/$(get_libdir)/libiniparser.so
-
- insinto /usr/include
- doins src/*.h
-
- dodoc AUTHORS README
- dohtml html/*
-}