Remove miscfiles colliding with app-misc/miscfiles and RDEPEND on it

(Portage version: 2.2_rc61/cvs/Linux x86_64)

3 files changed, 117 insertions, 2 deletions

diff --git a/sys-freebsd/freebsd-share/ChangeLog b/sys-freebsd/freebsd-share/ChangeLog
index 1f030a1735a0..045a5119ca41 100644
--- a/sys-freebsd/freebsd-share/ChangeLog
+++ b/sys-freebsd/freebsd-share/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-share
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.33 2009/05/22 16:42:16 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.34 2010/01/07 13:06:40 aballier Exp $
+
+*freebsd-share-7.2-r1 (07 Jan 2010)
+
+  07 Jan 2010; Alexis Ballier <aballier@gentoo.org>
+  +freebsd-share-7.2-r1.ebuild, +files/freebsd-share-gnu-miscfiles.patch:
+  Remove miscfiles colliding with app-misc/miscfiles and RDEPEND on it
 
   22 May 2009; Alexis Ballier <aballier@gentoo.org>
   freebsd-share-7.2.ebuild:
diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-gnu-miscfiles.patch
new file mode 100644
index 000000000000..5b37523d3a3f
--- /dev/null
+++ b/sys-freebsd/freebsd-share/files/freebsd-share-gnu-miscfiles.patch
@@ -0,0 +1,26 @@
+--- share/misc/Makefile.old	2010-01-07 13:39:32 +0100
++++ share/misc/Makefile	2010-01-07 13:39:44 +0100
+@@ -1,9 +1,9 @@
+ #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
+ # $FreeBSD: src/share/misc/Makefile,v 1.26.8.1 2009/04/15 03:14:26 kensmith Exp $
+ 
+-FILES=	ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \
++FILES=	bsd-family-tree committers-doc.dot committers-ports.dot \
+ 	committers-src.dot eqnchar flowers init.ee \
+-	iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \
++	iso3166 iso639 man.template mdoc.template pci_vendors \
+ 	scsi_modes usb_hid_usages
+ NO_OBJ=
+ FILESDIR=	${BINDIR}/misc
+--- share/dict/Makefile.old	2010-01-07 13:39:40 +0100
++++ share/dict/Makefile	2010-01-07 13:39:53 +0100
+@@ -4,8 +4,7 @@
+ NO_OBJ=
+ 
+ # XXX MISSING:	connectives words
+-FILES=		README propernames web2 web2a freebsd
++FILES=		README freebsd
+ FILESDIR=	${BINDIR}/dict
+-SYMLINKS=	web2 ${FILESDIR}/words
+ 
+ .include <bsd.prog.mk>
diff --git a/sys-freebsd/freebsd-share/freebsd-share-7.2-r1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-7.2-r1.ebuild
new file mode 100644
index 000000000000..56e511a67b99
--- /dev/null
+++ b/sys-freebsd/freebsd-share/freebsd-share-7.2-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-7.2-r1.ebuild,v 1.1 2010/01/07 13:06:40 aballier Exp $
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD shared tools/files"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="doc isdn"
+
+SRC_URI="mirror://gentoo/${SHARE}.tar.bz2
+	mirror://gentoo/${CONTRIB}.tar.bz2
+	mirror://gentoo/${GNU}.tar.bz2
+	mirror://gentoo/${UBIN}.tar.bz2
+	mirror://gentoo/${USBIN}.tar.bz2
+	mirror://gentoo/${SBIN}.tar.bz2
+	mirror://gentoo/${BIN}.tar.bz2
+	mirror://gentoo/${LIB}.tar.bz2
+	mirror://gentoo/${ETC}.tar.bz2"
+
+DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*"
+RDEPEND="sys-apps/miscfiles"
+
+RESTRICT="strip"
+
+S="${WORKDIR}/share"
+
+pkg_setup() {
+	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
+	use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
+
+	mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= "
+}
+
+REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
+
+PATCHES=( "${FILESDIR}/${PN}-5.3-doc-locations.patch"
+	"${FILESDIR}/${PN}-5.4-gentoo-skel.patch"
+	"${FILESDIR}/${PN}-gnu-miscfiles.patch" )
+
+src_unpack() {
+	freebsd_src_unpack
+
+	# Remove make.conf manpage as it describes bsdmk's make.conf.
+	sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
+	# Remove mailer.conf manpage
+	sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
+	# Remove pbm and moduli(ssh) manpages
+	sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile"
+	# Remove builtins manpage
+	sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile"
+	# Remove rc manpages
+	sed -i -e '/rc.8/d' "${S}/man/man8/Makefile"
+
+	# Don't install the arch-specific directories in subdirectories
+	sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile
+
+	# Remove them so that they can't be included by error
+	rm -rf "${S}"/mk/*.mk
+
+	# Make proper symlinks by defining the full target.
+	local sdir
+	for sdir in colldef mklocale monetdef msgdef numericdef timedef
+	do
+		sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \
+			"${S}/${sdir}/Makefile" || \
+			die "Error fixing ${sdir}/Makefile"
+	done
+}
+
+src_compile() {
+	export ESED="/usr/bin/sed"
+
+	# This is a groff problem and not a -shared problem.
+	export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/"
+	mkmake || die "emake failed"
+}
+
+src_install() {
+	mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
+}