Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-libs/popt/files/digest-popt-1.10.4-r33
-rw-r--r--dev-libs/popt/files/digest-popt-1.7-r13
-rw-r--r--dev-libs/popt/files/popt-1.10.4-nls.patch55
-rw-r--r--dev-libs/popt/files/popt-1.7-missing-tests.patch18
-rw-r--r--dev-libs/popt/files/popt-1.7-nls.patch12
-rw-r--r--dev-libs/popt/popt-1.10.4-r3.ebuild39
-rw-r--r--dev-libs/popt/popt-1.10.7.ebuild4
-rw-r--r--dev-libs/popt/popt-1.7-r1.ebuild41
8 files changed, 2 insertions, 173 deletions
diff --git a/dev-libs/popt/files/digest-popt-1.10.4-r3 b/dev-libs/popt/files/digest-popt-1.10.4-r3
deleted file mode 100644
index 7e169cde2429..000000000000
--- a/dev-libs/popt/files/digest-popt-1.10.4-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dd22a6873b43d00f75e1c1b7dcfd1ff7 popt-1.10.4.tar.gz 1169462
-RMD160 c59c383f5e9f53b2fc17294bb2568cc46f204784 popt-1.10.4.tar.gz 1169462
-SHA256 1ce47451c9ac9d81f42b2b7fcb11c2f211b4943e3e5d7d946da53ced7fb04114 popt-1.10.4.tar.gz 1169462
diff --git a/dev-libs/popt/files/digest-popt-1.7-r1 b/dev-libs/popt/files/digest-popt-1.7-r1
deleted file mode 100644
index 034252d7fae8..000000000000
--- a/dev-libs/popt/files/digest-popt-1.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5988e7aeb0ae4dac8d83561265984cc9 popt-1.7.tar.gz 574549
-RMD160 2942c28d82607501d5ae595063da27599b5b93da popt-1.7.tar.gz 574549
-SHA256 4e75cb28793f0d44134f71fae53057d5f250805e6268fbd9c9780654b73b0dc1 popt-1.7.tar.gz 574549
diff --git a/dev-libs/popt/files/popt-1.10.4-nls.patch b/dev-libs/popt/files/popt-1.10.4-nls.patch
deleted file mode 100644
index 0bb2b6cd5393..000000000000
--- a/dev-libs/popt/files/popt-1.10.4-nls.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- popt-1.10.4.orig/configure.ac
-+++ popt-1.10.4.my/configure.ac
-@@ -92,14 +92,6 @@
- [ : ] )
- AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
-
--if test ! -f ../rpm.c
--then
-- AC_MSG_CHECKING(for GNU xgettext)
-- xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || AC_MSG_ERROR([
-- *** GNU gettext is required. The latest version
-- *** is always available from ftp://ftp.gnu.org/gnu/gettext/.])
-- AC_MSG_RESULT(yes)
--fi
-
- AC_CHECK_FUNC(setreuid, [], [
- AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
-@@ -107,11 +99,9 @@
- AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror)
-
-
--AM_GNU_GETTEXT
--
- POPT_SOURCE_PATH="`pwd`"
- AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
- [Full path to popt top_srcdir.])
- AC_SUBST(POPT_SOURCE_PATH)
-
--AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in])
-+AC_OUTPUT([Doxyfile Makefile])
---- popt-1.10.4.orig/Makefile.am
-+++ popt-1.10.4.my/Makefile.am
-@@ -9,8 +9,6 @@
- po/*.in po/*.po po/popt.pot \
- popt.ps
-
--SUBDIRS = intl po
--
- INCLUDES = -I. -I$(top_srcdir)
-
- noinst_HEADERS = findme.h poptint.h system.h
-@@ -39,10 +37,11 @@
- usrlib_LTLIBRARIES = libpopt.la
-
- libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
--libpopt_la_LDFLAGS = -no-undefined @INTLLIBS@
-
- if HAVE_LD_VERSION_SCRIPT
--libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers
-+libpopt_la_LDFLAGS = -no-undefined -Wl,--version-script=$(srcdir)/libpopt.vers
-+else
-+libpopt_la_LDFLAGS = -no-undefined
- endif
-
- man_MANS = popt.3
diff --git a/dev-libs/popt/files/popt-1.7-missing-tests.patch b/dev-libs/popt/files/popt-1.7-missing-tests.patch
deleted file mode 100644
index e5d10e02ecff..000000000000
--- a/dev-libs/popt/files/popt-1.7-missing-tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Disable tests that are incomplete.
-
-Patch by Ryan Hill.
-
-http://bugs.gentoo.org/71610
-
---- testit.sh
-+++ testit.sh
-@@ -92,9 +92,5 @@
- run test1 "test1 - 39" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional=ping pong
- run test1 "test1 - 40" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional ping pong
-
--run_diff test3 "test3 - 41" test3-data/01.input test3-data/01.answer
--run_diff test3 "test3 - 42" test3-data/02.input test3-data/02.answer
--run_diff test3 "test3 - 43" test3-data/03.input test3-data/03.answer
--
- echo ""
- echo "Passed."
diff --git a/dev-libs/popt/files/popt-1.7-nls.patch b/dev-libs/popt/files/popt-1.7-nls.patch
deleted file mode 100644
index cc8b3c45bb6c..000000000000
--- a/dev-libs/popt/files/popt-1.7-nls.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: popt-1.7/Makefile.am
-===================================================================
---- popt-1.7.orig/Makefile.am
-+++ popt-1.7/Makefile.am
-@@ -34,6 +34,7 @@ TESTS = testit.sh
- include_HEADERS = popt.h
- lib_LTLIBRARIES = libpopt.la
- libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
-+libpopt_la_LIBADD = $(LTLIBINTL)
-
- man_MANS = popt.3
-
diff --git a/dev-libs/popt/popt-1.10.4-r3.ebuild b/dev-libs/popt/popt-1.10.4-r3.ebuild
deleted file mode 100644
index a209353ae92e..000000000000
--- a/dev-libs/popt/popt-1.10.4-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.10.4-r3.ebuild,v 1.8 2007/08/25 22:39:24 vapier Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.9"
-
-inherit flag-o-matic autotools
-
-DESCRIPTION="Parse Options - Command line parser"
-HOMEPAGE="http://www.rpm.org/"
-SRC_URI="ftp://jbj.org/pub/rpm-4.4.x/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="nls? ( sys-devel/gettext )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-lib64.patch
- epatch "${FILESDIR}"/${P}-regression.patch
- use nls || epatch "${FILESDIR}"/${P}-nls.patch
- eautoreconf
-}
-
-src_compile() {
- econf $(use_enable nls) || die
- emake || die "emake failed"
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
- dodoc CHANGES README
-}
diff --git a/dev-libs/popt/popt-1.10.7.ebuild b/dev-libs/popt/popt-1.10.7.ebuild
index 7e260eaa419b..9085615e9a85 100644
--- a/dev-libs/popt/popt-1.10.7.ebuild
+++ b/dev-libs/popt/popt-1.10.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.10.7.ebuild,v 1.11 2007/06/11 17:47:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.10.7.ebuild,v 1.12 2007/12/09 03:58:26 vapier Exp $
inherit eutils
@@ -10,7 +10,7 @@ SRC_URI="ftp://jbj.org/pub/rpm-4.4.x/${P}.tar.gz"
LICENSE="as-is"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
IUSE="nls"
RDEPEND="nls? ( virtual/libintl )"
diff --git a/dev-libs/popt/popt-1.7-r1.ebuild b/dev-libs/popt/popt-1.7-r1.ebuild
deleted file mode 100644
index a7b7e20710f1..000000000000
--- a/dev-libs/popt/popt-1.7-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.7-r1.ebuild,v 1.26 2007/01/09 19:05:52 sanchan Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.6"
-
-inherit libtool eutils flag-o-matic autotools
-
-DESCRIPTION="Parse Options - Command line parser"
-HOMEPAGE="http://www.rpm.org/"
-SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="nls? ( sys-devel/gettext )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-missing-tests.patch
- epatch "${FILESDIR}"/${P}-nls.patch
- use nls || touch ../rpm.c
-
- eautomake
- elibtoolize
-}
-
-src_compile() {
- econf $(use_enable nls) || die
- emake || die "emake failed"
-}
-
-src_install() {
- make install DESTDIR="${D}" || die
- dodoc CHANGES README
-}