From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-858813-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id E7AC358973
for <garchives@archives.gentoo.org>; Fri, 22 Jan 2016 08:16:06 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C684621C002;
Fri, 22 Jan 2016 08:16:04 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 503AE21C002
for <gentoo-commits@lists.gentoo.org>; Fri, 22 Jan 2016 08:16:04 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 23FC1340817
for <gentoo-commits@lists.gentoo.org>; Fri, 22 Jan 2016 08:16:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BA920A91
for <gentoo-commits@lists.gentoo.org>; Fri, 22 Jan 2016 08:15:59 +0000 (UTC)
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" <jlec@gentoo.org>
Message-ID: <1453448964.0bd60f182f3614ae8f4401ca47ad01bdf19d294b.jlec@gentoo>
Subject: [gentoo-commits] proj/sci:master commit in: /
X-VCS-Repository: proj/sci
X-VCS-Files: CONTRIBUTING.md
X-VCS-Directories: /
X-VCS-Committer: jlec
X-VCS-Committer-Name: Justin Lecher
X-VCS-Revision: 0bd60f182f3614ae8f4401ca47ad01bdf19d294b
X-VCS-Branch: master
Date: Fri, 22 Jan 2016 08:15:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 88f448a3-42fd-4d52-a024-6253dca8f4f4
X-Archives-Hash: d476d19d54babeaafd801a5f0857732a
commit: 0bd60f182f3614ae8f4401ca47ad01bdf19d294b
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 07:49:24 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 07:49:24 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=0bd60f18
Update contributing guidelines to match main Gentoo workflow
CONTRIBUTING.md | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 99561d0..f5e81b0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -83,6 +83,10 @@ Once *all* reported problems are resolved, you can commit it
repo-commit "Here we write a comprehensible commit message"
###Push to Github and make a pull request
+In order to facilitate potential reverts of mistakes, we prefer to keep the git history as linear as possible. For this, always rebase your changes on the latest remote changes.
+
+ hub pull --rebase=preserve github master
+
Next we push back the changes in the PACKAGE_NAME branch to our fork and send a pull-request to the overlay maintainers.
hub push YOUR_GITHUB_USER PACKAGE_NAME
@@ -94,6 +98,13 @@ Lastly you need to wait for review comments and the merge of your work. If you f
If you would like to get direct access to the overlay, prove some contribution and ping us via sci@gentoo.org or on irc in #gentoo-science @ freenode. If you would like to become a dev yourself, prove some more contributions and again, contact us. We are always looking for new candidates.
----
+##Ebuild recommendations
+As the Gentoo Science overlay is a constant work-in-progress, we have some recommendations for prospective contributors:
+
+* **Aim for writing EAPI=6 ebuilds.** For certain eclasses, EAPI=6 is not allowed yet. In such cases you may use EAPI=5. We will not accept EAPI<5 ebuilds.
+* **Version bumps should always follow the latest guidelines.** For instance, a version bump of an ebuild that still employs autotools-utils.eclass should be avoided. Instead, drop 'autotools-utils', move to 'autotools' and call `default` followed by `eautoreconf` in src_prepare().
+
+----
##Merging contributions
**It is important, that if you merge a pull request, you should feel as responsible as if you have written the commits yourself!**