nicotine+: updating to 1.2.10

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2113 370017ae-e619-0410-ac65-c121f96126d4

7 files changed, 189 insertions, 293 deletions

diff --git a/net/p2p/nicotine+/Manifest b/net/p2p/nicotine+/Manifest
new file mode 100644
index 00000000..5626d787
--- /dev/null
+++ b/net/p2p/nicotine+/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST nicotine+-1.2.10.tar.bz2 3721630 MD5 80f17b222b9bd33acc1ac64f77bef640 RMD160 b85042469b0e232d69b0cbe0c59c09f03fc8cb7a SHA1 f7015caf020a3b42ba45549f7074453bd35bb19f SHA256 ffdbdc699d7e413b18b57bf8fdbe1df83a5e77adb668d6cd2cbd87cdb0b51161 SHA512 339e18fcd350618b14f42f71af3cf6bccb7280c8e361dd2b6af2b4a406ae0e6e1e9a98b84d339e59bdcc15ca5b9d7adb54f3ee6a6d7d90730c9846de1050aa54
+MKBUILD nicotine+.mkbuild 2744 MD5 3aaea22c5e7da26cea926cb03e4497e5 RMD160 3e568f94971b5eb516c1570093609bc30ca358f3 SHA1 cbe3947aeecc1f605006cd3d0ebfd13fd23c3208 SHA256 4cb58ed440cdcdf40a7114c5fa9146407787e145d4f550609d90ea7b65ed04ad SHA512 123f557af9a86e77da28f38ab0bd667b32ae66ec3d5ad91156ee8b26d090ee14d2fe0c1d4f4fa40c6c03f72a13e5eaef080d43c96edb24ca1825b6c0a07beaf2
+SLACKBUILD nicotine+.SlackBuild 6837 MD5 9dbf4efe0bfd938eb726015a234fb78c RMD160 4c2a065ad0e614a74211051d55d2a5a03489530a SHA1 f35baae435a624302791817aeb54fbf101fb9eed SHA256 f74ce90e3f8fbecd826ffecbf38ab065f163eee0ad7e229cb2c01c7becfb622b SHA512 41d5403e00f19ee30fb5336353c2ff0baffbba9e71cb15edc5cf59002a119d1d1c1fedb8888f605364e5fbc7b869924e642b6c334233e17c6c81ef8fcc6062ea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJrHVwAAoJEEHL93ESzgeiVl4QAKQOt1JE4hI2Wu2VImyy9o5b
+uzEVBg/5wRyYOR8QkGlhkjsvbF0pOl5Bzsx5ImVPleQdTHbAbvKHMP58malkpl34
+h8yWOf9Lt4BJSOUDO776nlM1zpkfpj7suY/qK06ZnxFAR1dsUrjnx4UXz3ongfj0
+VaFqare7uLopvpvy33uhPvFCO7lxELCB2/WzA56e9LNzDvzLNfFfkaCRDwpDbOuz
+mUqMylc6gSOj4UHsfauWbc0sD+ljcP9LeapVDEqx2ol9HJD8iNiXofatk+dBvz2+
+AfPljx4MlsMgrpavlz+muecUOFWqrtKgk+Usyb0Lxf97xIyfPlBM6XpE5Hj8ZNL6
+14KHoMJqW7OfmFTX5DNu0gdFtoVi7tMYgIv0yix8ScgdflTxe9/vvCewiDu8j86J
+11dvNBBQYWGxKS2P4yfV+VcfHdYPeiY2Fr3pC7guaUA02+hqkfK0uv11F0K17Ge3
+a6iWZ0wLQzTFaOckfJ3fiF5/I7RQ8NIC1hOTuFhZiO0Pr8xVayMHKIZb8vCy7aiB
+dUHVFKJhaMysW5BftN+UJdbRWrQRUpTfrvEM2xFGqq2bmk/VyV9AGEe6hHjzUsK/
+/80NEXGOm5jKY+Ao9oSTtxmxBO8eFiPgfZj2XQEnqC5DcQdNANWQ7nfGEpg7abNh
+RbQr+TO1037qjxg/Dqc/
+=eu+C
+-----END PGP SIGNATURE-----
diff --git a/net/p2p/nicotine/nicotine.SlackBuild b/net/p2p/nicotine+/nicotine%2B.SlackBuild
index 64cb000a..67ba11e0 100755..100644
--- a/net/p2p/nicotine/nicotine.SlackBuild
+++ b/net/p2p/nicotine+/nicotine%2B.SlackBuild
@@ -1,11 +1,11 @@
 #!/bin/bash
 #
