Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 408351 - net-dns/djbdns: remove unused djbdns-setup
Summary: net-dns/djbdns: remove unused djbdns-setup
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Dane Smith (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-03-15 13:16 UTC by Michael Orlitzky
Modified: 2012-03-24 09:26 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
Rename the -r17 version to 'djbdns-setup' and update ebuilds (bug408351.patch,35.12 KB, patch)
2012-03-15 13:43 UTC, Michael Orlitzky
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Orlitzky gentoo-dev 2012-03-15 13:16:33 UTC
All ebuilds in the tree use djbdns-setup-r17 instead, so we can get rid of the existing djbdns-setup, and rename djbdns-setup-r17 to djbdns-setup.
Comment 1 Michael Orlitzky gentoo-dev 2012-03-15 13:43:00 UTC
Created attachment 305501 [details, diff]
Rename the -r17 version to 'djbdns-setup' and update ebuilds

commit 0655c3a223323eea2cc54d2117b1121032c72357
Author: Michael Orlitzky <michael@orlitzky.com>
Date:   Thu Mar 15 09:35:52 2012 -0400

    Rename files/djbdns-setup-r17 to files/djbdns-setup.
    Update all ebuilds to use the new file path.
    Switch from 'newbin' to 'dobin' now that we don't need to rename.
    Add missing '|| die' statements to the -r23 ebuild.
Comment 2 Markos Chandras (RETIRED) gentoo-dev 2012-03-16 22:48:36 UTC
I don't understand what this bug is about. You also apply tons of other patches which do not seem relevant to this bug
Comment 3 Michael Orlitzky gentoo-dev 2012-03-16 23:50:10 UTC
(In reply to comment #2)
> I don't understand what this bug is about. You also apply tons of other
> patches which do not seem relevant to this bug

None of the ebuilds in the tree use files/djbdns-setup at the moment. They all use djbdns-setup-r17.

This patch just does a `mv djbdns-setup-r17 djbdns-setup` and changes a few lines in the ebuilds to use the new filename. The patch looks ugly, but I was hoping to make it easy to apply for you: it should remove djbdns-setup-r17, update djbdns-setup to be what djbdns-setup-r17 used to.
Comment 4 Markos Chandras (RETIRED) gentoo-dev 2012-03-17 09:21:53 UTC
(In reply to comment #3)
> (In reply to comment #2)
> > I don't understand what this bug is about. You also apply tons of other
> > patches which do not seem relevant to this bug
> 
> None of the ebuilds in the tree use files/djbdns-setup at the moment. They
> all use djbdns-setup-r17.
> 
> This patch just does a `mv djbdns-setup-r17 djbdns-setup` and changes a few
> lines in the ebuilds to use the new filename. The patch looks ugly, but I
> was hoping to make it easy to apply for you: it should remove
> djbdns-setup-r17, update djbdns-setup to be what djbdns-setup-r17 used to.

What ebuilds? The djbdns ebuilds or the reverse dependencies(if any)? Your patch modifies more files than just the djbdns ebuilds. So your patch is not just about the rename.

For example it heavily modifies

--- a/net-dns/djbdns/files/djbdns-setup
+++ b/net-dns/djbdns/files/djbdns-setup

This is not related to the rename purpose of this bug is it?
Comment 5 Michael Orlitzky gentoo-dev 2012-03-17 15:16:40 UTC
(In reply to comment #4)
> 
> What ebuilds? The djbdns ebuilds or the reverse dependencies(if any)? Your
> patch modifies more files than just the djbdns ebuilds. So your patch is not
> just about the rename.
> 
> For example it heavily modifies
> 
> --- a/net-dns/djbdns/files/djbdns-setup
> +++ b/net-dns/djbdns/files/djbdns-setup
> 
> This is not related to the rename purpose of this bug is it?

That's just the way that git created the patch. It tracks content and not filenames (moves, renames, or deletes), so from its point of view, I,

  * Removed everything from djbdns-setup-r17.
  * Heavily modified djbdns-setup to contain what djbdns-setup-r17 used to.

After patching, files/djbdns-setup should match the -r17 one in portage:

  gantu djbdns $ pwd
  /home/mjo/src/overlays/mjo-overlay/net-dns/djbdns
  gantu djbdns $ diff -u files/djbdns-setup \
                         /usr/portage/net-dns/djbdns/files/djbdns-setup-r17 
  gantu djbdns $

Unless I've made some larger mistake, the patch should,

  * Remove everything from djbdns-setup-r17
  * Modify djbdns-setup to contain what djbdns-setup-r17 used to
  * Adjust the filenames in the three ebuilds
  * Switch from using newbin to dobin, since we no longer need to rename djbdns-setup-r17 to djbdns-setup.
  * Add some missing die statements in the -r23 ebuild. This is an unrelated change, but fixes an obvious mistake.
Comment 6 Michael Orlitzky gentoo-dev 2012-03-17 15:18:49 UTC
And if it makes life easier, I do keep my playground public:

  http://michael.orlitzky.com/git/?p=mjo-overlay.git;a=summary
Comment 7 Markos Chandras (RETIRED) gentoo-dev 2012-03-17 15:48:41 UTC
Ok that was not clear to me. I thought that djbdns-setup and djbdns-setup-r17 where the same file.
Comment 8 Markos Chandras (RETIRED) gentoo-dev 2012-03-24 09:26:21 UTC
Thanks. Fixed