gentoo resync : 19.11.2017

4 files changed, 0 insertions, 440 deletions

diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index 9e5310c42d78..58891684e03c 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -1,4 +1,3 @@
-AUX 389-ds-base-1.3.4-no-instance-script.patch 17750 SHA256 696ab70daa41af1eb6d979b39a0166445edc5f1cdf0755ce8e1459e54b38967e SHA512 649245bbd56cd5445470f102500eb5ea5aeb99a395cc6a49fc0f6331c2a77005aef3e01a49344f04bb018b6679ddd43e77f542a88e4bec46b30da4e6d7fa312a WHIRLPOOL a7cc074891fd6b98630aa3ab1bbed2e722cf3472dd73877b38616e5861f07b1784dc98055f1f686e5af48e21bd96776f0e202945dd4d5426a6d59f5fc010bd22
 AUX 389-ds-snmp.initd 960 SHA256 201a8e8ff30195927cb0c3819ac811034f20c811c0ad572e6be0c178954e7b16 SHA512 bb76a068aa5422664c3fc87d5c28124b26d6dbc88cd88856826ae905a4149a6a1d03ec562dcace1cebc6caaa0ca3c6e9346c1af5703d89e1da600df8ca4a4ba8 WHIRLPOOL 1b312091e6591040237eba7c0709b41ea3450360e46c02089173ed62f202e02344a88a6660c39225406987ff60b71fd90b7cf0c46fbaf5a9be589defd85db8bd
 AUX 389-ds.initd-r1 2366 SHA256 51c91af63c089b4b742867554841019201c4e458450ce18125c2035e51f6e11f SHA512 530316eccf25196453a51398b810dc6ca14a9bf6f8e4487cfd42d00df190653a197b1effae357c6d9e5d00cd51e8e7d47092d0ecddf2d71d6fa100b58d19b6d7 WHIRLPOOL 453f9ed6ce784d5818acad0433b3afca649d1e321c42730a0ef365b2dfefbef8ec859c22c6fa84073e0acc1dbe92ed66a6106841b0a4ffbd006f5e393a27f94c
 DIST 389-ds-base-1.3.5.19.tar.bz2 3588794 SHA256 ad55aadd4155cabdb7cc66dbca3bbe43faf865750da01032c9a1f8ed3a2136e4 SHA512 897f59fe23a9d5a784df7a255dc300805c8f00b754d4976f8637a61954ffe2de59da09ee700dc5047b406196deb28e9647ec50c0b06c0d34371a418c126c8b7d WHIRLPOOL 23438cc16c408f633198ee83f9929b01701ab28fef1938ec7c3ea4781815186493be28659c2356b7ef7818457238915e36f3664694a258e55a5e9615c828f803
