--- /usr/portage/games-fps/quake2-data/quake2-data-3.20.ebuild	2006-04-13 22:36:13.000000000 +0100
+++ quake2-data-3.20.ebuild	2006-06-21 20:18:14.000000000 +0100
@@ -20,6 +20,12 @@
 
 pkg_setup() {
 	games_pkg_setup
+
+	if built_with_use "games-fps/quake2-demodata" symlink ; then
+		eerror "The symlink for the demo data conflicts with the cdinstall data"
+		die "Unmerge games-fps/quake2-demodata to remove the conflict"
+	fi
+
 	export CDROM_SET_NAMES=("Existing Install" "Ultimate Quake Edition" "Quake2 CD" "Quake4 Bonus DVD")
 	cdrom_get_cds baseq2:Install/patch:Install:Movies
 }