From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 32900138200 for ; Tue, 11 Sep 2012 17:12:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D0C3E0743; Tue, 11 Sep 2012 17:10:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4FA62E0743 for ; Tue, 11 Sep 2012 17:10:48 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8EA2D33CC98 for ; Tue, 11 Sep 2012 17:10:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9C292E5449 for ; Tue, 11 Sep 2012 17:10:45 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1347382406.60dd40d72e912e3b922a2220b2a39bbee9992f58.aballier@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-share/files/, sys-freebsd/freebsd-share/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: sys-freebsd/freebsd-share/Manifest sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch sys-freebsd/freebsd-share/files/freebsd-share-9.0-gentoowaydir.patch sys-freebsd/freebsd-share/files/freebsd-share-gnu-miscfiles.patch sys-freebsd/freebsd-share/freebsd-share-9.1_rc1.ebuild X-VCS-Directories: sys-freebsd/freebsd-share/files/ sys-freebsd/freebsd-share/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 60dd40d72e912e3b922a2220b2a39bbee9992f58 X-VCS-Branch: master Date: Tue, 11 Sep 2012 17:10:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5e24fe52-62c3-4626-987e-79efe9afd688 X-Archives-Hash: ccb54e1be8272aff3d1caa0813b09305 commit: 60dd40d72e912e3b922a2220b2a39bbee9992f58 Author: Alexis Ballier gentoo org> AuthorDate: Tue Sep 11 16:53:26 2012 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Tue Sep 11 16:53:26 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=60dd40d7 remove freebsd-share, merged to the main tree --- sys-freebsd/freebsd-share/Manifest | 15 --- .../files/freebsd-share-5.3-doc-locations.patch | 20 ---- .../files/freebsd-share-5.4-gentoo-skel.patch | 20 ---- .../files/freebsd-share-8.0-gnu-miscfiles.patch | 26 ------ .../files/freebsd-share-9.0-gentoowaydir.patch | 16 ---- .../files/freebsd-share-gnu-miscfiles.patch | 26 ------ .../freebsd-share/freebsd-share-9.1_rc1.ebuild | 92 -------------------- 7 files changed, 0 insertions(+), 215 deletions(-) diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest deleted file mode 100644 index 6d5a44e..0000000 --- a/sys-freebsd/freebsd-share/Manifest +++ /dev/null @@ -1,15 +0,0 @@ -AUX freebsd-share-5.3-doc-locations.patch 608 RMD160 62c5b4b8cfe410c41bab4b64e4c47828512a8595 SHA1 008a437fa805bea1666f642fc4c6ba9399c93a1c SHA256 d949e9081a181ab9443a18e56949905a77eff2cbd16d09d37b8abb5771cee3b6 -AUX freebsd-share-5.4-gentoo-skel.patch 621 RMD160 52351bb7b714bb458304d8547c7b113fce622d2e SHA1 4b924b94d653a4675914a7267e1a42178953b01a SHA256 5480127971c2a5df5faf44355d5ed6a8586923577d37e6cff10805626726c767 -AUX freebsd-share-8.0-gnu-miscfiles.patch 858 RMD160 7e6a7fd500d65bb3ecafe10a18c91377ef894685 SHA1 d3c7ed64c47f5a70c47b922a699304c4cbb74391 SHA256 20b3761bd18d4ff8e7257ab006f9c23b99473809c138c44145e25832e0c79855 -AUX freebsd-share-9.0-gentoowaydir.patch 314 RMD160 474bee4a3c020ed2d067945f19cba46dc6eaacc0 SHA1 e790db5da46d14f6486a7b0b2f055fcdad3fea6a SHA256 68ddc9d6d95c95fc295f3ed3f7d7562de01ff6894b002bd7455d2da72cf4e2f2 -AUX freebsd-share-gnu-miscfiles.patch 962 RMD160 08c81ba5cc6f1853179ba272efbd2ecd32480070 SHA1 91ec2e1362c00554f7aa7df17d304a1b674547dc SHA256 97218d3e62fda9515d275549f5ce2e8220a62807de355f249b0f6e65860aaa82 -DIST freebsd-bin-9.1_rc1.tar.bz2 388709 RMD160 e9dff7716f552875dcb51653e963f7408faf3785 SHA1 b8fe1ceea88a4896e2412f30f960315521ccef75 SHA256 94b9261f042a6350a28f792c235f95c006813944dd8cebca1e793e3a31b7043a -DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d -DIST freebsd-etc-9.1_rc1.tar.bz2 205627 RMD160 dc9c4914ad9f76a1166d338bb550e2b55cc3a1e9 SHA1 faff7e4847dbb99dee1e6ab5c511f6244ee57058 SHA256 ac84b97965a359744b5171078476e4b5f024faaf13d61ebe2f8c43d2ea70c77b -DIST freebsd-gnu-9.1_rc1.tar.bz2 802034 RMD160 663b9e12ef05446be9f465dea292267745c94124 SHA1 9628e7a6f11c7f1dc3a4efa275d9a9515cb4619a SHA256 00bebcad9d87f06b0b33a1eac62d2345d258f47fca2b8aaba3b955c70d40e985 -DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12 -DIST freebsd-sbin-9.1_rc1.tar.bz2 1275480 RMD160 35c59e08d21e0c500203962717ee5f86654dc303 SHA1 11102237cbb7c5e8ad0f71722287aefa0dd12f0b SHA256 dd97eb984cfc28d8b385c1adfaf6345b04629c7ec64e0b2967500f89dff15e52 -DIST freebsd-share-9.1_rc1.tar.bz2 6670560 RMD160 d2af901ff0aa70932d9ec2b6a31e9e25d2f560b2 SHA1 b685efb2b6019f7de941aa138eef0f6765674753 SHA256 b7d577784ae21f6e95b1f8e8befbdde4afa1f4e7e8cb209b055eaffabd315c75 -DIST freebsd-ubin-9.1_rc1.tar.bz2 1905717 RMD160 9c5a16d07f1cd94e04509426b5cbc7d913256829 SHA1 9e462bfca4d42c694b014f7e62756c5039120931 SHA256 0e79a1e1619915b29f01f3d63393330ab74717e5e7abb290803819db455a4979 -DIST freebsd-usbin-9.1_rc1.tar.bz2 2682082 RMD160 2b0286fc1fdc0e7cdf28bce44b30bc8e1e0e8dfc SHA1 5e172d3b02f632dbeab71fd2e2ba466c39c6a387 SHA256 81db21415611ed6ee0400e901e77bb7eaac9450ba06848f2e0c4d2cd8b695164 -EBUILD freebsd-share-9.1_rc1.ebuild 2728 RMD160 82eafc8193369af976558aedf3f772ca3dd24106 SHA1 1bca14da32d5779a7edb91b3d9525822077242b9 SHA256 5cc1bb2c2b4f75f1429842e570f4d489f803747a73dff558451b70f5347f4008 diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch b/sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch deleted file mode 100644 index c0798d3..0000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- examples/smbfs/Makefile.orig Tue Mar 22 15:20:20 2005 -+++ examples/smbfs/Makefile Tue Mar 22 15:20:46 2005 -@@ -2,6 +2,7 @@ - - NOOBJ= - BINDIR= /usr/share/examples/smbfs -+FILESDIR= ${DOCDIR}/smbfs - FILES= dot.nsmbrc - - .PATH: ${.CURDIR}/../../../contrib/smbfs/examples ---- examples/smbfs/print/Makefile.orig Tue Mar 22 15:22:17 2005 -+++ examples/smbfs/print/Makefile Tue Mar 22 15:22:35 2005 -@@ -2,6 +2,7 @@ - - NOOBJ= - BINDIR= /usr/share/examples/smbfs/print -+FILESDIR= ${DOCDIR}/smbfs/print - FILES= lj6l ljspool printcap.sample tolj - - .PATH: ${.CURDIR}/../../../../contrib/smbfs/examples/print diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch b/sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch deleted file mode 100644 index f668d04..0000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: fbsd/share/skel/Makefile -=================================================================== ---- fbsd.orig/share/skel/Makefile -+++ fbsd/share/skel/Makefile -@@ -2,11 +2,11 @@ - # $FreeBSD: src/share/skel/Makefile,v 1.9.2.1 2005/02/13 07:23:30 obrien Exp $ - - FILESGROUPS= FILES1 FILES2 --FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \ -+FILES1= dot.login_conf dot.mailrc \ - dot.shrc --FILES2= dot.mail_aliases dot.rhosts --FILES1DIR= /usr/share/skel --FILES2DIR= /usr/share/skel -+FILES2= dot.mail_aliases -+FILES1DIR= /etc/skel -+FILES2DIR= /etc/skel - FILES1MODE= 0644 - FILES2MODE= 0600 - NOOBJ= diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch deleted file mode 100644 index 19167a6..0000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- share/misc/Makefile.old 2010-03-12 01:32:39 +0100 -+++ share/misc/Makefile 2010-03-12 01:33:25 +0100 -@@ -3,9 +3,9 @@ - - .PATH: ${.CURDIR}/../../sys/dev/usb - --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 usbdevs - - NO_OBJ= ---- share/dict/Makefile.old 2010-03-12 01:33:53 +0100 -+++ share/dict/Makefile 2010-03-12 01:34:18 +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 diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-9.0-gentoowaydir.patch b/sys-freebsd/freebsd-share/files/freebsd-share-9.0-gentoowaydir.patch deleted file mode 100644 index f299051..0000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-9.0-gentoowaydir.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nur etc.orig/mtree/BSD.usr.dist etc/mtree/BSD.usr.dist ---- etc.orig/mtree/BSD.usr.dist 2012-01-03 12:26:10.000000000 +0900 -+++ etc/mtree/BSD.usr.dist 2012-01-27 21:50:47.941466067 +0900 -@@ -25,12 +25,6 @@ - i18n - .. - .. -- lib32 -- dtrace -- .. -- i18n -- .. -- .. - libdata - gcc - .. diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-gnu-miscfiles.patch deleted file mode 100644 index 5b37523..0000000 --- a/sys-freebsd/freebsd-share/files/freebsd-share-gnu-miscfiles.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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 diff --git a/sys-freebsd/freebsd-share/freebsd-share-9.1_rc1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.1_rc1.ebuild deleted file mode 100644 index 298c4e3..0000000 --- a/sys-freebsd/freebsd-share/freebsd-share-9.1_rc1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit bsdmk freebsd - -DESCRIPTION="FreeBSD shared tools/files" -SLOT="0" -KEYWORDS="~amd64-fbsd ~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}* - =sys-freebsd/freebsd-sources-${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}-8.0-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 rc.conf manpage as it describes bsd's rc.conf. - sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile" - sed -i -e 's:\brc.conf.local.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 - ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "failed to set sys symlink" - - # see Bug 408595 - cd "${WORKDIR}" - epatch "${FILESDIR}"/${PN}-9.0-gentoowaydir.patch -} - -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" -}