no need collision protect inside ebuild any more, breaks binary packages (bug #300139)

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 60 insertions, 13 deletions

diff --git a/net-ftp/ftpbase/ChangeLog b/net-ftp/ftpbase/ChangeLog
index b8c7d495eaa1..1a9a71c73d1f 100644
--- a/net-ftp/ftpbase/ChangeLog
+++ b/net-ftp/ftpbase/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/ftpbase
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ChangeLog,v 1.22 2008/05/24 13:41:08 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ChangeLog,v 1.23 2010/04/26 09:54:43 haubi Exp $
+
+*ftpbase-0.01-r2 (26 Apr 2010)
+
+  26 Apr 2010; Michael Haubenwallner <haubi@gentoo.org>
+  +ftpbase-0.01-r2.ebuild:
+  no need collision protect inside ebuild any more, breaks binary packages
+  (bug #300139)
 
   24 May 2008; Markus Meier <maekke@gentoo.org> ftpbase-0.01-r1.ebuild:
   amd64 stable, bug #222151
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index 3b460832d9ed..c7ba9f02dd67 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ftp-pamd 807 RMD160 1dce921bb3045aca3f4d57f4bc70f804f49d91cb SHA1 f793dda67863e70ae943a1dc56dc094b9423cb93 SHA256 c378eaaa16ca300bb828256d68807cf6f84751ae3ef9192186cf16bef89076dc
 AUX ftp-pamd-include 747 RMD160 086aa9c0e1b0f23f8792a9da32038efc1a92cf7a SHA1 b6ef4ae821e30acff6827ed6054f6467013e57c2 SHA256 b6194c655619343e5908517a50a615b1b028181ea09280ec87dea23f6c10e9a6
 AUX ftpusers 407 RMD160 46a48b5ab2c51b4062b62a424bd88a244bb08445 SHA1 d814dedf066e0e2233b1c44fff2e5c4f8f66a1ef SHA256 34360cd3a4700e8c03aa08d1a5c3f217bb58b5e935950e14868f5ff8d32e52bc
 EBUILD ftpbase-0.00.ebuild 2296 RMD160 7f5ec5f806e07d07ed059e116eb384e75ddddf70 SHA1 a6a79d1c06625ced2ed0cc78d19b7f57e7eaf218 SHA256 3bea086ac6e183219be377547b4844e0dd64b4c947ce011e63ee55203bd87db5
 EBUILD ftpbase-0.01-r1.ebuild 2168 RMD160 39742a3aed1dda5e90b13f0d069e6c048c182474 SHA1 f802d918f078a0275a60f97b40c35fea57202243 SHA256 0f20e39e748d4cbf8c3e529c8676dce3bb12222340e012db534f7dcbed89cd7e
+EBUILD ftpbase-0.01-r2.ebuild 1360 RMD160 a8fd257d7c801b81b2474552748c249326dffdc3 SHA1 518dae86680b8176d001868e00af073db2796d21 SHA256 65f5f6ee83ba31f4749f9cdb8a6a2573c5efe945701139a06106760578b3817c
 EBUILD ftpbase-0.01.ebuild 2307 RMD160 6e5f93d84b6a254fbbabe53a572de21e659b3276 SHA1 2578fa72e7d981139389cdc35027ec2a4825edcf SHA256 b5c49ccebc6bd967fe8e7c4ba36f39c7769f083ba84161fe1c7f2f697146351e
-MISC ChangeLog 3251 RMD160 0b87e742bbc19e2f57181fb202c225d2dcad9956 SHA1 9fe933c869d84d3806757cb86e835a35536de368 SHA256 b9767d29d8685d1df1500d0726bf19aafb64c5bc5c4b5737e6c1ed0f5cdcaa67
+MISC ChangeLog 3457 RMD160 11309eae55782748388e28261735feda21cd97fd SHA1 65586e5fa03043a9af3571ada305d1beab25e831 SHA256 a831eefb853b99a7cc8f4d402df2d4b5b07e9fb4b3e5d751711a3d6472a8a018
 MISC metadata.xml 304 RMD160 beebe43c38b7f732ba4e6c3342b21f32199754a8 SHA1 95da89a8ef677e561f97a2e5b70ffe959e94a307 SHA256 3da1224f2d247795716debc8ef84ed8216f546d3576db1c09f0c2cf11a5b7df3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkSVzYACgkQ67wieSYcaxeN0QCePy/rfG7LPrl/OSwYp/vbtLRj
-2VIAoJl4dgVsTDLjewfU1A76B462n6XN
-=rANP
------END PGP SIGNATURE-----
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r2.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r2.ebuild
new file mode 100644
index 000000000000..529427966f71
--- /dev/null
+++ b/net-ftp/ftpbase/ftpbase-0.01-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ftpbase-0.01-r2.ebuild,v 1.1 2010/04/26 09:54:43 haubi Exp $
+
+inherit eutils pam
+
+DESCRIPTION="FTP layout package"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="pam"
+
+DEPEND="pam? ( virtual/pam )
+	!<net-ftp/proftpd-1.2.10-r6
+	!<net-ftp/pure-ftpd-1.0.20-r2
+	!<net-ftp/vsftpd-2.0.3-r1"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# Check if home exists
+	local exists=false
+	[[ -d "${ROOT}home/ftp" ]] && exists=true
+
+	# Add our default ftp user
+	enewgroup ftp 21
+	enewuser ftp 21 -1 /home/ftp ftp
+
+	# If home did not exist and does now then we created it in the enewuser
+	# command. Now we have to change it's permissions to something sane.
+	if [[ ${exists} == "false" && -d "${ROOT}home/ftp" ]] ; then
+		chown root:ftp "${ROOT}"home/ftp
+	fi
+}
+
+src_install() {
+	# The ftpusers file is a list of people who are NOT allowed
+	# to use the ftp service.
+	insinto /etc
+	doins "${FILESDIR}/ftpusers" || die
+
+	# Ideally we would create the home directory here with a dodir.
+	# But we cannot until bug #9849 is solved - so we kludge in pkg_postinst()
+
+	newpamd "${FILESDIR}/ftp-pamd-include" ftp
+}