remove old

(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

5 files changed, 6 insertions, 223 deletions

diff --git a/sys-freebsd/freebsd-cddl/ChangeLog b/sys-freebsd/freebsd-cddl/ChangeLog
index f76dab62449d..226d8c57e8b5 100644
--- a/sys-freebsd/freebsd-cddl/ChangeLog
+++ b/sys-freebsd/freebsd-cddl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-cddl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.31 2013/02/07 01:05:36 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.32 2013/06/18 23:19:54 aballier Exp $
+
+  18 Jun 2013; Alexis Ballier <aballier@gentoo.org> -freebsd-cddl-7.2.ebuild,
+  -freebsd-cddl-8.0.ebuild, -files/freebsd-cddl-7.1-libpaths.patch,
+  -files/freebsd-cddl-7.1-xdr_header.patch:
+  remove old
 
   07 Feb 2013; Naohiro Aota <naota@gentoo.org> freebsd-cddl-7.2.ebuild,
   freebsd-cddl-8.0.ebuild, freebsd-cddl-8.2.ebuild, freebsd-cddl-9.0.ebuild,
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-libpaths.patch
deleted file mode 100644
index e50fe5ee3bcb..000000000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-libpaths.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -ru cddl.orig/lib/libctf/Makefile cddl/lib/libctf/Makefile
---- cddl.orig/lib/libctf/Makefile	2009-01-24 03:36:33 -0200
-+++ cddl/lib/libctf/Makefile	2009-01-24 03:55:10 -0200
-@@ -4,6 +4,7 @@
- 
- LIB=		ctf
- SHLIB_MAJOR=	1
-+LDADD+=-lz
- 
- SRCS=		ctf_create.c \
- 		ctf_decl.c \
-diff -ru cddl.orig/lib/libdtrace/Makefile cddl/lib/libdtrace/Makefile
---- cddl.orig/lib/libdtrace/Makefile	2009-01-24 00:18:47 -0200
-+++ cddl/lib/libdtrace/Makefile	2009-01-24 03:31:06 -0200
-@@ -74,7 +74,7 @@
- .endif
- 
- LFLAGS+=-l
--
-+LDADD+=-lz -lproc
- YFLAGS+=-d
- 
- CLEANFILES=	dt_errtags.c dt_names.c
-diff -ru cddl.orig/lib/libzfs/Makefile cddl/lib/libzfs/Makefile
---- cddl.orig/lib/libzfs/Makefile	2008-06-22 10:26:18 -0300
-+++ cddl/lib/libzfs/Makefile	2008-06-22 10:26:26 -0300
-@@ -7,7 +7,7 @@
-
- LIB=	zfs
- DPADD=	${LIBUTIL}
--LDADD=	-lutil
-+LDADD=	-lutil -lgeom -lm
-
- SRCS=	deviceid.c \
- 	mnttab.c \
-diff -ru cddl.orig/lib/libzpool/Makefile cddl/lib/libzpool/Makefile
---- cddl.orig/lib/libzpool/Makefile	2008-06-22 10:35:15 -0300
-+++ cddl/lib/libzpool/Makefile	2008-06-22 10:37:06 -0300
-@@ -42,7 +42,8 @@
- CFLAGS+=	-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
- 
- DPADD=		${LIBPTHREAD} ${LIBZ}
--LDADD=		-lpthread -lz
-+LDADD=		-lpthread -lz -lavl
-+LDFLAGS+=	-L${.CURDIR}/../libavl
- 
- # atomic.S doesn't like profiling.
- NO_PROFILE=
-diff -ru cddl.orig/sbin/zfs/Makefile cddl/sbin/zfs/Makefile
---- cddl.orig/sbin/zfs/Makefile	2008-06-22 10:02:30 -0300
-+++ cddl/sbin/zfs/Makefile	2008-06-22 10:14:23 -0300
-@@ -23,5 +23,7 @@
- 	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
- LDADD=	-lzfs -lgeom -lbsdxml -lsbuf \
- 	-lm -lnvpair -luutil -lutil
-+LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libnvpair \
-+	-L${.CURDIR}/../../lib/libuutil -L/lib -L/usr/lib
- 
- .include <bsd.prog.mk>
-diff -ru cddl.orig/sbin/zpool/Makefile cddl/sbin/zpool/Makefile
---- cddl.orig/sbin/zpool/Makefile	2008-06-22 10:02:30 -0300
-+++ cddl/sbin/zpool/Makefile	2008-06-22 10:14:47 -0300
-@@ -23,5 +23,7 @@
- 	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
- LDADD=	-lavl -lzfs -lgeom -lbsdxml -lsbuf \
- 	-lm -lnvpair -luutil -lutil
-+LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libavl  -L/lib -L/usr/lib \
-+	-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libuutil
- 
- .include <bsd.prog.mk>
-diff -ru cddl.orig/usr.bin/ztest/Makefile cddl/usr.bin/ztest/Makefile
---- cddl.orig/usr.bin/ztest/Makefile	2008-06-22 10:02:30 -0300
-+++ cddl/usr.bin/ztest/Makefile	2008-06-22 10:12:40 -0300
-@@ -18,5 +18,7 @@
- DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- 	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
- LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
-+LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \
-+	-L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib
- 
- .include <bsd.prog.mk>
-diff -ru cddl.orig/usr.sbin/zdb/Makefile cddl/usr.sbin/zdb/Makefile
---- cddl.orig/usr.sbin/zdb/Makefile	2008-06-22 10:02:30 -0300
-+++ cddl/usr.sbin/zdb/Makefile	2008-06-22 10:13:31 -0300
-@@ -19,5 +19,7 @@
- DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- 	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
- LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
-+LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \
-+	-L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl  -L/lib -L/usr/lib
- 
- .include <bsd.prog.mk>
-diff -ru cddl.orig/usr.bin/Makefile.inc cddl/usr.bin/Makefile.inc
---- cddl.orig/usr.bin/Makefile.inc   2009-01-10 07:21:10 +0000
-+++ cddl/usr.bin/Makefile.inc        2009-01-10 07:18:55 +0000
-@@ -1,5 +1,6 @@
- # $FreeBSD: src/cddl/usr.bin/Makefile.inc,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $
- 
- BINDIR?=	/usr/bin
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
- 
- .include "../Makefile.inc"
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-xdr_header.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-xdr_header.patch
deleted file mode 100644
index 0abc08990e30..000000000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-xdr_header.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- sys/cddl/compat/opensolaris/rpc/xdr.h.orig	2007-04-05 22:09:06 -0300
-+++ sys/cddl/compat/opensolaris/rpc/xdr.h	2008-06-22 09:46:28 -0300
-@@ -55,13 +55,6 @@
- 
- #define	XDR_GET_BYTES_AVAIL 1
- 
--struct xdr_bytesrec {
--	bool_t xc_is_last_record;
--	size_t xc_num_avail;
--};
--
--typedef struct xdr_bytesrec xdr_bytesrec;
--
- /*
-  * These are the request arguments to XDR_CONTROL.
-  *
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-7.2.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-7.2.ebuild
deleted file mode 100644
index 7c2b7500a935..000000000000
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-7.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-7.2.ebuild,v 1.4 2013/02/07 01:05:36 naota Exp $
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="build"
-LICENSE="CDDL"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${SYS}.tar.bz2
-		build? ( mirror://gentoo/${INCLUDE}.tar.bz2 )"
-
-# sys is required.
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	=sys-freebsd/freebsd-libexec-${RV}*
-	build? ( sys-apps/baselayout )
-	dev-libs/libedit
-	dev-libs/libelf"
-
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES=( "${FILESDIR}/${PN}-7.1-libpaths.patch" )
-
-pkg_setup() {
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-src_unpack() {
-	freebsd_src_unpack
-	# Link in include headers.
-	ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-	# This patch is against sys.
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-7.1-xdr_header.patch"
-}
-
-src_compile() {
-	freebsd_src_compile
-}
-
-#src_install() {
-#}
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-8.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-8.0.ebuild
deleted file mode 100644
index 6c8cb6e3585e..000000000000
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-8.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-8.0.ebuild,v 1.4 2013/02/07 01:05:36 naota Exp $
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="build"
-LICENSE="CDDL GPL-2"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${SYS}.tar.bz2
-		build? ( mirror://gentoo/${INCLUDE}.tar.bz2 )"
-
-# sys is required.
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	=sys-freebsd/freebsd-libexec-${RV}*
-	build? ( sys-apps/baselayout )
-	dev-libs/libedit
-	dev-libs/libelf"
-
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES=( "${FILESDIR}/${PN}-8.0-libpaths.patch" )
-
-src_unpack() {
-	freebsd_src_unpack
-	# Link in include headers.
-	ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-}
-
-src_install() {
-	freebsd_src_install
-	# Install zfs volinit script.
-	newinitd "${FILESDIR}"/zvol.initd zvol
-}