--- quake1-data-2.40-r1.ebuild	2006-07-30 14:22:04.000000000 -0400
+++ quake1-data-2.40-r2.ebuild	2006-07-30 14:22:17.000000000 -0400
@@ -27,17 +27,20 @@
 		fi
 	fi
 
-	export CDROM_NAME_SET=("Existing Install" "Quake CD" "Ultimate Quake Collection")
-	cdrom_get_cds id1:q101_int.1:Setup/ID1
+	export CDROM_SET_NAMES=("Existing Install" "Quake CD" "Quake CD (2)" "Ultimate Quake Collection")
+	cdrom_get_cds id1:q101_int.1:resource.1:Setup/ID1
 }
 
 src_unpack() {
-	echo ">>> Unpacking q101_int to ${PWD}"
 	if [[ ${CDROM_SET} == "1" ]] ; then
+		echo ">>> Unpacking q101_int to ${PWD}"
 		cat "${CDROM_ROOT}"/q101_int.1 "${CDROM_ROOT}"/q101_int.2 > \
 			"${S}"/q101_int.exe
 		lha xqf "${S}"/q101_int.exe || die "failure unpacking q101_int.exe"
 		rm -f q101_int.exe
+	elif [[ ${CDROM_SET} == "2" ]] ; then
+		echo ">>> Unpacking resource.1 to ${PWD}"
+		lha xqf "${CDROM_ROOT}"/resource.1 || die "failure unpacking resource.1"
 	fi
 }
 
@@ -50,7 +53,10 @@
 		1)  doins id1/* || die "doins pak files"
 		    dodoc *.txt
 		    ;;
-		2)  newins "${CDROM_ROOT}"/Setup/ID1/PAK0.PAK pak0.pak \
+		2)  doins id1/* || die "doins pak files"
+		    dodoc *.txt
+		    ;;
+		3)  newins "${CDROM_ROOT}"/Setup/ID1/PAK0.PAK pak0.pak \
 				|| die "ins pak0.pak failed"
 		    newins "${CDROM_ROOT}"/Setup/ID1/PAK1.PAK pak1.pak \
 				|| die "ins pak1.pak failed"