Revision: 2164
Author: evermind
Date: 2012-06-30 10:15:58 +0200 (Sat, 30 Jun 2012)
Log Message:
-----------
do not use internal unpacker eclass
Modified Paths:
--------------
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/ChangeLog
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/Manifest
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.1.ebuild
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.2.ebuild
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.3.ebuild
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.4.ebuild
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.5.ebuild
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.6.ebuild
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.7.ebuild
trunk/overlays/proaudio/media-libs/zynaddsubfx-extras/ChangeLog
trunk/overlays/proaudio/media-libs/zynaddsubfx-extras/Manifest
trunk/overlays/proaudio/media-libs/zynaddsubfx-extras/zynaddsubfx-extras-99999999.ebuild
trunk/overlays/proaudio/media-sound/zynaddsubfx-converter/ChangeLog
trunk/overlays/proaudio/media-sound/zynaddsubfx-converter/Manifest
trunk/overlays/proaudio/media-sound/zynaddsubfx-converter/zynaddsubfx-converter-2.0.0_pre2.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/eclass/unpacker-old.eclass
Removed Paths:
-------------
trunk/overlays/proaudio/eclass/unpacker.eclass
Copied: trunk/overlays/proaudio/eclass/unpacker-old.eclass (from rev 2163,
trunk/overlays/proaudio/eclass/unpacker.eclass)
===================================================================
--- trunk/overlays/proaudio/eclass/unpacker-old.eclass
(rev 0)
+++ trunk/overlays/proaudio/eclass/unpacker-old.eclass 2012-06-30 08:15:58 UTC
(rev 2164)
@@ -0,0 +1,116 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+#
+# Original Author: evermind
+# Purpose: unpack everything no matter where it comes from
+# Obsolete: 20120630 -- some cross compiler problems
+
+
+# adjusted unpack() version from ebuild.sh 4048 2006-07-29 18:20:13Z zmedico
+
+
+# syntax:
+# unpacker_old "archive_1" "archive_2" archive_n"
+# to set the location to where the unpack action should take place
+# specify UNPACK_DESTDIR in your ebuild (missing dirs will be created)
+unpacker_old() {
+ local x
+ local y
+ local myfail
+ local tarvars
+
+ if [ "$USERLAND" == "BSD" ]; then
+ tarvars=""
+ else
+ tarvars="--no-same-owner"
+ fi
+
+ [ -z "$*" ] && die "Nothing passed to the 'unpack' command"
+
+ for x in "$@"; do
+ # default unpack path to ${WORKDIR}
+ [ -z "${UNPACK_DESTDIR}" ] && UNPACK_DESTDIR="${WORKDIR}"
+ vecho ">>> Unpacking ${x} to ${UNPACK_DESTDIR}"
+ y=${x%.*}
+ y=${y##*.}
+
+ myfail="${x} does not exist"
+ if [ "${x:0:2}" = "./" ] ; then
+ srcdir=""
+ else
+ srcdir="${DISTDIR}/"
+ fi
+
+ z="${x##*/}"
+
+ [ "${x}" == "${z}" ] && local cur_path="`pwd`/"
+ [ ! -s "${srcdir}${z}" ] && ln -s ${cur_path}${x}
"${srcdir}${z}"
+ #eerror "ln -s ${lol}${x} "${srcdir}${z}""
+ [[ ${x} == ${DISTDIR}* ]] && \
+ die "Arguments to unpack() should not begin with
\${DISTDIR}."
+ [ ! -s "${srcdir}${z}" ] && die "$myfail"
+
+
+ [ ! -e "${UNPACK_DESTDIR}" ] && [ ! -z "${UNPACK_DESTDIR}" ] &&
\
+ mkdir -p "${UNPACK_DESTDIR}"
+ [ -e "${UNPACK_DESTDIR}" ] && [ ! -z "${UNPACK_DESTDIR}" ] && \
+ cd "${UNPACK_DESTDIR}"
+
+ myfail="failure unpacking ${x}"
+ case "${x##*.}" in
+ tar|h2drumkit)
+ tar xf "${srcdir}${z}" ${tarvars} || die
"$myfail"
+ ;;
+ tgz)
+ tar xzf "${srcdir}${z}" ${tarvars} || die
"$myfail"
+ ;;
+ tbz|tbz2)
+ bzip2 -dc "${srcdir}${z}" | tar xf - ${tarvars}
+ assert "$myfail"
+ ;;
+ ZIP|zip|jar)
+ unzip -qo "${srcdir}${z}" || die "$myfail"
+ ;;
+ gz|Z|z)
+ if [ "${y}" == "tar" ]; then
+ tar zxf "${srcdir}${z}" ${tarvars} ||
die "$myfail"
+ else
+ gzip -dc "${srcdir}${z}" > ${x%.*} ||
die "$myfail"
+ fi
+ ;;
+ bz2|bz)
+ if [ "${y}" == "tar" ]; then
+ bzip2 -dc "${srcdir}${z}" | tar xf -
${tarvars}
+ assert "$myfail"
+ else
+ bzip2 -dc "${srcdir}${z}" > ${x%.*} ||
die "$myfail"
+ fi
+ ;;
+ 7Z|7z)
+ local my_output
+ my_output="$(7z x -y "${srcdir}/${z}")"
+ if [ $? -ne 0 ]; then
+ echo "${my_output}" >&2
+ die "$myfail"
+ fi
+ ;;
+ RAR|rar)
+ unrar x -idq "${srcdir}/${z}" || die "$myfail"
+ ;;
+ LHa|LHA|lha|lzh)
+ lha xqf "${srcdir}/${z}" || die "$myfail"
+ ;;
+ a|deb)
+ ar x "${srcdir}/${z}" || die "$myfail"
+ ;;
+ *)
+ vecho "unpack ${x}: file format not recognized.
Ignoring."
+ ;;
+ esac
+ chmod -Rf a+rX,u+w,g-w,o-w .
+ cd - &>/dev/null
+ done
+
+}
Deleted: trunk/overlays/proaudio/eclass/unpacker.eclass
===================================================================
--- trunk/overlays/proaudio/eclass/unpacker.eclass 2012-06-25 21:57:56 UTC
(rev 2163)
+++ trunk/overlays/proaudio/eclass/unpacker.eclass 2012-06-30 08:15:58 UTC
(rev 2164)
@@ -1,115 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-#
-# Original Author: evermind
-# Purpose: unpack everything no matter where it comes from
-
-
-# adjusted unpack() version from ebuild.sh 4048 2006-07-29 18:20:13Z zmedico
-
-
-# syntax:
-# unpacker "archive_1" "archive_2" archive_n"
-# to set the location to where the unpack action should take place
-# specify UNPACK_DESTDIR in your ebuild (missing dirs will be created)
-unpacker() {
- local x
- local y
- local myfail
- local tarvars
-
- if [ "$USERLAND" == "BSD" ]; then
- tarvars=""
- else
- tarvars="--no-same-owner"
- fi
-
- [ -z "$*" ] && die "Nothing passed to the 'unpack' command"
-
- for x in "$@"; do
- # default unpack path to ${WORKDIR}
- [ -z "${UNPACK_DESTDIR}" ] && UNPACK_DESTDIR="${WORKDIR}"
- vecho ">>> Unpacking ${x} to ${UNPACK_DESTDIR}"
- y=${x%.*}
- y=${y##*.}
-
- myfail="${x} does not exist"
- if [ "${x:0:2}" = "./" ] ; then
- srcdir=""
- else
- srcdir="${DISTDIR}/"
- fi
-
- z="${x##*/}"
-
- [ "${x}" == "${z}" ] && local cur_path="`pwd`/"
- [ ! -s "${srcdir}${z}" ] && ln -s ${cur_path}${x}
"${srcdir}${z}"
- #eerror "ln -s ${lol}${x} "${srcdir}${z}""
- [[ ${x} == ${DISTDIR}* ]] && \
- die "Arguments to unpack() should not begin with
\${DISTDIR}."
- [ ! -s "${srcdir}${z}" ] && die "$myfail"
-
-
- [ ! -e "${UNPACK_DESTDIR}" ] && [ ! -z "${UNPACK_DESTDIR}" ] &&
\
- mkdir -p "${UNPACK_DESTDIR}"
- [ -e "${UNPACK_DESTDIR}" ] && [ ! -z "${UNPACK_DESTDIR}" ] && \
- cd "${UNPACK_DESTDIR}"
-
- myfail="failure unpacking ${x}"
- case "${x##*.}" in
- tar|h2drumkit)
- tar xf "${srcdir}${z}" ${tarvars} || die
"$myfail"
- ;;
- tgz)
- tar xzf "${srcdir}${z}" ${tarvars} || die
"$myfail"
- ;;
- tbz|tbz2)
- bzip2 -dc "${srcdir}${z}" | tar xf - ${tarvars}
- assert "$myfail"
- ;;
- ZIP|zip|jar)
- unzip -qo "${srcdir}${z}" || die "$myfail"
- ;;
- gz|Z|z)
- if [ "${y}" == "tar" ]; then
- tar zxf "${srcdir}${z}" ${tarvars} ||
die "$myfail"
- else
- gzip -dc "${srcdir}${z}" > ${x%.*} ||
die "$myfail"
- fi
- ;;
- bz2|bz)
- if [ "${y}" == "tar" ]; then
- bzip2 -dc "${srcdir}${z}" | tar xf -
${tarvars}
- assert "$myfail"
- else
- bzip2 -dc "${srcdir}${z}" > ${x%.*} ||
die "$myfail"
- fi
- ;;
- 7Z|7z)
- local my_output
- my_output="$(7z x -y "${srcdir}/${z}")"
- if [ $? -ne 0 ]; then
- echo "${my_output}" >&2
- die "$myfail"
- fi
- ;;
- RAR|rar)
- unrar x -idq "${srcdir}/${z}" || die "$myfail"
- ;;
- LHa|LHA|lha|lzh)
- lha xqf "${srcdir}/${z}" || die "$myfail"
- ;;
- a|deb)
- ar x "${srcdir}/${z}" || die "$myfail"
- ;;
- *)
- vecho "unpack ${x}: file format not recognized.
Ignoring."
- ;;
- esac
- chmod -Rf a+rX,u+w,g-w,o-w .
- cd - &>/dev/null
- done
-
-}
Modified: trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/ChangeLog
2012-06-25 21:57:56 UTC (rev 2163)
+++ trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/ChangeLog
2012-06-30 08:15:58 UTC (rev 2164)
@@ -1,7 +1,14 @@
# ChangeLog for media-libs/zynaddsubfx-collection
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 30 Jun 2012; Frieder Buerzele <[email protected]>
+ zynaddsubfx-collection-0.1.ebuild, zynaddsubfx-collection-0.2.ebuild,
+ zynaddsubfx-collection-0.3.ebuild, zynaddsubfx-collection-0.4.ebuild,
+ zynaddsubfx-collection-0.5.ebuild, zynaddsubfx-collection-0.6.ebuild,
+ zynaddsubfx-collection-0.7.ebuild:
+ remove usage of own eclass unpacker() function
+
04 Mar 2011; Frieder Buerzele <[email protected]>
zynaddsubfx-collection-0.1.ebuild, zynaddsubfx-collection-0.2.ebuild,
zynaddsubfx-collection-0.3.ebuild, zynaddsubfx-collection-0.4.ebuild,
Modified: trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/Manifest
2012-06-25 21:57:56 UTC (rev 2163)
+++ trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/Manifest
2012-06-30 08:15:58 UTC (rev 2164)
@@ -5,12 +5,12 @@
DIST zynaddsubfx-collection-0.5.tar.gz 325212 RMD160
0d4f4467fd5b1281f8aa134ec37d8ed997a4786e SHA1
8a98f9415629e5038e88103048b9e29bc1d4980b SHA256
83b5f16c38621e50034ce45e94aafdbc7ef50fec79eaad96f7e9ed0a182ed388
DIST zynaddsubfx-collection-0.6.tar.gz 336572 RMD160
2a8f32048a5bbeb2cbc7ae4b5665e0b43d2ca0fb SHA1
e490cc6782393017fcadf14a631e88061ff2f4b1 SHA256
66741abd72d8d0514a5f3378a5cd46b65d4b90e11719ddd0e410db3d09a2936a
DIST zynaddsubfx-collection-0.7.tar.gz 399845 RMD160
08e1f75efe0ee7884544ef198cf32d6e41cf8668 SHA1
220f460ec8e4ac0aad8e6784f2c0aefb7843ec22 SHA256
544f45391ce4b610998086b6d854a4f02fd0212d13a6340d564068e88f0f6a11
-EBUILD zynaddsubfx-collection-0.1.ebuild 1079 RMD160
4ab9be7ea301b3033d2397819c2475cec39177aa SHA1
9015292e9f11a4b1014208a519f6d446cde3d34f SHA256
9a1eb0263b0248e93bcf66a6f9eae3a200a301367053767c17242b7f9938e5ee
-EBUILD zynaddsubfx-collection-0.2.ebuild 1109 RMD160
284330c5b02e7785b21f31982c0e6d65574a389b SHA1
299c8bcc0c403b6ec1dd2ec71f543df975abdde6 SHA256
24a74e4e47ac6edcf23df0b96ae661562293fcfa96464a870d8c3139339836de
-EBUILD zynaddsubfx-collection-0.3.ebuild 1109 RMD160
284330c5b02e7785b21f31982c0e6d65574a389b SHA1
299c8bcc0c403b6ec1dd2ec71f543df975abdde6 SHA256
24a74e4e47ac6edcf23df0b96ae661562293fcfa96464a870d8c3139339836de
-EBUILD zynaddsubfx-collection-0.4.ebuild 1109 RMD160
284330c5b02e7785b21f31982c0e6d65574a389b SHA1
299c8bcc0c403b6ec1dd2ec71f543df975abdde6 SHA256
24a74e4e47ac6edcf23df0b96ae661562293fcfa96464a870d8c3139339836de
-EBUILD zynaddsubfx-collection-0.5.ebuild 1109 RMD160
284330c5b02e7785b21f31982c0e6d65574a389b SHA1
299c8bcc0c403b6ec1dd2ec71f543df975abdde6 SHA256
24a74e4e47ac6edcf23df0b96ae661562293fcfa96464a870d8c3139339836de
-EBUILD zynaddsubfx-collection-0.6.ebuild 1109 RMD160
284330c5b02e7785b21f31982c0e6d65574a389b SHA1
299c8bcc0c403b6ec1dd2ec71f543df975abdde6 SHA256
24a74e4e47ac6edcf23df0b96ae661562293fcfa96464a870d8c3139339836de
-EBUILD zynaddsubfx-collection-0.7.ebuild 1109 RMD160
284330c5b02e7785b21f31982c0e6d65574a389b SHA1
299c8bcc0c403b6ec1dd2ec71f543df975abdde6 SHA256
24a74e4e47ac6edcf23df0b96ae661562293fcfa96464a870d8c3139339836de
-MISC ChangeLog 576 RMD160 2de1fd8df00a333bb9e1c0a757aaeb66ba6b7309 SHA1
2eb186dca17712d89b5368333f7601a148ae3cdd SHA256
c5bc8bc9c42027fb7e3d07d83d0f597839949615acdfe0b6cf2bd386640e69f3
+EBUILD zynaddsubfx-collection-0.1.ebuild 1088 RMD160
e1f0dd18821b30386666c8e92edae7778e8f819e SHA1
da51848056773a25696f31ded834334b302b429b SHA256
27c24af495113ec065b8d38f520d9ccbc983a2017a5484f722782ee9c0f97eaa
+EBUILD zynaddsubfx-collection-0.2.ebuild 1118 RMD160
cb603a2a58229a1a5fbdf1976b5f02ca71759e27 SHA1
a460f84caa248be333ab0b7d2191a346dcfb5706 SHA256
eac7d2373a13947241c81fac0b845a5b39575000ed906e9b079f9dc3d242eb49
+EBUILD zynaddsubfx-collection-0.3.ebuild 1118 RMD160
cb603a2a58229a1a5fbdf1976b5f02ca71759e27 SHA1
a460f84caa248be333ab0b7d2191a346dcfb5706 SHA256
eac7d2373a13947241c81fac0b845a5b39575000ed906e9b079f9dc3d242eb49
+EBUILD zynaddsubfx-collection-0.4.ebuild 1118 RMD160
cb603a2a58229a1a5fbdf1976b5f02ca71759e27 SHA1
a460f84caa248be333ab0b7d2191a346dcfb5706 SHA256
eac7d2373a13947241c81fac0b845a5b39575000ed906e9b079f9dc3d242eb49
+EBUILD zynaddsubfx-collection-0.5.ebuild 1118 RMD160
cb603a2a58229a1a5fbdf1976b5f02ca71759e27 SHA1
a460f84caa248be333ab0b7d2191a346dcfb5706 SHA256
eac7d2373a13947241c81fac0b845a5b39575000ed906e9b079f9dc3d242eb49
+EBUILD zynaddsubfx-collection-0.6.ebuild 1118 RMD160
cb603a2a58229a1a5fbdf1976b5f02ca71759e27 SHA1
a460f84caa248be333ab0b7d2191a346dcfb5706 SHA256
eac7d2373a13947241c81fac0b845a5b39575000ed906e9b079f9dc3d242eb49
+EBUILD zynaddsubfx-collection-0.7.ebuild 1118 RMD160
cb603a2a58229a1a5fbdf1976b5f02ca71759e27 SHA1
a460f84caa248be333ab0b7d2191a346dcfb5706 SHA256
eac7d2373a13947241c81fac0b845a5b39575000ed906e9b079f9dc3d242eb49
+MISC ChangeLog 936 RMD160 d1a5b28f8d15c1c65e936127c8aa6a003e3c0e3c SHA1
c012dd971b5694ba967571563af1357232cb0ad3 SHA256
bbde863c383360c0ec2892a42704bedca4d775a215d51d46ddaee8dafcff7bce
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1
2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256
96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Modified:
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.1.ebuild
===================================================================
---
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.1.ebuild
2012-06-25 21:57:56 UTC (rev 2163)
+++
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.1.ebuild
2012-06-30 08:15:58 UTC (rev 2164)
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -19,8 +19,8 @@
src_unpack(){
unpack ${A}
- UNPACK_DESTDIR="$S" unpacker *.tar.*
- cd "${S}"
+ mkdir -p "$S" ; cd "${S}"
+ unpacker "${WORKDIR}"/*.tar.*
find -name 'CVS' -exec rm -rf {} \; &>/dev/null
}
Modified:
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.2.ebuild
===================================================================
---
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.2.ebuild
2012-06-25 21:57:56 UTC (rev 2163)
+++
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.2.ebuild
2012-06-30 08:15:58 UTC (rev 2164)
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -19,8 +19,8 @@
src_unpack(){
unpack ${A}
- UNPACK_DESTDIR="$S" unpacker *.tar.*
- cd "${S}"
+ mkdir -p "$S" ; cd "${S}"
+ unpacker "${WORKDIR}"/*.tar.*
find -name 'CVS' -exec rm -rf {} \; &>/dev/null
}
Modified:
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.3.ebuild
===================================================================
---
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.3.ebuild
2012-06-25 21:57:56 UTC (rev 2163)
+++
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.3.ebuild
2012-06-30 08:15:58 UTC (rev 2164)
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -19,8 +19,8 @@
src_unpack(){
unpack ${A}
- UNPACK_DESTDIR="$S" unpacker *.tar.*
- cd "${S}"
+ mkdir -p "$S" ; cd "${S}"
+ unpacker "${WORKDIR}"/*.tar.*
find -name 'CVS' -exec rm -rf {} \; &>/dev/null
}
Modified:
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.4.ebuild
===================================================================
---
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.4.ebuild
2012-06-25 21:57:56 UTC (rev 2163)
+++
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.4.ebuild
2012-06-30 08:15:58 UTC (rev 2164)
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -19,8 +19,8 @@
src_unpack(){
unpack ${A}
- UNPACK_DESTDIR="$S" unpacker *.tar.*
- cd "${S}"
+ mkdir -p "$S" ; cd "${S}"
+ unpacker "${WORKDIR}"/*.tar.*
find -name 'CVS' -exec rm -rf {} \; &>/dev/null
}
Modified:
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.5.ebuild
===================================================================
---
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.5.ebuild
2012-06-25 21:57:56 UTC (rev 2163)
+++
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.5.ebuild
2012-06-30 08:15:58 UTC (rev 2164)
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -19,8 +19,8 @@
src_unpack(){
unpack ${A}
- UNPACK_DESTDIR="$S" unpacker *.tar.*
- cd "${S}"
+ mkdir -p "$S" ; cd "${S}"
+ unpacker "${WORKDIR}"/*.tar.*
find -name 'CVS' -exec rm -rf {} \; &>/dev/null
}
Modified:
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.6.ebuild
===================================================================
---
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.6.ebuild
2012-06-25 21:57:56 UTC (rev 2163)
+++
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.6.ebuild
2012-06-30 08:15:58 UTC (rev 2164)
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -19,8 +19,8 @@
src_unpack(){
unpack ${A}
- UNPACK_DESTDIR="$S" unpacker *.tar.*
- cd "${S}"
+ mkdir -p "$S" ; cd "${S}"
+ unpacker "${WORKDIR}"/*.tar.*
find -name 'CVS' -exec rm -rf {} \; &>/dev/null
}
Modified:
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.7.ebuild
===================================================================
---
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.7.ebuild
2012-06-25 21:57:56 UTC (rev 2163)
+++
trunk/overlays/proaudio/media-libs/zynaddsubfx-collection/zynaddsubfx-collection-0.7.ebuild
2012-06-30 08:15:58 UTC (rev 2164)
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -19,8 +19,8 @@
src_unpack(){
unpack ${A}
- UNPACK_DESTDIR="$S" unpacker *.tar.*
- cd "${S}"
+ mkdir -p "$S" ; cd "${S}"
+ unpacker "${WORKDIR}"/*.tar.*
find -name 'CVS' -exec rm -rf {} \; &>/dev/null
}
Modified: trunk/overlays/proaudio/media-libs/zynaddsubfx-extras/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/zynaddsubfx-extras/ChangeLog
2012-06-25 21:57:56 UTC (rev 2163)
+++ trunk/overlays/proaudio/media-libs/zynaddsubfx-extras/ChangeLog
2012-06-30 08:15:58 UTC (rev 2164)
@@ -1,7 +1,11 @@
# ChangeLog for media-libs/zynaddsubfx-extras
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 30 Jun 2012; Frieder Buerzele <[email protected]>
+ zynaddsubfx-extras-99999999.ebuild:
+ use internal unpacker and fixup $S usage
+
*zynaddsubfx-extras-20101203 (04 Mar 2011)
04 Mar 2011; Frieder Buerzele <[email protected]>
Modified: trunk/overlays/proaudio/media-libs/zynaddsubfx-extras/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/zynaddsubfx-extras/Manifest
2012-06-25 21:57:56 UTC (rev 2163)
+++ trunk/overlays/proaudio/media-libs/zynaddsubfx-extras/Manifest
2012-06-30 08:15:58 UTC (rev 2164)
@@ -4,6 +4,6 @@
EBUILD zynaddsubfx-extras-20060419.ebuild 1322 RMD160
260e55200a3958399c66c8d0e602c9df7ff57263 SHA1
54edf2758084eaa5c0c717d45171f07ad18121c2 SHA256
e2465e4f6b47881a08bb2587e00cab2b3e14e502db6ed34e2a643efa8ca4cd64
EBUILD zynaddsubfx-extras-20060615.ebuild 1321 RMD160
a2a840b39282a4f076cae4a3bb1e5e3775ea191b SHA1
54b0d8461bb0f6784afcc604fbd0786c0a105f25 SHA256
5713e8b66624d640593fe3ae649bfbbe767cc1d17142ebf68b55b5ab7b518a42
EBUILD zynaddsubfx-extras-20101203.ebuild 1321 RMD160
ad32239a0a960cbda666372034e990843ab0e8aa SHA1
3d0d69f3ffbe6828316421d1579befe412fdce36 SHA256
c2f3413df78c93d6e8f84b670a2346d0d0efe482f9faaf72b56409d633179053
-EBUILD zynaddsubfx-extras-99999999.ebuild 1882 RMD160
7cb3e6b56c3654e0bfc7795f2f126af66d4926b1 SHA1
1fdfd184d666a2a00c653ab6def46528ee011350 SHA256
fd7615f8038f63275d995b62f8bdbe554188f48e228202daaba3bb5f1e94eff2
-MISC ChangeLog 477 RMD160 303fcf9459c0b16b618a709ce91c96490f656345 SHA1
3af8c484ced468d1918bd0d949026459fb1bf73c SHA256
676642cba1725f3b5d7dc9b00eaca2e6b593c81ab39986356154aad025b5bf54
+EBUILD zynaddsubfx-extras-99999999.ebuild 2059 RMD160
e25b4fde5fc6fa9066c729ca3d09d11a91f1aed5 SHA1
75df7f30e0ba98a59b75cbd2d86a4847f21d04b6 SHA256
bd47a945dc6ab66dcdd2278a03e164ac050cc7442b06650e01df564609512a0c
+MISC ChangeLog 616 RMD160 276b17accbdf129389521f7e1fc7ed691739014f SHA1
fac8410db27bfe5e5030218b0bd472261f2c7abd SHA256
15498a992e5b56bc74ae28a731327f2dd719213e39eef394ec4c590bd9e132af
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1
2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256
96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Modified:
trunk/overlays/proaudio/media-libs/zynaddsubfx-extras/zynaddsubfx-extras-99999999.ebuild
===================================================================
---
trunk/overlays/proaudio/media-libs/zynaddsubfx-extras/zynaddsubfx-extras-99999999.ebuild
2012-06-25 21:57:56 UTC (rev 2163)
+++
trunk/overlays/proaudio/media-libs/zynaddsubfx-extras/zynaddsubfx-extras-99999999.ebuild
2012-06-30 08:15:58 UTC (rev 2164)
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-inherit zyn3 fetch-tools unpacker
+inherit zyn3 fetch-tools unpacker
RESTRICT="mirror"
MY_P="unsorted_${PN/-extras/}Parameters_${PV}"
MY_PN="zynaddsubfx"
@@ -34,9 +34,13 @@
wget ${url} -P "${PORTAGE_ACTUAL_DISTDIR}" ||\
die "cannot fetch ${url##*/}"
fi
- unpacker "${PORTAGE_ACTUAL_DISTDIR}/${url##*/}" &>/dev/null || die
+ echo here i am
- cd "${S}"
+ # do a stupid workaround for unpacker
+ ln -s "${PORTAGE_ACTUAL_DISTDIR}/${url##*/}" "../distdir/${url##*/}"
+ unpacker "${url##*/}"
+
+ cd "${WORKDIR}/"*zynaddsubfx*
find -name 'CVS' -exec rm -rf {} \; &>/dev/null
}
@@ -45,14 +49,16 @@
}
src_install(){
+ cd "${WORKDIR}/"*zynaddsubfx*
unsorted="/usr/share/${MY_PN}/banks/unsorted"
examples="/usr/share/${MY_PN}/examples"
dodir "${unsorted}" "${examples}"
for dir in `find -maxdepth 1 -type d`;do
mv "${dir}"/*.xiz "${D}${unsorted}" &>/dev/null
+ echo mv "${dir}"/*.xiz "${D}${unsorted}"
done
- fowners -R root:root "${unsorted}"
- fperms -R 644 "${unsorted}"
+ #fowners -R root:root "${unsorted}"
+ #fperms -R 644 "${unsorted}"
insinto "${examples}"
doins -r ../*zynaddsubfx*
Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx-converter/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx-converter/ChangeLog
2012-06-25 21:57:56 UTC (rev 2163)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx-converter/ChangeLog
2012-06-30 08:15:58 UTC (rev 2164)
@@ -1,7 +1,11 @@
# ChangeLog for media-sound/zynaddsubfx-converter
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 30 Jun 2012; Frieder Buerzele <[email protected]>
+ zynaddsubfx-converter-2.0.0_pre2.ebuild:
+ fixup patchlevel
+
16 Dec 2007; Thomas Kuther <[email protected]>
zynaddsubfx-converter-2.0.0_pre2.ebuild:
added SLOT
Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx-converter/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx-converter/Manifest
2012-06-25 21:57:56 UTC (rev 2163)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx-converter/Manifest
2012-06-30 08:15:58 UTC (rev 2164)
@@ -1,5 +1,5 @@
AUX zynaddsubfx-converter-patches.tar.gz 4830 RMD160
595c70a5e3fff48a10eaecbc28f27d897a744a01 SHA1
ccb3a952af931e6299ac55e234a72a24507c117e SHA256
74016d339f4efb31b3096c023178acf424b8b2464b74c97ddcd641dfe120ec13
DIST ZynAddSubFX-2.0.0_pre2.tar.bz2 620683 RMD160
f1d200fc4514550303f006b52f900e9ba00d9ac6 SHA1
3b681d5d2f561e19ddfd34e92b178eca621dbc42 SHA256
185db55612526945392caa85c8d012a7b1525f5fd1dc06c9c2065081f4e0d0af
-EBUILD zynaddsubfx-converter-2.0.0_pre2.ebuild 1790 RMD160
55f30e2a4c400b1f67d6de3c245fb315624ef828 SHA1
a3d01bf3081eb0da7a4804d78b3bab471b18b70e SHA256
06119a1010079bb3f42d2f6424ab42f96bde51972ba32667455536baf386c2a8
-MISC ChangeLog 246 RMD160 2a2f7dc1e6812d2e0cbf957a3c08bd68c8cb6cf3 SHA1
560dae169d4ccb1b4b3ef15a2918c3191a69318e SHA256
2284b3815f68314d85e423d14adabd21bfe585f815490637a49c15b7f25a6351
+EBUILD zynaddsubfx-converter-2.0.0_pre2.ebuild 1966 RMD160
cd98ff799ba439aab950bd012b66d1a7eeac11af SHA1
9f89428ab5f5ea7ab1c20226c7f43fb45ce91f9f SHA256
24e4a35561361bd0a1532ee6716d42963a8123a86da8d0de359c2b346325f066
+MISC ChangeLog 366 RMD160 cbc5a672af4c11a7a5739c2da2834761dcf4094f SHA1
c9e86c00506384bdf4107dc9414b3445d9e9d110 SHA256
19adb7176900002f04e5b91426d5574109954cf82250a4830399fcef97f8cdc6
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1
2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256
96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Modified:
trunk/overlays/proaudio/media-sound/zynaddsubfx-converter/zynaddsubfx-converter-2.0.0_pre2.ebuild
===================================================================
---
trunk/overlays/proaudio/media-sound/zynaddsubfx-converter/zynaddsubfx-converter-2.0.0_pre2.ebuild
2012-06-25 21:57:56 UTC (rev 2163)
+++
trunk/overlays/proaudio/media-sound/zynaddsubfx-converter/zynaddsubfx-converter-2.0.0_pre2.ebuild
2012-06-30 08:15:58 UTC (rev 2164)
@@ -1,11 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
inherit eutils unpacker
KEYWORDS="amd64 ~ppc x86"
-IUSE="oss alsa jack"
+IUSE="lash oss alsa jack"
MY_P=ZynAddSubFX-${PV}
DESCRIPTION="ZynAddSubFX-converter: use ONLY to convert old *.ins_zyn
instruments to *.xiz"
@@ -25,6 +25,12 @@
src_unpack() {
unpack ${MY_P}.tar.bz2 || die
unpacker "${FILESDIR}/${PN}-patches.tar.gz"
+
+ # fixup patchlevel
+ sed -i -e \
+
's@/var/tmp/portage/media-sound/zynaddsubfx-converter-2.0.0_pre2/work/ZynAddSubFX-2.0.0_pre2/@@g'
\
+ "$WORKDIR/03_add-warning.patch"
+
cd "${S}"
EPATCH_SOURCE="${WORKDIR}" EPATCH_SUFFIX="patch"\
EPATCH_FORCE="yes" epatch
