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 B899958973 for ; Fri, 5 Feb 2016 12:59:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D21621C08F; Fri, 5 Feb 2016 12:59:29 +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 925CA21C08E for ; Fri, 5 Feb 2016 12:59:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 74646340AE4 for ; Fri, 5 Feb 2016 12:59:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73AF5FF9 for ; Fri, 5 Feb 2016 12:59:18 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1454677100.5c0a5524b4261c497346db460eaaecd1499bd015.ulm@gentoo> Subject: [gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/ X-VCS-Repository: proj/devmanual X-VCS-Files: ebuild-maintenance/text.xml X-VCS-Directories: ebuild-maintenance/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 5c0a5524b4261c497346db460eaaecd1499bd015 X-VCS-Branch: master Date: Fri, 5 Feb 2016 12:59:18 +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: 3d398429-3e20-41cb-8bd0-6098976356c1 X-Archives-Hash: 11a058c2c57397471f1bf85cc1389559 commit: 5c0a5524b4261c497346db460eaaecd1499bd015 Author: Gokturk Yuksek binghamton edu> AuthorDate: Thu Feb 4 00:57:39 2016 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Fri Feb 5 12:58:20 2016 +0000 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=5c0a5524 ebuild-maintenance: rewrite the subsection on moving ebuilds for git #558642 Rename the subsection to "moving a package" and rewrite it from scratch. The previous workflow suggested a 2 step process whereas the new one suggests a single git commit to contain all the changes. Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=558642 Signed-off-by: Gokturk Yuksek binghamton.edu> ebuild-maintenance/text.xml | 92 +++++++++++++++++++++++++++++---------------- 1 file changed, 59 insertions(+), 33 deletions(-) diff --git a/ebuild-maintenance/text.xml b/ebuild-maintenance/text.xml index 28442a3..74ef88b 100644 --- a/ebuild-maintenance/text.xml +++ b/ebuild-maintenance/text.xml @@ -290,56 +290,82 @@ to be in very poor taste and may result in disciplinary action.
-Moving ebuilds +Moving a package

-Moving ebuilds is a two-step process: +Moving a package in the tree requires several operations. Firstly, +the package directory needs to be moved to the correct category +using git mv. After this, a new entry needs to be added to +the latest file in profiles/updates/ in the +following format:

-

-Firstly, you need to move the ebuild in CVS. To do this, you should -copy the ebuild to its new location and commit that as you would with -a new ebuild. -

+
+move old-category/package-name new-category/package-name
+

-After this, you should change any ebuilds which DEPEND on the -old ebuild to depend on the new one. After this, should add an entry to the -latest file in profiles/updates/ in the Portage tree in the in -the following format: +Following the update entry, ebuilds that have a +dependency +to this package (in other words, the reverse dependencies of +the package to be moved) need to be updated properly.

-
-move net-misc/fwbuilder net-firewall/fwbuilder
-
-

-This example would transparently move net-misc/fwbuilder to -net-firewall/fwbuilder if users have it installed. This -way, users would now automatically receive updates -for net-firewall/fwbuilder when they are available. +Next is checking the files under profiles/ such as +profiles/package.mask and update them to reflect the ebuild +move. Various eclasses automatically provide some of the dependencies upon +inherit, so the files under eclass/ should be checked and updated +properly as well. Lastly, the titles of the open bugs related to the package +should be updated.

-Once this step is concluded, you are allowed to remove the old package. -Simply issue a cvs remove -Rf $PN in the package category and commit -the changes afterwards with a meaningful commit message. Don't forget to update -entries in files such as profiles/package.mask to reflect the new category. Finally -remember to change the title to open bugs related to this package if needed. +Here is an example where the package +net-misc/fwbuilder is transparently moved to +net-firewall/fwbuilder:

-
-net-misc # cvs rm -Rf fwbuilder
-cvs remove: use `cvs commit' to remove these files permanently
-net-misc # cvs ci -m "Moving net-misc/fwbuilder to net-firewall/fwbuilder."
+
    
+  
  1. Issue git mv net-misc/fwbuilder net-firewall/fwbuilder
    2. 
+  
  2. 
+    
    
+      Add the following entry to the latest file in
+      profile/updates/:
+    
    
+    
    move net-misc/fwbuilder net-firewall/fwbuilder
    
+  
    3. 
+  
  3. Update the reverse dependencies of the package
    4. 
+  
  4. 
+    Update profiles/package.mask and other related files under
+    profiles/
+  
    5. 
+  
  5. Check the eclasses that may be referencing the package
    6. 
+  
  6. 
+    Stage all the changed files using git add. For example: git add
+    profiles/package.mask
+  
    7. 
+  
  7. 
+    Commit all the changes in one commit using: git commit --gpg-sign
+  
    8. 
+  
  8. Update any open bugs related to the package
    9. 
+

+
+

+It is very important to commit all the changes in a single commit to ensure
+that no breakage occurs. The commit message should follow a format similar
+to the following:
+

+
+
+commit d391643289097344a0b18ab2665bb26198a0e3a1
+Author: Guilherme Amadio <amadio@gentoo.org>
+Date:   Tue Nov 3 20:26:52 2015 +0100
+
+  media-fonts/nanumfont: renamed to media-fonts/nanum
 

 
-
-CVS cannot destroy directories: it will simply not re-create them if
-they are blank, providing you use CVS with the -P flag.
-
-