added prefix support (bug #433585)

Package-Manager: portage-2.2.0_alpha125/cvs/Linux i686

3 files changed, 32 insertions, 11 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index e175a7b23d9b..de9d96377c69 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.290 2012/08/18 09:05:01 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.291 2012/09/13 03:33:45 ottxor Exp $
+
+  13 Sep 2012; Christoph Junghans <ottxor@gentoo.org>
+  cdrtools-3.01_alpha08.ebuild:
+  added prefix support (bug #433585)
 
 *cdrtools-3.01_alpha08 (18 Aug 2012)
 
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 2a9533acad04..558f8f6d1e04 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -6,13 +6,17 @@ DIST cdrtools-3.01a07.tar.bz2 2043525 SHA256 cc54fefaf4ed5b6b49b996da1d1ebb1c44e
 DIST cdrtools-3.01a08.tar.bz2 2042834 SHA256 e503b0531c99644788cf11be694f311043fc9adb17612e3dccd2eefc23a16f41 SHA512 cf591d571c4f17d15927eece49780f875ef797a4d3c4df130340257ff2ce8df40377f88f8f3bc4301cb1b0b8927ee2a7f580e0a0f7f0652b5c88f0a10af214e8 WHIRLPOOL cbe680ebeec52716980c07b86a1d005197542e611dfcff770c2e9717005de3225980166f47e369cf46fadd91db5dac3e42b9a45f9567db91239641f2784f60d9
 EBUILD cdrtools-3.00.ebuild 4233 SHA256 7e1485000afb1dc66c2907b1a182788eefe2087cbbe474aae57035a438ab2198 SHA512 fc76ba04a360450e35dea803d397c988fa7d9c862fa78c5cc828bd7132937cd9f2de82857ca7320e22f9e431b07d6a66d73eb13fe8d9662ebee28ee464e705ad WHIRLPOOL 58dbd0d5745c42f6e498b6eb89c6806edd90a144b2f52c946210cab24ff0d0f29b1983cd2cfaeb96c3c484998ee13cc7c300d237e06de6a566a110553ffe305e
 EBUILD cdrtools-3.01_alpha07.ebuild 4081 SHA256 7bd1ab5bd35d5b6fc89533560db63f06346895092784dcaa564bb360ea51014d SHA512 f6bfa2b188fae5b75a923371ae28bb7a4fa222806f6fc2090b7b546cdf58a46f509f3d387e3958034f9adb63dbf074246ecdfbe4e5c3953373da2211e03c4bde WHIRLPOOL bf025e0df65b6d8f992f55845d7cad4a49a233da603bc45258d69268316da085330bdd740b6fbc911d8906c28315f51cf92a2bc6a71169fa68b86b5d4375c771
-EBUILD cdrtools-3.01_alpha08.ebuild 4081 SHA256 cb9ea005441743efefcfea5b389d7fb9f51452bed83dbe4faddd9da84adff02c SHA512 45ef1472e2e54a2e505975f8edf3aa5b97473d2d5458fa05e9e3c8f19123b645683118e2dc03c3abb45948a2294e2040b173b4e3dfbda9a0b8f4e93a9834b884 WHIRLPOOL e0c633738850f1d596d8b4f3522c80169f2867b13df018451035d35df4b0e07ee6f4e4c5753be061c92ea64f439d6cb779644237fa8d8707b6c3bbd05b3d811f
-MISC ChangeLog 45451 SHA256 2f7989f9c11ac8a3028ccea2be02aa571ee57fdc11901bb274a1d5cd246ccc83 SHA512 a0e71d532f3df1bf67be05ad5080d1ed120dd64a7b96bad4f0085ffdc0e5e04fa41e82cacbb27b7bee93c2b21d2065ea0abf643e108a9363a8034623496565f8 WHIRLPOOL 04a0e38f1237deec438c65f6d2db1e1001f04faf5aa9e67a176a015f352db3a6ff053d7e7ca856978297a4710a885991724a67a5f344d7cf32ea75e433e049e6
+EBUILD cdrtools-3.01_alpha08.ebuild 4488 SHA256 7df75351f9558a4caa608121a3ea52ee42f08d42528aeac904a86d688d4a3913 SHA512 f1d27ac47e0ad8f027cb2b2a28065419cf51b7d406a2a222d5aa32828b96228a60f9cc11d84328aaf3e090a89f90356e5a3035084933de5e9bc3b7fd97f812d0 WHIRLPOOL dd164cb03655c3766af63f8a21d616340054b0a803721ed5e1461990e249be91cfd8e2261d16fc9df4a61d89c8f50482869981eca13b82afcaf91a8cdd6adc6a
+MISC ChangeLog 45575 SHA256 8f462b3a7b973286bd946e3fb7bff6c8d6ac1f2a322579b1c2a2e70f267f826c SHA512 1c7987131a994e260cab5e0351fa35d945e4cf990f5f5a6dc886341fa04262cabe3d948b5940b291322e06cdd20e8a4a9bef17e434304628ff74c36c41c37678 WHIRLPOOL 5bd01c86ed97e59450c8192cd57206e58d73f3568447385467cdf4f21559da867bdc7087723d405df808e97bb5bf8114af9e9e60d95b2099d372aec4b3d3159f
 MISC metadata.xml 344 SHA256 1827502e9d2cfa583db6a17f065462b760bf3770fcac22a0145d6a560b2b34f8 SHA512 0d461f000a4dd8557ec9020785c12c7875437c2061c3fd7f9cc54df089309dadf71435ac9d0f29bc5ee1785c9398661c78b1095b512b5fc91071dc63a818e567 WHIRLPOOL e27e3f17bcc9151f0f7c9a21a13c556e27a71499d613937a1eaa0176ad203c208e58b0af6f82edaed69ff929885c1f4b6f4fa15093a3d1a12b3f2a0c77e8bb86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAvWsMACgkQlcuUeyFa0U0B8wCbBRk/cFOqtJPAqrUOawMN0Us9
-ZvcAoNjXJtm6Izi/J3utImb+tmCvoYlg
-=qgk1
+iQEcBAEBCAAGBQJQUVQfAAoJEOeBhlrCAAWGh1QH/iFFRP6SGI09xyKSLALCFpSj
+0t5pT+YlGFQSs6Tb2So3gcyzq0a2ZeatvKJ6/mLqS119w52y2clMTw5oXHug+ME2
+l4ceCXT3J0UKv+a7O79sSHUrE6Jnvi8FBKBVYwMoHzAmv5c2G9oEq2zigoLTWJ9c
+ek7m5Ca+/9DsDm50m0iEEYY/lCfNtsBavSvji9doeANLqC2FpR77ZhYhfelXJE+i
+lBgrxsUe5aXMGtiJ6KYw4iYt/+nosQ2t74TkdmTxpYXKBHmh0WEP6r47nK9V/5R3
+dhWeva0gM5wGs32/Dx66KY0WRRI7Ej4tQ+T9f0Cq2k8SDRNi8clLNQ1mgDf+YDM=
+=60ft
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha08.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha08.ebuild
index b0de15e2dca6..a58fb0a3587a 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha08.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha08.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha08.ebuild,v 1.1 2012/08/18 09:05:01 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha08.ebuild,v 1.2 2012/09/13 03:33:45 ottxor Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/$([[ -z ${PV/*_alpha*} ]] && echo 'al
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl unicode"
 
 DEPEND="acl? ( virtual/acl )
@@ -71,6 +71,7 @@ src_prepare() {
 	# Schily make setup.
 	cd "${S}"/DEFAULTS
 	local os="linux"
+	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
 
 	sed -i \
 		-e "s:/opt/schily:/usr:g" \
@@ -101,7 +102,7 @@ src_compile() {
 	# If not built with -j1, "sometimes" cdda2wav will not be built.
 	emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
 		LDOPTX="${LDFLAGS}" \
-		INS_BASE="${D}/usr" INS_RBASE="${D}" LINKMODE="dynamic" \
+		INS_BASE="${ED}/usr" INS_RBASE="${ED}" LINKMODE="dynamic" \
 		RUNPATH="" GMAKE_NOWARN="true"
 }
 
@@ -109,7 +110,7 @@ src_install() {
 	# If not built with -j1, "sometimes" manpages are not installed.
 	emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
 		LDOPTX="${LDFLAGS}" \
-		INS_BASE="${D}/usr" INS_RBASE="${D}" LINKMODE="dynamic" \
+		INS_BASE="${ED}/usr" INS_RBASE="${ED}" LINKMODE="dynamic" \
 		RUNPATH="" GMAKE_NOWARN="true" install
 
 	# These symlinks are for compat with cdrkit.
@@ -127,5 +128,17 @@ src_install() {
 	dodoc ChangeLog* TODO
 
 	# Remove man pages related to the build system
-	rm -rvf "${D}"/usr/share/man/man5
+	rm -rvf "${ED}"/usr/share/man/man5
+}
+
+pkg_postinst() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		einfo
+		einfo "Darwin/OS X use the following device names:"
+		einfo
+		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
+		einfo
+		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
+		einfo
+	fi
 }