From 0bd2c7bd693f228913ca2fdb5b7a3de2e1fd3d48 Mon Sep 17 00:00:00 2001
From: Daniel Liljeqvist <dasajev@gmail.com>
Date: Tue, 11 May 2010 19:44:54 +0200
Subject: [PATCH] libraries/ORBit2: Updated for version 2.14.5

---
 libraries/ORBit2/ORBit2.SlackBuild | 23 +++++++++++++----------
 libraries/ORBit2/ORBit2.info       |  2 +-
 libraries/ORBit2/README            |  1 -
 libraries/ORBit2/slack-desc        |  8 ++++++++
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/libraries/ORBit2/ORBit2.SlackBuild b/libraries/ORBit2/ORBit2.SlackBuild
index 90584a449a..1fab85cbe6 100644
--- a/libraries/ORBit2/ORBit2.SlackBuild
+++ b/libraries/ORBit2/ORBit2.SlackBuild
@@ -22,12 +22,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-set -e
-
 PRGNAM=ORBit2
 VERSION=2.14.5
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -40,12 +38,14 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -57,13 +57,16 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --disable-static
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING COPYING.LIB ChangeLog HACKING MAINTAINERS NEWS \
-  README* TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING COPYING.LIB ChangeLog HACKING MAINTAINERS NEWS README* \
+  TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+( cd $PKG/usr/doc/$PRGNAM-$VERSION
+  ln -s /usr/share/gtk-doc/html/ORBit2 html
+)
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/libraries/ORBit2/ORBit2.info b/libraries/ORBit2/ORBit2.info
index 903b36b08b..2210f39388 100644
--- a/libraries/ORBit2/ORBit2.info
+++ b/libraries/ORBit2/ORBit2.info
@@ -5,4 +5,4 @@ DOWNLOAD="ftp://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-2.14.5.tar.bz
 MD5SUM="5b3ca3d7ed13a76c9e7bb4a890fe68af"
 MAINTAINER="Daniel Liljeqvist"
 EMAIL="dasajev@gmail.com"
-APPROVED="robw810"
+APPROVED="rworkman"
diff --git a/libraries/ORBit2/README b/libraries/ORBit2/README
index 03e90139b4..29087669df 100644
--- a/libraries/ORBit2/README
+++ b/libraries/ORBit2/README
@@ -5,4 +5,3 @@ of the locations of the two programs.  CORBA is an architecture that
 enables communication between program objects, regardless of the
 programming language they're written in or the operating system they
 run on.
-
diff --git a/libraries/ORBit2/slack-desc b/libraries/ORBit2/slack-desc
index adfd6e5b63..867444e82a 100644
--- a/libraries/ORBit2/slack-desc
+++ b/libraries/ORBit2/slack-desc
@@ -1,3 +1,11 @@
+# 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------------------------------------------------------|
 ORBit2: ORBit2 (CORBA ORB library)
 ORBit2:
 ORBit2: ORBit is a high-performance CORBA (Common Object Request Broker