-#  nicotine.SlackBuild is free software; you can redistribute
+#  nicotine%2B.SlackBuild is free software; you can redistribute
 #  it and/or modify it under the terms of the GNU General Public License as
 #  published by the Free Software Foundation; either version 2 of the License,
 #  or any later version.
 #
-#  nicotine.SlackBuild is distributed in the hope that it will
+#  nicotine%2B.SlackBuild is distributed in the hope that it will
 #  be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 #  Public License for more details.
@@ -14,9 +14,10 @@
 #  with this program; if not, write to the Free Software Foundation, Inc.,
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
-# slackbuild for nicotine, by Silvio Rhatto
+# slackbuild for nicotine%2B, by Silvio Rhatto
 # requires:  
-# tested: nicotine-1.0.8
+# tested: nicotine%2B-1.2.10
+# model: generic.mkSlackBuild $Rev: 784 $
 #
 
 # Look for slackbuildrc
@@ -28,10 +29,10 @@ fi
 
 # Set variables
 CWD="$(pwd)"
-SRC_NAME="nicotine"
-PKG_NAME="nicotine"
+SRC_NAME="nicotine%2B"
+PKG_NAME="nicotine%2B"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.0.8}
+SRC_VERSION=${VERSION:=1.2.10}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
@@ -47,9 +48,9 @@ NUMJOBS=${NUMJOBS:=""}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +66,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -78,12 +80,78 @@ mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
 SRC="$SRC_NAME-$VERSION.tar.bz2"
-URL="http://nicotine.thegraveyard.org/$SRC"
+URL="http://www.nicotine-plus.org/files/$SRC"
 
 if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -102,7 +170,7 @@ python setup.py build install --root=$PKG
 )
 
 # Install documentation
-DOCS="CHANGELOG COPYING KNOWN_BUGS MAINTAINERS MANIFEST PKG-INFO README README.import-winconfig TODO TRANSLATORS"
+DOCS="COPYING MANIFEST"
 mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
 for doc in $DOCS; do
   if [ -f "$doc" ]; then
@@ -120,18 +188,18 @@ cat << EODESC > "$PKG/install/slack-desc"
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-        |-----handy-ruler-----------------------------------------------------|
-nicotine: nicotine (soulseek client clone)
-nicotine:
-nicotine: Nicotine is a SoulSeek client written in Python, based on the
-nicotine: PySoulSeek project by Alexander Kanavin. It features, among other
-nicotine: things, a completely rewritten graphical user interface which uses
-nicotine: the PyGTK-2 toolkit and a less strict user request policy.
-nicotine:
-nicotine:
-nicotine:
-nicotine:
-nicotine:
+        %  |-----handy-ruler--------------------------------------------------|
+nicotine+: nicotine+ (soulseek client clone)
+nicotine+:
+nicotine+: Nicotine is a SoulSeek client written in Python, based on the
+nicotine+: PySoulSeek project by Alexander Kanavin. It features, among other
+nicotine+: things, a completely rewritten graphical user interface which uses
+nicotine+: the PyGTK-2 toolkit and a less strict user request policy.
+nicotine+:
+nicotine+: This version is the forked one distributed at
+nicotine+: http://nicotine-plus.sourceforge.net
+nicotine+:
+nicotine+:
 EODESC
 
 # Build the package
@@ -139,6 +207,6 @@ cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/net/p2p/nicotine+/nicotine+.SlackBuild b/net/p2p/nicotine+/nicotine+.SlackBuild
index 3fa17a48..4253c51a 100755
--- a/net/p2p/nicotine+/nicotine+.SlackBuild
+++ b/net/p2p/nicotine+/nicotine+.SlackBuild
@@ -16,7 +16,8 @@
 #
 # slackbuild for nicotine+, by Silvio Rhatto
 # requires:  
-# tested: nicotine+-1.2.9
+# tested: nicotine+-1.2.10
+# model: generic.mkSlackBuild $Rev: 784 $
 #
 
 # Look for slackbuildrc
@@ -31,7 +32,7 @@ CWD="$(pwd)"
 SRC_NAME="nicotine+"
 PKG_NAME="nicotine+"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.2.9}