diff --git a/net-nds/389-ds-base/files/389-ds-base-1.3.4-no-instance-script.patch b/net-nds/389-ds-base/files/389-ds-base-1.3.4-no-instance-script.patch
deleted file mode 100644
index 8af7ad2be452..000000000000
--- a/net-nds/389-ds-base/files/389-ds-base-1.3.4-no-instance-script.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-From 7b75e7a4c60637a86acf6c757f207550294279ef Mon Sep 17 00:00:00 2001
-From: William Brown <wibrown@redhat.com>
-Date: Wed, 28 Oct 2015 14:25:26 +1000
-Subject: [PATCH] Ticket 47840 - add configure option to disable instance
- specific scripts https://fedorahosted.org/389/ticket/47840
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Bug Description:  Now that ​https://fedorahosted.org/389/ticket/528 is
-fixed, the next step is to allow building the server with the instance specific
-scripts disabled.
-
-Fix Description:  Instead of defining a configure option, we provide a new
-option in setup-ds.pl, slapd.InstScriptsEnabled, which defaults to false. All
-new installs of 389 will NOT install with a inst_dir nor the scripts that are in
-that directory.
-
-Additionally, this change fixes setup-ds.pl to correctly use the sbindir scripts
-to start/stop the server instance during installation.
-
-Finally, we add support for setup-ds.pl so that in --update if the inst_dir
-exists, scripts will be updated, but if it does not exist, no action is taken.
-
-In time, we will alter --update to *remove* the scripts within inst_dir during
-the update (We have no way of knowing if a customer has put custom scripts in
-inst_dir)
-
-Example:
-/opt/dirsrv/sbin/setup-ds.pl slapd.InstScriptsEnabled=false
-
-Author: wibrown
-
-Review by: nhosoi (Thanks!)
----
- ldap/admin/src/scripts/DSCreate.pm.in  | 204 +++++++++++++++++++--------------
- ldap/admin/src/scripts/DSUpdate.pm.in  |  12 +-
- ldap/admin/src/scripts/setup-ds.res.in |   1 +
- 3 files changed, 124 insertions(+), 93 deletions(-)
-
-diff --git a/ldap/admin/src/scripts/DSCreate.pm.in b/ldap/admin/src/scripts/DSCreate.pm.in
-index 3ce5a73..6425be4 100644
---- a/ldap/admin/src/scripts/DSCreate.pm.in
-+++ b/ldap/admin/src/scripts/DSCreate.pm.in
-@@ -130,6 +130,15 @@ sub sanityCheckParams {
-         return @errs;
-     }
- 
-+    # We need to make sure this value is lowercase
-+    $inf->{slapd}->{InstScriptsEnabled} = lc $inf->{slapd}->{InstScriptsEnabled};
-+
-+    if ("true" ne $inf->{slapd}->{InstScriptsEnabled} && "false" ne $inf->{slapd}->{InstScriptsEnabled}) {
-+        debug(1, "InstScriptsEnabled is not a valid boolean");
-+        return ('error_invalid_boolean', $inf->{slapd}->{InstScriptsEnabled});
-+    }
-+
-+
-     return ();
- }
- 
-@@ -204,13 +213,17 @@ sub makeDSDirs {
-     my $mode = getMode($inf, 7);
-     my @errs;
- 
-+    my @dsdirs = qw(config_dir schema_dir log_dir lock_dir run_dir tmp_dir cert_dir db_dir ldif_dir bak_dir);
-+    if ($inf->{slapd}->{InstScriptsEnabled} eq "true") {
-+        @dsdirs = qw(inst_dir config_dir schema_dir log_dir lock_dir run_dir tmp_dir cert_dir db_dir ldif_dir bak_dir);
-+    }
-+
-     # These paths are owned by the SuiteSpotGroup
-     # This allows the admin server to run as a different,
-     # more privileged user than the directory server, but
-     # still allows the admin server to manage directory
-     # server files/dirs without being root
--    for my $kw (qw(inst_dir config_dir schema_dir log_dir lock_dir run_dir tmp_dir
--            cert_dir db_dir ldif_dir bak_dir)) {
-+    for my $kw (@dsdirs) {
-         my $dir = $inf->{slapd}->{$kw};
-         @errs = makePaths($dir, $mode, $inf->{General}->{SuiteSpotUserID},
-                           $inf->{General}->{SuiteSpotGroup});
-@@ -262,56 +275,66 @@ sub createInstanceScripts {
-     my $myperl = "!$perlexec";
-     my $mydevnull = (-f "/dev/null" ? " /dev/null " : " NUL ");
- 
--    # determine initconfig_dir
--    my $initconfig_dir = $inf->{slapd}->{initconfig_dir} || get_initconfigdir($inf->{General}->{prefix});
--
--    my %maptable = (
--        "DS-ROOT" => $inf->{General}->{prefix},
--        "SEP" => "/", # works on all platforms
--        "SERVER-NAME" => $inf->{General}->{FullMachineName},
--        "SERVER-PORT" => $inf->{slapd}->{ServerPort},
--        "PERL-EXEC" => $myperl,
--        "DEV-NULL" => $mydevnull,
--        "ROOT-DN" => $inf->{slapd}->{RootDN},
--        "LDIF-DIR" => $inf->{slapd}->{ldif_dir},
--        "SERV-ID" => $inf->{slapd}->{ServerIdentifier},
--        "BAK-DIR" => $inf->{slapd}->{bak_dir},
--        "SERVER-DIR" => $inf->{General}->{ServerRoot},
--        "CONFIG-DIR" => $inf->{slapd}->{config_dir},
--        "INITCONFIG-DIR" => $initconfig_dir,
--        "INST-DIR" => $inf->{slapd}->{inst_dir},
--        "RUN-DIR" => $inf->{slapd}->{run_dir},
--        "PRODUCT-NAME" => "slapd",
--        "SERVERBIN-DIR" => $inf->{slapd}->{sbindir},
--        "DB-DIR" => $inf->{slapd}->{db_dir}
--    );
--
--    my $dir = "$inf->{General}->{prefix}@taskdir@";
--    for my $file (glob("$dir/template-*")) {
--        my $basename = $file;
--        $basename =~ s/^.*template-//;
--        my $destfile = "$inf->{slapd}->{inst_dir}/$basename";
--
--        next if ($skip and -f $destfile); # in skip mode, skip files that already exist
--
--        if (!open(SRC, "< $file")) {
--            return ("error_opening_scripttmpl", $file, $!);
--        }
--        if (!open(DEST, "> $destfile")) {
--            return ("error_opening_scripttmpl", $destfile, $!);
--        }
--        my $contents; # slurp entire file into memory
--        read SRC, $contents, int(-s $file);
--        close(SRC);
--        while (my ($key, $val) = each %maptable) {
--            $contents =~ s/\{\{$key\}\}/$val/g;
--        }
--        print DEST $contents;
--        close(DEST);
--        my @errs = changeOwnerMode($inf, 5, $destfile);
--        if (@errs) {
--            return @errs;
-+    # If we have InstScriptsEnabled, we likely have setup.inf or the argument.
-+    # However, during an upgrade, we need to know if we should upgrade the template files or not.
-+    # For now, the easiest way is to check to if the directory exists, and if is does, we assume we want to upgrade / create the updated scripts.
-+    if ($inf->{slapd}->{InstScriptsEnabled} eq "true" || -d $inf->{slapd}->{inst_dir} ) {
-+        debug(1, "Creating or updating instance directory scripts\n");
-+        # determine initconfig_dir
-+        my $initconfig_dir = $inf->{slapd}->{initconfig_dir} || get_initconfigdir($inf->{General}->{prefix});
-+
-+        my %maptable = (
-+            "DS-ROOT" => $inf->{General}->{prefix},
-+            "SEP" => "/", # works on all platforms
-+            "SERVER-NAME" => $inf->{General}->{FullMachineName},
-+            "SERVER-PORT" => $inf->{slapd}->{ServerPort},
-+            "PERL-EXEC" => $myperl,
-+            "DEV-NULL" => $mydevnull,
-+            "ROOT-DN" => $inf->{slapd}->{RootDN},
-+            "LDIF-DIR" => $inf->{slapd}->{ldif_dir},
-+            "SERV-ID" => $inf->{slapd}->{ServerIdentifier},
-+            "BAK-DIR" => $inf->{slapd}->{bak_dir},
-+            "SERVER-DIR" => $inf->{General}->{ServerRoot},
-+            "CONFIG-DIR" => $inf->{slapd}->{config_dir},
-+            "INITCONFIG-DIR" => $initconfig_dir,
-+            "INST-DIR" => $inf->{slapd}->{inst_dir},
-+            "RUN-DIR" => $inf->{slapd}->{run_dir},
-+            "PRODUCT-NAME" => "slapd",
-+            "SERVERBIN-DIR" => $inf->{slapd}->{sbindir},
-+            "DB-DIR" => $inf->{slapd}->{db_dir}
-+        );
-+
-+
-+        my $dir = "$inf->{General}->{prefix}@taskdir@";
-+        for my $file (glob("$dir/template-*")) {
-+            my $basename = $file;
-+            $basename =~ s/^.*template-//;
-+            my $destfile = "$inf->{slapd}->{inst_dir}/$basename";
-+            debug(1, "$destfile\n");
-+
-+            next if ($skip and -f $destfile); # in skip mode, skip files that already exist
-+
-+            if (!open(SRC, "< $file")) {
-+                return ("error_opening_scripttmpl", $file, $!);
-+            }
-+            if (!open(DEST, "> $destfile")) {
-+                return ("error_opening_scripttmpl", $destfile, $!);
-+            }
-+            my $contents; # slurp entire file into memory
-+            read SRC, $contents, int(-s $file);
-+            close(SRC);
-+            while (my ($key, $val) = each %maptable) {
-+                $contents =~ s/\{\{$key\}\}/$val/g;
-+            }
-+            print DEST $contents;
-+            close(DEST);
-+            my @errs = changeOwnerMode($inf, 5, $destfile);
-+            if (@errs) {
-+                return @errs;
-+            }
-         }
-+    } else {
-+        debug(1, "No instance directory scripts will be updated or created\n");
-     }
- 
-     return ();
-@@ -639,7 +662,7 @@ sub initDatabase {
-         return ();
-     }
- 
--    my $cmd = "$inf->{slapd}->{inst_dir}/ldif2db -n $inf->{slapd}->{ds_bename} -i \'$ldiffile\'";
-+    my $cmd = "$inf->{slapd}->{sbindir}/ldif2db -Z $inf->{slapd}->{ServerIdentifier} -n $inf->{slapd}->{ds_bename} -i \'$ldiffile\'";
-     $? = 0; # clear error condition
-     my $output = `$cmd 2>&1`;
-     my $result = $?;
-@@ -662,7 +685,7 @@ sub startServer {
-     my @errs;
-     # get error log
-     my $errLog = "$inf->{slapd}->{log_dir}/errors";
--    my $startcmd = "$inf->{slapd}->{inst_dir}/start-slapd";
-+    my $startcmd = "$inf->{slapd}->{sbindir}/start-dirsrv $inf->{slapd}->{ServerIdentifier}";
-     if ("@systemdsystemunitdir@" and (getLogin() eq 'root')) {
-         $startcmd = "/bin/systemctl start @package_name@\@$inf->{slapd}->{ServerIdentifier}.service";
-     }
-@@ -875,6 +898,10 @@ sub setDefaults {
-                                                   "@datadir@",
-                                                   $inf->{General}->{prefix});
- 
-+    if (!defined($inf->{slapd}->{InstScriptsEnabled})) {
-+        $inf->{slapd}->{InstScriptsEnabled} = "false";
-+    }
-+
-     if (!defined($inf->{slapd}->{inst_dir})) {
-         $inf->{slapd}->{inst_dir} = "$inf->{General}->{ServerRoot}/slapd-$servid";
-     }
-@@ -975,9 +1002,12 @@ sub updateSelinuxPolicy {
-             system("restorecon -R $localstatedir/lib/@PACKAGE_NAME@");
-         }
- 
-+        my @inst_dirs = qw(config_dir schema_dir log_dir lock_dir run_dir tmp_dir cert_dir db_dir ldif_dir bak_dir);
-+        if ($inf->{slapd}->{InstScriptsEnabled} eq "true") {
-+            @inst_dirs = qw(inst_dir config_dir schema_dir log_dir lock_dir run_dir tmp_dir cert_dir db_dir ldif_dir bak_dir);
-+        }
-         # run restorecon on all instance directories we created
--        for my $kw (qw(inst_dir config_dir schema_dir log_dir lock_dir run_dir tmp_dir
--                cert_dir db_dir ldif_dir bak_dir)) {
-+        for my $kw (@inst_dirs) {
-             my $dir = $inf->{slapd}->{$kw};
-             system("restorecon -R $dir");
-         }
-@@ -1231,14 +1261,14 @@ sub createDSInstance {
- }
- 
- sub stopServer {
--    my $instancedir = shift;
--    my $prog = $instancedir . "/stop-slapd";
-+    my $instance = shift;
-+    my $prog = "@sbindir@/stop-dirsrv";
-     if (-x $prog) {
-         $? = 0;
-         # run the stop command
--        my $output = `$prog 2>&1`;
-+        my $output = `$prog $instance 2>&1`;
-         my $status = $?;
--        debug(3, "stopping server $instancedir returns status $status: output $output\n");
-+        debug(3, "stopping server $instance returns status $status: output $output\n");
-         if ($status) {
-             debug(1,"Warning: Could not stop directory server: status $status: output $output\n");
-             # if the server is not running, that's ok
-@@ -1254,7 +1284,7 @@ sub stopServer {
-         return;
-     }
- 
--    debug(1, "Successfully stopped server $instancedir\n");
-+    debug(1, "Successfully stopped server $instance\n");
-     return 1;
- }
- 
-@@ -1331,23 +1361,16 @@ sub removeDSInstance {
-     $conn->close();
- 
-     # stop the server
--    my $instdir = "";
--    if ($entry) {
--        foreach my $path ( @{$entry->{"nsslapd-instancedir"}} )
--        {
--            if (!stopServer($path)) {
--                if ($force) {
--                    debug(1, "Warning: Could not stop directory server - Error: $! - forcing continue\n");
--                } elsif ($! == ENOENT) { # stop script not found or server not running
--                    debug(1, "Warning: Could not stop directory server: already removed or not running\n");
--                    push @errs, [ 'error_stopping_server', $path, $! ];
--                } else { # real error
--                    debug(1, "Error: Could not stop directory server - aborting - use -f flag to force removal\n");
--                    push @errs, [ 'error_stopping_server', $path, $! ];
--                    return @errs;
--                }
--            }
--            $instdir = $path;
-+    if (!stopServer($inst)) {
-+        if ($force) {
-+            debug(1, "Warning: Could not stop directory server - Error: $! - forcing continue\n");
-+        } elsif ($! == ENOENT) { # stop script not found or server not running
-+            debug(1, "Warning: Could not stop directory server: already removed or not running\n");
-+            push @errs, [ 'error_stopping_server', $inst, $! ];
-+        } else { # real error
-+            debug(1, "Error: Could not stop directory server - aborting - use -f flag to force removal\n");
-+            push @errs, [ 'error_stopping_server', $inst, $! ];
-+            return @errs;
-         }
-     }
- 
-@@ -1363,18 +1386,25 @@ sub removeDSInstance {
-         push @errs, remove_tree($entry, "nsslapd-errorlog", $instname, 1);
-     }
- 
--    # instance dir
--    if ( -d $instdir && $instdir =~ /$instname/ )
--    {
--        # clean up pid files (if any)
--        remove_pidfile("STARTPIDFILE", $inst, $instdir, $instname, $rundir, $product_name);
--        remove_pidfile("PIDFILE", $inst, $instdir, $instname, $rundir, $product_name);
- 
--        my $rc = rmtree($instdir);
--        if ( 0 == $rc )
-+    # instance dir
-+    my $instdir = "";
-+    if ($entry) {
-+        foreach my $instdir ( @{$entry->{"nsslapd-instancedir"}} )
-         {
--            push @errs, [ 'error_removing_path', $instdir, $! ];
--            debug(1, "Warning: $instdir was not removed.  Error: $!\n");
-+            if ( -d $instdir && $instdir =~ /$instname/ )
-+            {
-+                # clean up pid files (if any)
-+                remove_pidfile("STARTPIDFILE", $inst, $instdir, $instname, $rundir, $product_name);
-+                remove_pidfile("PIDFILE", $inst, $instdir, $instname, $rundir, $product_name);
-+
-+                my $rc = rmtree($instdir);
-+                if ( 0 == $rc )
-+                {
-+                    push @errs, [ 'error_removing_path', $instdir, $! ];
-+                    debug(1, "Warning: $instdir was not removed.  Error: $!\n");
-+                }
-+            }
-         }
-     }
-     # Finally, config dir
-diff --git a/ldap/admin/src/scripts/DSUpdate.pm.in b/ldap/admin/src/scripts/DSUpdate.pm.in
-index be1e67c..e84a9a9 100644
---- a/ldap/admin/src/scripts/DSUpdate.pm.in
-+++ b/ldap/admin/src/scripts/DSUpdate.pm.in
-@@ -226,10 +226,10 @@ sub updateDS {
-     for my $upd (@updates) {
-         my @localerrs;
-         if ($upd->{$PRE_STAGE}) {
--            debug(1, "Running stage $PRE_STAGE update ", $upd->{path}, "\n");
-+            debug(1, "Running updateDS stage $PRE_STAGE update ", $upd->{path}, "\n");
-             @localerrs = &{$upd->{$PRE_STAGE}}($inf, $setup->{configdir});
-         } elsif ($upd->{file}) {
--            debug(1, "Running stage $PRE_STAGE update ", $upd->{path}, "\n");
-+            debug(1, "Running updateDS stage $PRE_STAGE update ", $upd->{path}, "\n");
-             @localerrs = processUpdate($upd, $inf, $setup->{configdir}, $PRE_STAGE);
-         }
-         if (@localerrs) {
-@@ -276,10 +276,10 @@ sub updateDS {
-     for my $upd (@updates) {
-         my @localerrs;
-         if ($upd->{$POST_STAGE}) {
--            debug(1, "Running stage $POST_STAGE update ", $upd->{path}, "\n");
-+            debug(1, "Running updateDS stage $POST_STAGE update ", $upd->{path}, "\n");
-             @localerrs = &{$upd->{$POST_STAGE}}($inf, $setup->{configdir});
-         } elsif ($upd->{file}) {
--            debug(1, "Running stage $POST_STAGE update ", $upd->{path}, "\n");
-+            debug(1, "Running updateDS stage $POST_STAGE update ", $upd->{path}, "\n");
-             @localerrs = processUpdate($upd, $inf, $setup->{configdir}, $POST_STAGE);
-         }
-         if (@localerrs) {
-@@ -385,10 +385,10 @@ sub updateDSInstance {
-         for my $upd (@{$updates}) {
-             my @localerrs;
-             if ($upd->{$stage}) {
--                debug(1, "Running stage $stage update ", $upd->{path}, "\n");
-+                debug(1, "Running updateDSInstance stage $stage update ", $upd->{path}, "\n");
-                 @localerrs = &{$upd->{$stage}}($inf, $inst, $dseldif, $conn);
-             } elsif ($upd->{file}) {
--                debug(1, "Running stage $stage update ", $upd->{path}, "\n");
-+                debug(1, "Running updateDSInstance stage $stage update ", $upd->{path}, "\n");
-                 @localerrs = processUpdate($upd, $inf, $configdir, $stage,
-                                            $inst, $dseldif, $conn);
-             }
-diff --git a/ldap/admin/src/scripts/setup-ds.res.in b/ldap/admin/src/scripts/setup-ds.res.in
-index 7134e25..fa37567 100644
---- a/ldap/admin/src/scripts/setup-ds.res.in
-+++ b/ldap/admin/src/scripts/setup-ds.res.in
-@@ -116,6 +116,7 @@ error_creating_file = Could not create file '%s'.  Error: %s\n
- error_copying_file = Could not copy file '%s' to '%s'.  Error: %s\n
- error_enabling_feature = Could not enable the directory server feature '%s'.  Error: %s\n
- error_importing_ldif = Could not import LDIF file '%s'.  Error: %s.  Output: %s\n
-+error_invalid_boolean = Could not convert value '%s' to boolean. Valid values are true or false.\n
- error_starting_server = Could not start the directory server using command '%s'.  The last line from the error log was '%s'.  Error: %s\n
- error_stopping_server = Could not stop the directory server '%s'.  Error: %s\n
- error_missing_userid = The SuiteSpotUserID is missing.  This must be set to valid user\n
--- 
-2.4.3
-
diff --git a/net-nds/yp-tools/Manifest b/net-nds/yp-tools/Manifest
index 387c971e7024..7fd4c18d4f9e 100644
--- a/net-nds/yp-tools/Manifest
+++ b/net-nds/yp-tools/Manifest
@@ -1,8 +1,6 @@
 AUX domainname.service 165 SHA256 905079200c0ec5fb4585a46ba72c432d2246b0c14cf8792b762d8a95f0ef4e0d SHA512 dc6cc79a1e6636f31706901bec45adc479231c883e149748989c038d4a9e2d3b1e15e3ba45ca7276700c68600cf6489b92bc4ada0c8ba630921a6d8cb8368de6 WHIRLPOOL 74ead6f4f5468fe2843d74f16ac5a567a9e2214348e55d3d6d847f3ae8ccbd197c24127782040348c5245c8ac9626e4ebc4bc771919a28a238aa8927025b45fc
 AUX domainname.service.conf 89 SHA256 424a1fadf7387150a30df3eaa19e057f7162aa1d2564da9fd0273e1b7dc50b76 SHA512 529f85f41e8204cc3dda72eb3c94c81443b8aa9f5af1ce4cab4510cbc42da79a4554d223893f0a968afb4476898b8a74ea061f8e9f40518b3066584ea9c7ad6c WHIRLPOOL 5a3d246b48eaa01ef2379f29c3af6724a3c657af8f14cd5aa47aab728448edb70361f1d72f944140e396f6322228fa8249a6ce3c44a6c4e7dba1950d2bf637ed
-DIST yp-tools-2.12.tar.bz2 204228 SHA256 6ae8321666eea7837da343eea90ea30273fb74943ad111d5a4befd2afb252063 SHA512 0b62f63d65c7a53e715fb5749c4a7e71cf85e4006fa5e1ec39290e740301d5a8d321007461bb7a6b3bd1aaac283d8b028fa07814e77bd75e13dfd761f74c9218 WHIRLPOOL b4b89857024cc2aa42e6e9dabea25ea81da641d00fbeb3202cd53e81065384d9b1a685e8e0eed547622f4a0649d625cf3ea35217deef7c19536e120813d5b1c4
 DIST yp-tools-4.2.2.tar.bz2 368673 SHA256 137f19a986382b275bf4a2b1a69eb26689d6f4ac056ddaa21784d6b80eb98faa SHA512 e2856465e650823de87fcf0e7f18c4875b0540f271b3e564b3afe07d0df35dded7f09ecdf2494d099b31a15e098fc5e9065339f19df45c0489ca91a736c3eac9 WHIRLPOOL 9a63839f8d4070e9d7885c3bffab9bebf3557f5d09c9ab0bc0981850239bf3a191aaf7e174a7bc33432d35c8602fffe202c61d63458f1253934f01e3225bc028
-EBUILD yp-tools-2.12-r1.ebuild 920 SHA256 93e8e134ca78e8bdf90b5646d822adca94dd9c6f05a9876f6681fcda9e9ade0a SHA512 a1e9ee126629e868a99f8a8ebd9eda75cea4469266bbcacf5646c4aae32d58d6cbff646088b33dc94236eb59d62576a609a3bf66db1a6b0ec4f0ed8d72593213 WHIRLPOOL bfa59396e08fed4ae826113b2d10eb866a3c0825b41c8b4b9a9dc3a2b5a98943a66e7107e4ee8a0a04284b2161c30f70c37083777a41021c0f268515d3ee479d
 EBUILD yp-tools-4.2.2-r1.ebuild 835 SHA256 3bf0757884f7ecf97b42985fbc6f08f25df826802881f34f4d047eda7070ddc8 SHA512 4abd7395deab57828a0e2fad6e18bcc94814c7bd5fac3e683305c5e0a45e9188e8faa29d078bf66ef9e42623a259e67da2ba267cc1e1dbd9d29f0589ac8d8f98 WHIRLPOOL 49ed0a5af58485441fd69508b08ac87c3e36a32fde31a9122c782385b3e4177513e9e54963e719f9949f7d74a2d291492a4f3b0f3473fc76270b16c43a4c4b2a
 MISC ChangeLog 2589 SHA256 b867cb1cc610dfba847eebfc44429696e59063e2d77ce2135ab68bb6bb8e76a1 SHA512 5f58676a2c271d5b4dbea549df389b1f087389c02190dea214468f7c7af6282e7f06232fe0ecb04eaedbebd6893f007b926e8a6d40b4c761eeaf724e1db8b757 WHIRLPOOL 8d00678265c8a980076aab20813b786f599093a65f334bffd2d709d21adbcb128074b0e952975a48753ee4f3a9b284ab2c7f354981db890a4e480de18711eab0
 MISC ChangeLog-2015 7311 SHA256 13390ce66794dced14e3e088cd1ddd7f0bf9342aa605ad6a0a1aff066c47364a SHA512 e5771cb6ab0d451132d846e9f4a982ecb59def9bf38447a6bb2a0ae240beb869a44659a67cf904c65fa6f7c8d8d3e49b5209cd783ffa89d6c7abbd1a039dd83a WHIRLPOOL c9b15474d08ccb213693c944932868d57db4443e02e6b4222e34331e79a42f4c75c4608a1c00aeaf33a236a432d0185b6db5c7b781827937c537cea06e53e376
diff --git a/net-nds/yp-tools/yp-tools-2.12-r1.ebuild b/net-nds/yp-tools/yp-tools-2.12-r1.ebuild
deleted file mode 100644
index 802461d811e2..000000000000
--- a/net-nds/yp-tools/yp-tools-2.12-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd
-
-DESCRIPTION="Network Information Service tools"
-HOMEPAGE="http://www.linux-nis.org/nis/"
-SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="nls"
-
-src_configure() {
-	local myconf="--sysconfdir=/etc/yp"
-	if ! use nls
-	then
-		myconf="${myconf} --disable-nls"
-		mkdir intl
-		touch intl/libintl.h
-		export CPPFLAGS="${CPPFLAGS} -I${S}"
-
-		for i in lib/nicknames.c src/*.c
-		do
-			cp ${i} ${i}.orig
-			sed 's:<libintl.h>:<intl/libintl.h>:' \
-				${i}.orig > ${i}
-		done
-	fi
-	econf ${myconf}
-}
-
-src_install() {
-	default
-	insinto /etc/yp ; doins etc/nicknames
-	systemd_dounit "${FILESDIR}/domainname.service"
-	systemd_install_serviced "${FILESDIR}"/domainname.service.conf
-}