+SRC_VERSION=${VERSION:=1.2.10}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
@@ -47,9 +48,9 @@ NUMJOBS=${NUMJOBS:=""}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +66,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -78,12 +80,78 @@ mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
 SRC="$SRC_NAME-$VERSION.tar.bz2"
-URL="http://downloads.sourceforge.net/nicotine-plus/$SRC"
+URL="http://www.nicotine-plus.org/files/$SRC"
 
 if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -139,6 +207,6 @@ cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/net/p2p/nicotine/nicotine+.SlackBuild b/net/p2p/nicotine/nicotine+.SlackBuild
deleted file mode 100755
index 16fe1f50..00000000
--- a/net/p2p/nicotine/nicotine+.SlackBuild
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-#
-#  nicotine+.SlackBuild is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU General Public License as published by the Free Software
-#  Foundation; either version 2 of the License, or any later version.
-#
-#  nicotine+.SlackBuild is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-#  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
-#
-# SlackBuild script to call nicotine+.build with correct settings
-#
-
-CWD="`pwd`"
-
-if [ -f ~/.slackbuildrc ]; then
-  source ~/.slackbuildrc
-elif [ -f /etc/slackbuildrc ]; then
-  source /etc/slackbuildrc
-fi
-
-# default settings
-PACKAGE="nicotine+"
-VERSION=${VERSION:=1.2.4.1}
-ARCH="noarch"
-BUILD=${BUILD:=1rha}
-SRC_DIR=${SRC:=$CWD}
-TMP=${TMP:=/tmp}
-REPOS=${REPOS:=$TMP}
-
-rm -rf $TMP/$PACKAGE
-mkdir -p $SRC_DIR/$PACKAGE $TMP/$PACKAGE $REPOS
-
-export PACKAGE VERSION ARCH BUILD SRC_DIR TMP REPOS
-
-if which simpletrack &> /dev/null; then
-  simpletrack $PACKAGE.build
-else
-  slacktrack -b $REPOS -x $TMP,$SRC_DIR,/dev -jefkzp "$PACKAGE-$VERSION-$ARCH-$BUILD.tgz" "./$PACKAGE.build"
-fi
-
-if [ "$CLEANUP" == "yes" ]; then
-  rm -rf $TMP/$PACKAGE
-fi
diff --git a/net/p2p/nicotine/nicotine+.build b/net/p2p/nicotine/nicotine+.build
deleted file mode 100755
index ba3c8f6b..00000000
--- a/net/p2p/nicotine/nicotine+.build
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/bash
-#
-#  nicotine+.build is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU General Public License as published by the Free Software
-#  Foundation; either version 2 of the License, or any later version.
-#
-#  nicotine+.build is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-#  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
-#
-# build script for nicotine+
-# by rhatto at riseup.net
-# build it with slacktrack, example:
-#
-#   slacktrack -jefkzp "nicotine+-1.2.4.1-noarch-1rha.tgz" "./nicotine+.build"
-# 
-
-CWD="`pwd`"
-
-if [ -f "/etc/slackbuildrc" ]; then
-  source /etc/slackbuildrc
-fi
-
-if [ -f "~/.slackbuildrc" ]; then
-  source ~/.slackbuildrc
-fi
-
-# default settings
-PACKAGE="nicotine+"
-VERSION=${VERSION:=1.2.4.1}
-ARCH="noarch"
-BUILD=${BUILD:=1rha}
-SRC_DIR=${SRC:=$CWD}
-TMP=${TMP:=/tmp}
-
-RTOOL="wget"
-PACKAGE_EXT="bz2"
-SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT"
-URL="http://easynews.dl.sourceforge.net/sourceforge/nicotine-plus/$SRC"
-
-SRC_DIR="$SRC_DIR/$PACKAGE"
-
-if [ ! -d "$SRC_DIR" ]; then
-  mkdir -p $SRC_DIR
-fi
-
-if [ "$PACKAGE_EXT" == "bz2" ]; then
-  tarflag="j"
-else
-  tarflag="z"
-fi
-
-if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
-  wget "$URL" -O "$SRC_DIR/$SRC"
-fi
-
-TMP="$TMP/$PACKAGE"
-
-if [ ! -d "$TMP" ]; then
-  mkdir -p $TMP
-fi
-
-cd $TMP
-
-tar xvf$tarflag $SRC_DIR/$SRC
-cd $PACKAGE-$VERSION
-
-python setup.py install --prefix=/usr
-
-CWD="`pwd`"
-
-mkdir /install
-
-cat << EOF > /install/slack-desc
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-         |-----handy-ruler-----------------------------------------------------|
-nicotine+: nicotine+ (soulseek client clone)
-nicotine+:
-nicotine+: Nicotine is a SoulSeek client written in Python, based on the
-nicotine+: PySoulSeek project by Alexander Kanavin. It features, among other
-nicotine+: things, a completely rewritten graphical user interface which uses
-nicotine+: the PyGTK-2 toolkit and a less strict user request policy.
-nicotine+:
-nicotine+: This version is the forked one distributed at
-nicotine+: http://nicotine-plus.sourceforge.net
-nicotine+:
-nicotine+:
-EOF
-
-# docs
-mkdir -p /usr/doc/$PACKAGE-$VERSION
-
-for file in COPYING MANIFEST; do
-  cp $CWD/$file* /usr/doc/$PACKAGE-$VERSION/
-done
-
-cp -R $CWD/docs/* /usr/doc/$PACKAGE-$VERSION/
-
diff --git a/net/p2p/nicotine/nicotine.build b/net/p2p/nicotine/nicotine.build
deleted file mode 100755
index 1a1f17c5..00000000
--- a/net/p2p/nicotine/nicotine.build
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/bash
-#
-#  nicotine.build is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU General Public License as published by the Free Software
-#  Foundation; either version 2 of the License, or any later version.
-#
-#  nicotine.build is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-#  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
-#
-# build script for nicotine
-# by rhatto at riseup.net
-# build it with slacktrack, example:
-#
-#   slacktrack -jefkzp "nicotine-1.2.4.1-noarch-1rha.tgz" "./nicotine.build"
-# 
-
-CWD="`pwd`"
-
-if [ -f "/etc/slackbuildrc" ]; then
-  source /etc/slackbuildrc
-fi
-
-if [ -f "~/.slackbuildrc" ]; then
-  source ~/.slackbuildrc
-fi
-
-# default settings
-PACKAGE="nicotine"
-VERSION=${VERSION:=1.0.8}
-ARCH=${ARCH:=i486}
-BUILD=${BUILD:=1rha}
-SRC_DIR=${SRC:=$CWD}
-TMP=${TMP:=/tmp}
-
-RTOOL="wget"
-PACKAGE_EXT="bz2"
-SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT"
-URL="http://nicotine.thegraveyard.org/$SRC"
-
-SRC_DIR="$SRC_DIR/$PACKAGE"
-
-if [ ! -d "$SRC_DIR" ]; then
-  mkdir -p $SRC_DIR
-fi
-
-if [ "$PACKAGE_EXT" == "bz2" ]; then
-  tarflag="j"
-else
-  tarflag="z"
-fi
-
-if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
-  wget "$URL" -O "$SRC_DIR/$SRC"
-fi
-
-TMP="$TMP/$PACKAGE"
-
-if [ ! -d "$TMP" ]; then
-  mkdir -p $TMP
-fi
-
-cd $TMP
-
-tar xvf$tarflag $SRC_DIR/$SRC
-cd $PACKAGE-$VERSION
-
-python setup.py install --prefix=/usr
-
-CWD="`pwd`"
-
-mkdir /install
-
-cat << EOF > /install/slack-desc
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-        |-----handy-ruler-----------------------------------------------------|
-nicotine: nicotine (soulseek client clone)
-nicotine:
-nicotine: Nicotine is a SoulSeek client written in Python, based on the
-nicotine: PySoulSeek project by Alexander Kanavin. It features, among other
-nicotine: things, a completely rewritten graphical user interface which uses
-nicotine: the PyGTK-2 toolkit and a less strict user request policy.
-nicotine:
-nicotine:
-nicotine:
-nicotine:
-nicotine:
-EOF
-
-# docs
-mkdir -p /usr/doc/$PACKAGE-$VERSION
-
-for file in CHANGELOG COPYING INSTALL KNOWN_BUGS MAINTAINERS MANIFEST PKG-INFO README README.import-winconfig TODO TRANSLATORS; do
-  cp $CWD/$file* /usr/doc/$PACKAGE-$VERSION/
-done
-
diff --git a/net/p2p/nicotine/slack-required b/net/p2p/nicotine/slack-required
deleted file mode 100644
index d01ef22f..00000000
--- a/net/p2p/nicotine/slack-required
+++ /dev/null
@@ -1 +0,0 @@
-pygtk